From b9251b84e0fecc169c1c5669ee9038df9b36a5c8 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 26 Jul 2024 17:48:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/dto/LoadCarsDTO.java | 18 +++++ .../mapper/AftersalesAbnormalRecordMapper.xml | 2 +- .../mapper/TrunklineCarsLoadMapper.xml | 73 +++++++++++++++++-- .../service/impl/OpenOrderServiceImpl.java | 28 ++++--- .../impl/TrunklineCarsLoadServiceImpl.java | 30 ++++++++ 5 files changed, 134 insertions(+), 17 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index d306ed6ce..178ea743d 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -146,6 +146,11 @@ public class LoadCarsDTO implements Serializable { private Integer unloadAbnormal; private Integer isSupple; + private String arriveTimeStartStr; + private String arriveTimeEndStr; + + private Date arriveTimeStart; + private Date arriveTimeEnd; private String createTimeStartStr; private String createTimeEndStr; @@ -161,4 +166,17 @@ public class LoadCarsDTO implements Serializable { private String carsNo; + + private String carrierTimeStartStr; + private String carrierTimeEndStr; + + private Date carrierTimeStart; + private Date carrierTimeEnd; + + private String signTimeStartStr; + private String signTimeEndStr; + + private Date signTimeStart; + private Date signTimeEnd; + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml index f21623007..2076a82f7 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml @@ -39,7 +39,7 @@ and Locate(#{param.upUserName},up_user_name) > 0 - + and abnormal_status = #{param.abnormalStatus} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 7e9ca3f7d..c810ebbce 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -54,6 +54,24 @@ and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0) + + and ltcl.create_time >= #{param.createTimeStart} + + + and ltcl.create_time <= #{param.createTimeEnd} + + + and ltcl.start_time >= #{param.startTime} + + + and ltcl.start_time <= #{param.endTime} + + + and ltcl.arrive_time >= #{param.arriveTimeStart} + + + and ltcl.arrive_time <= #{param.arriveTimeEnd} + group by ltcl.id,ltcl.cars_no, ltcl.plan_loading_number, ltcl.real_loading_number, @@ -120,6 +138,24 @@ and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0 + + and ltcl.create_time >= #{param.createTimeStart} + + + and ltcl.create_time <= #{param.createTimeEnd} + + + and ltcl.start_time >= #{param.startTime} + + + and ltcl.start_time <= #{param.endTime} + + + and ltcl.arrive_time >= #{param.arriveTimeStart} + + + and ltcl.arrive_time <= #{param.arriveTimeEnd} + group by ltcl.id,ltcl.cars_no, ltcl.plan_loading_number, ltcl.real_loading_number, @@ -397,12 +433,6 @@ and ltcl.load_status != '0' - - and ltcl.create_time >= #{param.startTime} - - - and ltcl.create_time <= #{param.endTime} - and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0 @@ -433,6 +463,37 @@ and Locate(#{param.settlementPerson},ltcl.settlement_person) > 0 + + + and ltcl.create_time >= #{param.createTimeStart} + + + and ltcl.create_time <= #{param.createTimeEnd} + + + and ltcl.start_time >= #{param.startTime} + + + and ltcl.start_time <= #{param.endTime} + + + and ltcl.arrive_time >= #{param.arriveTimeStart} + + + and ltcl.arrive_time <= #{param.arriveTimeEnd} + + + and ltcl.arrive_time >= #{param.carrierTimeStart} + + + and ltcl.arrive_time <= #{param.carrierTimeEnd} + + + and ltcl.arrive_time >= #{param.signTimeStart} + + + and ltcl.arrive_time <= #{param.signTimeEnd} + group by ltcl.id order by ltcl.create_time desc diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 14cf98d87..b44fc2e00 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -4414,16 +4414,24 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } private Long saveNewClient(String unit, String linkman, String linkPhone, String linkAddress, String type) { - BasicdataClientEntity basicdataClientEntity = new BasicdataClientEntity(); - basicdataClientEntity.setClientName(unit); - basicdataClientEntity.setTypeService(2); - basicdataClientEntity.setCargoControl(false); - basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位 - basicdataClientEntity.setLinkman(linkman); - basicdataClientEntity.setPhone(linkPhone); - basicdataClientEntity.setDetailedly(linkAddress); - basicdataClientEntity.setIsNew(1); - return basicdataClientClient.addReturnId(basicdataClientEntity); + Long clientId = null; + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(unit); + if(Objects.isNull(basicdataClientEntity)){ + basicdataClientEntity = new BasicdataClientEntity(); + basicdataClientEntity.setClientName(unit); + basicdataClientEntity.setTypeService(2); + basicdataClientEntity.setCargoControl(false); + basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位 + basicdataClientEntity.setLinkman(linkman); + basicdataClientEntity.setPhone(linkPhone); + basicdataClientEntity.setDetailedly(linkAddress); + basicdataClientEntity.setIsNew(1); + clientId = basicdataClientClient.addReturnId(basicdataClientEntity); + }else{ + clientId = basicdataClientEntity.getId(); + } + + return clientId; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 22e96c8d9..2726d0300 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -128,6 +128,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.loadCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); //把records中的id封装成一个set @@ -158,6 +168,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.arriveCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); //把records中的id封装成一个set @@ -1967,9 +1986,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.tripartiteTransferPageList(page, loadCarsDTO); return pageList;