From ab440ab911d5998c3ce788b96c9b93b3df518c3d Mon Sep 17 00:00:00 2001 From: z Date: Mon, 14 Jul 2025 08:09:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=BC=82=E5=B8=B8=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/bdgzsomthing/bdgzsomthingController.java | 10 +++++----- .../UnqualifiedNotificationMapper.java | 6 ++++-- .../UnqualifiedNotificationServiceImpl.java | 13 ++++++------- .../UnqualifiedNotificationMapper.xml | 4 ++++ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java index 6f8ed56..864fa23 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java @@ -151,7 +151,7 @@ public class bdgzsomthingController { BeanUtils.toBean(list, bdgzsomthingRespVO.class)); } -// @Scheduled(fixedRate = 10800000) + @Scheduled(fixedRate = 10800000) public void scheduledTask() { bdgzsomthingService.selectds(); } @@ -159,16 +159,16 @@ public class bdgzsomthingController { //@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次 @PostConstruct public void init() { -// selectHasPrice(); -// selectSafeStorageAndDeliverOneYear(); + selectHasPrice(); + selectSafeStorageAndDeliverOneYear(); // bdgzsomthingService.selectds(); } -// @Scheduled(cron = "0 0 2 * * ?") + @Scheduled(cron = "0 0 2 * * ?") public void selectHasPrice(){ bdgzsomthingService.selectHasPrice(); } -// @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "0 0 0 * * ?") public void selectSafeStorageAndDeliverOneYear(){bdgzsomthingService.selectSafeStorageAndDeliverOneYear();} @PostMapping("/getMessage") @Operation(summary = "小程序消息") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java index c501aa3..7b03420 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java @@ -139,9 +139,11 @@ public interface UnqualifiedNotificationMapper extends BaseMapperX selectConfirmPageWx( @Param("queryType") Integer queryType, @Param("offset") Integer offset, - @Param("limit") Integer limit); + @Param("limit") Integer limit, + @Param("userId") Integer userId); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java index fb5164e..72dd3e2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java @@ -37,10 +37,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -245,13 +242,13 @@ try { @Override public PageResult unqualifiedNotificationConfirmPageWx(UnqualifiedNotificationPageReqVO pageReqVO) { PageResult pageResult = new PageResult<>(); - Long total = unqualifiedNotificationMapper.selectCountConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize()); + Long total = unqualifiedNotificationMapper.selectCountConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize(),Objects.requireNonNull(getLoginUser()).getId().intValue()); pageResult.setTotal(total); if (total > 0L){ pageResult.setTotalPages(total.intValue()/ pageReqVO.getPageSize()); } - List unqualifiedNotificationDOS = unqualifiedNotificationMapper.selectConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize()); + List unqualifiedNotificationDOS = unqualifiedNotificationMapper.selectConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize(),Objects.requireNonNull(getLoginUser()).getId().intValue()); pageResult.setList(unqualifiedNotificationDOS); return pageResult; } @@ -288,6 +285,7 @@ try { bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue()); bgMasterLineDO.setAudit_time(LocalDateTime.now()); bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion()); +// bgMasterLineDO.setConStatus(2); bgMasterLineMapper.updateById(bgMasterLineDO); }else { //终检 @@ -296,6 +294,7 @@ try { bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue()); bgMasterLineDO.setAudit_time(LocalDateTime.now()); bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion()); +// bgMasterLineDO.setConStatus(2); zjBgMasterLineMapper.updateById(bgMasterLineDO); } // if(operateReqVO.getActive().equals("AUDIT")){ @@ -353,7 +352,7 @@ try { @Override public Long countWx1(UnqualifiedNotificationPageReqVO pageReqVO) { - return unqualifiedNotificationMapper.selectCountConfirmPageWx(1, 5,5); + return unqualifiedNotificationMapper.selectCountConfirmPageWx(1, 5,5, Objects.requireNonNull(getLoginUser()).getId().intValue()); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml index 9e76aec..0713b76 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml @@ -246,6 +246,7 @@ AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1 AND t.notification_status =3 AND t.audit_opinion = 2 + AND t.bg_user = #{userId} AND t.con_status = #{queryType} UNION ALL @@ -264,6 +265,7 @@ WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1 AND zj.notification_status = 3 AND zj.audit_opinion=2 + AND zj.bg_user = #{userId} AND zj.con_status = #{queryType} ) gh @@ -291,6 +293,7 @@ AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1 AND t.notification_status =3 AND t.audit_opinion = 2 + AND t.bg_user = #{userId} AND t.con_status = #{queryType} UNION ALL @@ -307,6 +310,7 @@ WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1 AND zj.notification_status = 3 AND zj.audit_opinion=2 + AND zj.bg_user = #{userId} AND zj.con_status = #{queryType} ) gh