1.增加商场客户查询预约单--待完成

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.feign;
 
 import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -65,6 +66,6 @@ public interface IBasicdataClientClient {
 	 * @return
 	 */
 	@GetMapping(BASICDATACLIENTUSERENTITYLISTBYUSERID)
-	List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(@RequestParam("userId") Long userId);
+	List<BasicdataClientUserEntity> getBasicdataClientUserEntityListByUserId(@RequestParam("userId") Long userId);
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.service.IBasicdataClientService;
 import com.logpm.basicdata.service.IBasicdataClientUserService;
 import lombok.AllArgsConstructor;
@@ -80,7 +81,7 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 	}
 
 	@Override
-	public List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(Long userId) {
+	public List<BasicdataClientUserEntity> getBasicdataClientUserEntityListByUserId(Long userId) {
 		return basicdataClientUserService.getBasicdataClientUserEntityListByUserId(userId);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.java

@@ -34,7 +34,7 @@ import java.util.List;
 public interface BasicdataClientUserMapper extends BaseMapper<BasicdataClientUserEntity> {
 
 
-	List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(@Param("userId") Long userId);
+	List<BasicdataClientUserEntity> getBasicdataClientUserEntityListByUserId(@Param("userId") Long userId);
 
     List<BasicdataClientUserEntity> selectBasicdataClientAccountPage(IPage<BasicdataClientAccountVO> page, BasicdataClientAccountVO basicdataClientAccountVO);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml

@@ -3,20 +3,8 @@
 <mapper namespace="com.logpm.basicdata.mapper.BasicdataClientUserMapper">
 
 
-    <resultMap id="basicdataClientEntity" type="com.logpm.basicdata.entity.BasicdataClientEntity">
+
-        <result column="create_dept" property="createDept"/>
+    <select id="getBasicdataClientUserEntityListByUserId" resultType="com.logpm.basicdata.entity.BasicdataClientUserEntity">
-        <result column="id" property="id"/>
-        <result column="client_name" property="clientName"/>
-        <result column="type_service" property="typeService"/>
-        <result column="blade_region_province_id" property="bladeRegionProvinceId"/>
-        <result column="blade_region_city_id" property="bladeRegionCityId"/>
-        <result column="blade_region_area_id" property="bladeRegionAreaId"/>
-        <result column="lease_accessories" property="leaseAccessories"/>
-        <result column="contract_start_time" property="contractStartTime"/>
-        <result column="contract_ent_time" property="contractEntTime"/>
-    </resultMap>
-
-    <select id="getBasicdataClientUserEntityListByUserId" resultMap="basicdataClientEntity">
         SELECT
 	        lbc1.*
         FROM

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientUserService.java

@@ -15,7 +15,7 @@ public interface IBasicdataClientUserService extends BaseService<BasicdataClient
 	 * 根据当前登录人获取绑定客户ID集合
 	 * @return
 	 */
-	List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(Long userId);
+	List<BasicdataClientUserEntity> getBasicdataClientUserEntityListByUserId(Long userId);
 
 	/**
 	 * 查询当前客户下面的账号列表

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientUserServiceImpl.java

@@ -45,8 +45,10 @@ public class BasicdataClientUserServiceImpl extends BaseServiceImpl<BasicdataCli
 	private final IBasicdataWarehouseService basicdataWarehouseService;
 
 	@Override
-	public List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(Long userId) {
+	public List<BasicdataClientUserEntity> getBasicdataClientUserEntityListByUserId(Long userId) {
-		return baseMapper.getBasicdataClientUserEntityListByUserId(userId);
+		List<BasicdataClientUserEntity> basicdataClientUserEntityListByUserId = baseMapper.getBasicdataClientUserEntityListByUserId(userId);
+		log.info(">.......>>>>>>>>>>>>> {}",basicdataClientUserEntityListByUserId);
+		return basicdataClientUserEntityListByUserId;
 
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -192,6 +192,10 @@
             <if test="param.goodsAllocation !='' and param.goodsAllocation != null">
                 and lwtg.position_code = #{param.goodsAllocation}
             </if>
+            <if test="param.conditions !='' and param.conditions != null">
+                and ldpl.conditions = #{param.conditions}
+            </if>
+
         </where>
 
     </select>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -366,10 +367,10 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		DistributionStockListEntity distributionStockListEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockList), DistributionStockListEntity.class);
 
 		// 得到当前登录用户的Id
-		List<BasicdataClientEntity> basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId());
+		List<BasicdataClientUserEntity> basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId());
 		List clientIds =null;
 		if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){
-			 clientIds = basicdataClientUserEntityListByUserIds.stream().map(BaseEntity::getId).collect(Collectors.toList());
+			 clientIds = basicdataClientUserEntityListByUserIds.stream().map(BasicdataClientUserEntity::getClientId).collect(Collectors.toList());
 		}
 		IPage<DistributionStockListVO> page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds);
 		return  page1;