From f00d6b35ffba2e14a69b092b28e96dd7933cd0d9 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Sat, 22 Jul 2023 15:45:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E6=9C=8D=E5=8A=A1=E6=9C=8D=E5=8A=A1=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=98=AF=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E4=BD=8D=E8=BF=9B=E8=A1=8C=E6=8C=87?=
 =?UTF-8?q?=E6=B4=BE=E6=9C=8D=E5=8A=A1=E4=BB=93=E5=BA=93=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E4=BF=AE=E6=94=B9=E6=8C=89=E7=85=A7=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=93=E6=9D=A5=E8=BF=9B=E8=A1=8C=E5=AF=B9=E5=BA=94=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=201.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicdataStorageServicesEntity.java       |  4 +--
 .../mapper/BasicdataStorageServicesMapper.xml | 36 +++++++++++++++----
 .../BasicdataStorageServicesServiceImpl.java  |  2 +-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
index 8e1a35c50..3810f0e4e 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
@@ -65,8 +65,8 @@ public class BasicdataStorageServicesEntity extends TenantEntity {
 	/**
 	 * 客户ID
 	 */
-	@ApiModelProperty(value = "门店ID")
-	private Long shopId;
+	@ApiModelProperty(value = "客户ID")
+	private Long clientId;
 	/**
 	 * 区分类型
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
index 12b7f616a..9633c1fa4 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
@@ -10,17 +10,39 @@
 
     <select id="selectBasicdataStorageServicesPage" resultType="com.logpm.basicdata.vo.BasicdataStorageServicesVO">
 
-        select lbss.tenant_id, lbss.create_user, lbss.create_time, lbss.update_user, lbss.update_time, lbss.status, lbss.is_deleted, lbss.create_dept, lbss.id, lbss.reserve1, lbss.reserve2,
-        lbss.reserve3, lbss.reserve4, lbss.reserve5, lbss.shop_id, lbss.forwarding_unit, lbss.warehouse_service,lbsc.linkman,lbss.distinguish
+        lbss.tenant_id,
+        lbss.create_user,
+        lbss.create_time,
+        lbss.update_user,
+        lbss.update_time,
+        lbss. STATUS,
+        lbss.is_deleted,
+        lbss.create_dept,
+        lbss.id,
+        lbss.reserve1,
+        lbss.reserve2,
+        lbss.reserve3,
+        lbss.reserve4,
+        lbss.reserve5,
+        lbss.client_id,
+        lbss.distinguish,
+        lbss.serve_warehouse_id,
+        lbss.serve_warehouse_name,
+        lbss.send_warehouse_id,
+        lbss.send_warehouse_name
         from logpm_basicdata_storage_services lbss
-        LEFT JOIN logpm_basicdata_store_contact lbsc on lbsc.id = lbss.forwarding_unit
+
         <where>
             lbss.is_deleted = 0
-            <if test="param.shopIds != null and param.shopIds != null"> and lbss.shop_id = #{param.shopIds}  </if>
-            <if test="param.distinguish != null and param.distinguish != null"> and lbss.distinguish = #{param.distinguish}  </if>
-            <if test="param.forwardingUnit != null and param.forwardingUnit != null"> and lbsc.linkman like concat('%',#{param.forwardingUnit} ,'%') </if>
-            <if test="param.warehouseService != null and param.warehouseService != null"> and lbss.warehouse_service like concat('%',#{param.warehouseService},'%')  </if>
+            <if test="param.clientId != null and param.clientId != null"> and lbss.clinet_id = #{param.clientId}  </if>
+            <if test="param.serveWarehouseId != null and param.serveWarehouseId != null"> and lbss.serve_warehouse_id = #{param.serveWarehouseId}  </if>
+            <if test="param.sendWarehouseId != null and param.sendWarehouseId != null"> and lbss.send_warehouse_id = #{param.sendWarehouseId}  </if>
+
+            <if test="param.serveWarehouseName != null and param.serveWarehouseName != null"> and lbss.serve_warehouse_name  like concat('%',#{param.serveWarehouseName} ,'%')   </if>
+            <if test="param.sendWarehouseId != null and param.sendWarehouseId != null"> and lbss.send_warehouse_name like  concat('%',#{param.sendWarehouseName} ,'%')  </if>
+
         </where>
+
     </select>
 
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
index 88478b90b..4490e0913 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
@@ -59,7 +59,7 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 	public boolean submitSave(BasicdataStorageServicesEntity basicdataStorageServices) {
 
 		List<BasicdataStorageServicesEntity> basicdataStorageServicesEntities = baseMapper.selectList(Wrappers.<BasicdataStorageServicesEntity>query().lambda().
-			eq(BasicdataStorageServicesEntity::getShopId, basicdataStorageServices.getShopId()).
+			eq(BasicdataStorageServicesEntity::getClientId, basicdataStorageServices.getClientId()).
 			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId()).
 			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId())
 		);