From e537e67fdc06c987aee49abe941286880a659af2 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 7 Jan 2025 18:27:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=AE=A2=E5=8D=95=E6=95=B4=E4=BD=93=E6=97=B6?= =?UTF-8?q?=E6=95=88=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesAbnormalRecordServiceImpl.java | 5 +- .../impl/AftersalesWorkOrderServiceImpl.java | 4 -- .../com/logpm/report/dto/ReportTimeDTO.java | 7 +++ .../logpm/report/mapper/ReportTimeMapper.java | 3 +- .../logpm/report/mapper/ReportTimeMapper.xml | 61 +++++++++++++------ .../service/impl/ReportTimeServiceImpl.java | 6 +- .../impl/TrunklineCarsLoadServiceImpl.java | 2 +- 7 files changed, 58 insertions(+), 30 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index 5444d7346..73f1391bb 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -497,9 +497,12 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl exportData = baseMapper.getBasicExportData(workOrderDTO, ids, warehouseIds); return exportData; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java index 9cc4463e6..3fb02a2b7 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java @@ -40,4 +40,11 @@ public class ReportTimeDTO implements Serializable { private String trainNumber; private String loadCode; + + private String openTimeStartStr; + private String openTimeEndStr; + + private Date openTimeStart; + private Date openTimeEnd; + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.java index cff60a98c..55703e18d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.java @@ -2,7 +2,6 @@ package com.logpm.report.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.dto.ReportTimeDTO; -import com.logpm.report.entity.ReportConfigOrderAllEntity; import com.logpm.report.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -47,5 +46,5 @@ public interface ReportTimeMapper { IPage orderAllTimePage(IPage page, @Param("param") ReportTimeDTO reportTimeDTO); - List orderAllTimeExport(@Param("param") ReportTimeDTO reportTimeDTO); + List orderAllTimeExport(@Param("param") ReportTimeDTO reportTimeDTO); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index d4538df4e..fe4101e4f 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -1391,12 +1391,6 @@ where ltad.waybill_id is not null and ltad.create_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id - - and ltad.create_time >= #{param.startTime} - - - and ltad.create_time <= #{param.endTime} - and lww.brand in @@ -1436,13 +1430,6 @@ and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%') - - and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%') - GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode, - - - and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%') - group by ltad.order_code, ltad.waybill_no, ltad.brand, @@ -1451,6 +1438,26 @@ lww.departure_warehouse_name, lww.destination_warehouse_name, oat.day_time + + + and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%') + + + and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%') + + + and min(ltad.create_time) >= #{param.startTime} + + + and min(ltad.create_time) <= #{param.endTime} + + + and min(lww.create_time) >= #{param.openTimeStart} + + + and min(lww.create_time) <= #{param.openTimeEnd} + + @@ -1498,12 +1505,6 @@ where ltad.waybill_id is not null and ltad.create_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id - - and ltad.create_time >= #{param.startTime} - - - and ltad.create_time <= #{param.endTime} - and lww.brand in @@ -1545,7 +1546,6 @@ and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%') - GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode, and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%') @@ -1558,6 +1558,27 @@ lww.departure_warehouse_name, lww.destination_warehouse_name, oat.day_time + + + and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%') + GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode, + + + and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%') + + + and min(ltad.create_time) >= #{param.startTime} + + + and min(ltad.create_time) <= #{param.endTime} + + + and min(lww.create_time) >= #{param.openTimeStart} + + + and min(lww.create_time) <= #{param.openTimeEnd} + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java index 12f2ff6d0..f71a937ec 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java @@ -415,6 +415,8 @@ public class ReportTimeServiceImpl implements IReportTimeService { reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr())); reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr())); + reportTimeDTO.setOpenTimeStart(CommonUtil.getStartByDateStr(reportTimeDTO.getOpenTimeStartStr())); + reportTimeDTO.setOpenTimeEnd(CommonUtil.getEndByDateStr(reportTimeDTO.getOpenTimeEndStr())); reportTimeDTO.setDayTime(0); @@ -447,9 +449,9 @@ public class ReportTimeServiceImpl implements IReportTimeService { reportTimeDTO.setDayTime(orderAllEntity.getDayTime()); } - List list = reportTimeMapper.orderAllTimeExport(reportTimeDTO); + List list = reportTimeMapper.orderAllTimeExport(reportTimeDTO); //导出ls - ExcelUtil.export(response, "订单整体时效报表导出", "订单整体时效报表导出", list, ReportConfigOrderAllEntity.class); + ExcelUtil.export(response, "订单整体时效报表导出", "订单整体时效报表导出", list, ReportOrderAllTimeVO.class); } } 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 f1ea2521c..8b36e8e77 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 @@ -9043,7 +9043,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl