diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index 0a435849..3bac7345 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -127,8 +127,8 @@ public class ReportController { * @param paramMap * @return */ - @PostMapping("/shopOrderSchedule") - public R shopOrderSchedule(@RequestBody(required = false) Map paramMap){ + @GetMapping("/shopOrderSchedule") + public R shopOrderSchedule(@RequestParam(required = false) Map paramMap){ try{ List> result = reportService.shopOrderSchedule(paramMap); return R.ok(result); diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 0ed5078e..8dd8091c 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -26,11 +26,11 @@ AND STATUS = #{param.status} - - AND REQUEST_DATE_TIME >= TO_DATE(#{param.startDateTime}, 'YYYY-MM-DD HH24:MI:SS') + + AND REQUEST_DATE_TIME >= TO_DATE(#{param.startDateTime}, 'YYYY-MM-DD') - 8/24 - - AND REQUEST_DATE_TIME <= TO_DATE(#{param.endDateTime}, 'YYYY-MM-DD HH24:MI:SS') + + AND REQUEST_DATE_TIME <= TO_DATE(#{param.endDateTime}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS') AND PARAM LIKE '%${param.param}%' @@ -107,17 +107,17 @@ AND S2.STATUS != '405' - - AND ZSD.ACTUAL_START_DATE >= TO_DATE(#{param.startDateTime}, 'YYYY-MM-DD HH24:MI:SS') + + AND ZSD.ACTUAL_START_DATE >= TO_DATE(#{param.startDateTime}, 'YYYY-MM-DD') - 8/24 - - AND ZSD.ACTUAL_START_DATE <= TO_DATE(#{param.endDateTime}, 'YYYY-MM-DD HH24:MI:SS') + + AND ZSD.ACTUAL_START_DATE <= TO_DATE(#{param.endDateTime}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS') - - AND ZSD.ACTUAL_COMPLETE_DATE >= TO_DATE(#{param.completeStartDateTime}, 'YYYY-MM-DD HH24:MI:SS') + + AND ZSD.ACTUAL_COMPLETE_DATE >= TO_DATE(#{param.completeStartDateTime}, 'YYYY-MM-DD') - 8/24 - - AND ZSD.ACTUAL_COMPLETE_DATE <= TO_DATE(#{param.endDateTime}, 'YYYY-MM-DD HH24:MI:SS') + + AND ZSD.ACTUAL_COMPLETE_DATE <= TO_DATE(#{param.completeEndDateTime}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS') @@ -203,14 +203,17 @@ AND (R.RESRCE LIKE '%${param.resource}%' OR R.DESCRIPTION LIKE '%${param.resource}%') + + AND ZRRT.ACTUAL_START_DATE >= TO_DATE(#{param.startDateTime},'YYYY-MM-DD') - 8/24 + + + AND ZRRT.ACTUAL_START_DATE <= TO_DATE(#{param.endDateTime}|| '15:59:59','YYYY-MM-DD HH24:MI:SS') + - - - \ No newline at end of file diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 92c6baae..c7142d2c 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -3,7 +3,7 @@ + +