From efacbfdf9f06b3f49bb8b611ee52c46d4029394c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 6 Jun 2024 16:56:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BasicdataStoreContactServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java index 82930eae4..181fd5f26 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java @@ -77,7 +77,6 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl ids = storeContactEntities.stream().filter(f -> !f.getId().equals(basicdataStoreContact.getId())).map(BasicdataStoreContactEntity::getId).collect(Collectors.toList()); if (!ids.isEmpty()) { this.update(Wrappers.update().lambda() @@ -85,11 +84,13 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl collected = storeContactEntities.stream().filter(f -> f.getId().equals(basicdataStoreContact.getId())).collect(Collectors.toList()); + //修改客户的展示联系人为默认联系人 basicdataClientService.update(Wrappers.update().lambda() - .eq(BasicdataClientEntity::getId,basicdataStoreContact.getShopId()) - .set(BasicdataClientEntity::getLinkman,basicdataStoreContact.getLinkman()) - .set(BasicdataClientEntity::getPhone,basicdataStoreContact.getPhone()) + .eq(BasicdataClientEntity::getId,collected.get(0).getShopId()) + .set(BasicdataClientEntity::getLinkman,collected.get(0).getLinkman()) + .set(BasicdataClientEntity::getPhone,collected.get(0).getPhone()) ); this.updateById(basicdataStoreContact); return true; From 18fd4114a3f36e51b619754ddd170fdb4d1339b7 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Thu, 6 Jun 2024 17:00:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=9E=97?= =?UTF-8?q?=E6=B0=8F=E9=BD=90=E5=A5=97=E5=90=8E=E6=8E=A8=E9=80=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factorydata/linsy/enums/FactoryNodeEnums.java | 4 ++-- .../java/com/logpm/factorydata/linsy/enums/NodeNeedEnums.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/FactoryNodeEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/FactoryNodeEnums.java index 9b637d7a3..14667ed4e 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/FactoryNodeEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/FactoryNodeEnums.java @@ -17,11 +17,11 @@ public enum FactoryNodeEnums { /** * 已交接 */ - INITIAL_WAREHOUSE_ENTRY(20, "Deliveried", 1), + INITIAL_WAREHOUSE_ENTRY(101020, "Deliveried", 1), /** * 收货完成 */ - END_WAREHOUSE_UNLOADING(170, "Received", 1); + END_WAREHOUSE_UNLOADING(105040, "Received", 1); private Integer code; private String text; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/NodeNeedEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/NodeNeedEnums.java index f44f304e8..899169bbc 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/NodeNeedEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/NodeNeedEnums.java @@ -16,11 +16,11 @@ public enum NodeNeedEnums implements Serializable { /** * 始发仓入库 */ - INITIAL_WAREHOUSE_ENTRY(20, "始发仓入库"), + INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"), /** * 末端仓卸车确认 */ - END_WAREHOUSE_UNLOADING(170, "末端仓卸车确认"), + END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), ; private Integer code; From 78251208578c190d04d25a1f5f8842a548caa58a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 6 Jun 2024 17:17:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BasicdataClientMapper.xml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml index 46f30ff07..7b32b4177 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml @@ -151,18 +151,21 @@ AND lbc.client_type = #{param.clientType} - - AND DATE_FORMAT(lbc.contract_start_time,, '%Y-%m-%d') > DATE_FORMAT(#{param.contractStartTime}, '%Y-%m-%d') - - - AND DATE_FORMAT(lbc.contract_ent_time,, '%Y-%m-%d') < DATE_FORMAT(#{param.contractEntTime}, '%Y-%m-%d') + + AND lbc.type_ervice = #{param.typeServiceName} + + + + + + AND t.aaa LIKE CONCAT('%', #{param.brandName}, '%') - - AND lbc.contract_start_time >= DATE_FORMAT(#{param.stratTimeDate}, '%Y-%m-%d') - AND lbc.contract_ent_time <= DATE_FORMAT(#{param.endTimeDate}, '%Y-%m-%d') + + AND lbc.contract_start_time >= DATE_FORMAT(#{param.startDate}, '%Y-%m-%d') + AND lbc.contract_ent_time <= DATE_FORMAT(#{param.endDate}, '%Y-%m-%d') GROUP BY