From 75362ce7cfbdf99c8bf678453ee7dda838116e66 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Mon, 19 Sep 2022 14:56:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BAexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutStoreController.java | 3 ++- .../controller/TemporaryFixController.java | 27 ++++++++++--------- .../main/resources/mapper/ReportMapper.xml | 8 +++--- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/OutStoreController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/OutStoreController.java index 9110b7bd..f463e2d2 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/OutStoreController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/OutStoreController.java @@ -15,6 +15,7 @@ import com.foreverwin.mesnac.anomaly.model.OutStore; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; /** * @@ -47,7 +48,7 @@ public class OutStoreController { */ @ResponseBody @GetMapping("") - public R getOutStoreList(OutStore outStore){ + public R getOutStoreList(@RequestParam(required = false) OutStore outStore){ List result; QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(outStore); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java index c3dad1ba..364c2da1 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java @@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.websocket.server.PathParam; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; import java.util.logging.Handler; /** @@ -53,26 +54,26 @@ public class TemporaryFixController { */ @ResponseBody @GetMapping("") - public R getTemporaryFixList(TemporaryFix temporaryFix,String startDate,String endDate,String createdTimeNew){ + public R getTemporaryFixList(@RequestParam(required = false) Map paramMap,String startDate,String endDate,String createdTimeNew){ List result; QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(!StringUtil.isBlank(temporaryFix.getEntrustUnit()),"ENTRUST_UNIT",temporaryFix.getEntrustUnit()) - .like(!StringUtil.isBlank(temporaryFix.getDutyPerson()),"DUTY_PERSON",temporaryFix.getDutyPerson()) - .like(!StringUtil.isBlank(temporaryFix.getProjectNumber()),"PROJECT_NUMBER",temporaryFix.getProjectNumber()) - .like(!StringUtil.isBlank(temporaryFix.getQualityReviewNumber()),"QUALITY_REVIEW_NUMBER",temporaryFix.getQualityReviewNumber()) - .like(!StringUtil.isBlank(temporaryFix.getWorkContactNumber()),"WORK_CONTACT_NUMBER",temporaryFix.getWorkContactNumber()) - .like(!StringUtil.isBlank(temporaryFix.getMaterialCode()),"MATERIAL_CODE",temporaryFix.getMaterialCode()) - .like(!StringUtil.isBlank(temporaryFix.getMaterialName()),"MATERIAL_NAME",temporaryFix.getMaterialName()) - .like(!StringUtil.isBlank(temporaryFix.getMapNo()),"MAP_NO",temporaryFix.getMapNo()) - .like(!StringUtil.isBlank(temporaryFix.getOperator()),"OPERATOR",temporaryFix.getOperator()) - .like(!StringUtil.isBlank(temporaryFix.getUseDevice()),"USE_DEVICE",temporaryFix.getUseDevice()) - .eq(!StringUtil.isBlank(temporaryFix.getUploadCenter()),"UPLOAD_CENTER",temporaryFix.getUploadCenter()) + queryWrapper.eq(!StringUtil.isBlank(String.valueOf(paramMap.get("entrustUnit"))),"ENTRUST_UNIT",String.valueOf(paramMap.get("entrustUnit"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("dutyPerson"))),"DUTY_PERSON",String.valueOf(paramMap.get("dutyPerson"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("projectNumber"))),"PROJECT_NUMBER",String.valueOf(paramMap.get("projectNumber"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("qualityReviewNumber"))),"QUALITY_REVIEW_NUMBER",String.valueOf(paramMap.get("qualityReviewNumber"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("workContactNumber"))),"WORK_CONTACT_NUMBER",String.valueOf(paramMap.get("workContactNumber"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("materialCode"))),"MATERIAL_CODE",String.valueOf(paramMap.get("materialCode"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("materialName"))),"MATERIAL_NAME",String.valueOf(paramMap.get("materialName"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("mapNo"))),"MAP_NO",String.valueOf(paramMap.get("mapNo"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("operator"))),"OPERATOR",String.valueOf(paramMap.get("operator"))) + .like(!StringUtil.isBlank(String.valueOf(paramMap.get("useDevice"))),"USE_DEVICE",String.valueOf(paramMap.get("useDevice"))) + .eq(!StringUtil.isBlank(String.valueOf(paramMap.get("uploadCenter"))),"UPLOAD_CENTER",String.valueOf(paramMap.get("uploadCenter"))) .ge(!StringUtil.isBlank(startDate),"ENTRUST_DATE", DateReportUtils.stringToDate(startDate + " 00:00:00","yyyy-MM-dd HH:mm:ss")) .le(!StringUtil.isBlank(endDate),"ENTRUST_DATE",DateReportUtils.stringToDate(endDate + " 23:59:59","yyyy-MM-dd HH:mm:ss")) .ge(!StringUtil.isBlank(createdTimeNew),"ENTRUST_DATE",DateReportUtils.stringToDate(createdTimeNew + " 00:00:00","yyyy-MM-dd HH:mm:ss")) .le(!StringUtil.isBlank(createdTimeNew),"ENTRUST_DATE",DateReportUtils.stringToDate(createdTimeNew + " 23:59:59","yyyy-MM-dd HH:mm:ss")) .orderByDesc("ENTRUST_DATE"); - ; + result = temporaryFixService.list(queryWrapper); return R.ok(result); } diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index ee649515..8b14b395 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -1752,10 +1752,10 @@ AND wc.WORK_CENTER = #{workCenter} - AND to_char(zsd.PLANNED_COMP_DATE,'YYYY-mm-dd') >= #{startDate} + AND to_char(zsd.PLANNED_COMP_DATE + 8/24,'YYYY-mm-dd') >= #{startDate} - AND to_char(zsd.PLANNED_COMP_DATE,'YYYY-mm-dd') <= #{endDate} + AND to_char(zsd.PLANNED_COMP_DATE + 8/24,'YYYY-mm-dd') <= #{endDate} GROUP BY wct.DESCRIPTION,o.OPERATION, RT.DESCRIPTION, OT.DESCRIPTION) WIP @@ -1804,10 +1804,10 @@ AND wc.WORK_CENTER = #{workCenter} - AND to_char(zsd.PLANNED_COMP_DATE,'yyyy-mm') >= #{startDate} + AND to_char(zsd.PLANNED_COMP_DATE + 8/24,'yyyy-mm') >= #{startDate} - AND to_char(zsd.PLANNED_COMP_DATE,'yyyy-mm') <= #{endDate} + AND to_char(zsd.PLANNED_COMP_DATE + 8/24,'yyyy-mm') <= #{endDate} GROUP BY wct.DESCRIPTION,o.OPERATION, RT.DESCRIPTION, OT.DESCRIPTION) WIP