From da0d13053ad2956a678439509a629963a53bbab3 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sun, 12 May 2024 23:51:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=80=9A=E7=9F=A5bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/basicdata/mapper/xml/NoticeMapper.xml | 5 +---- .../IXzSecurityQualityInspectionRecordService.java | 2 +- ...XzSecurityQualityInspectionRecordServiceImpl.java | 12 ++++++------ ...ityXzSecurityQualityRectifyRecordServiceImpl.java | 6 +++--- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml index 7a857167e..a871a915a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml @@ -27,10 +27,7 @@ AND not find_in_set(type, #{param.notInType}) - AND type != 31 - - - AND type = 31 + AND type not in (31,32) ORDER BY send_time DESC diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java index cb891b228..c9cc3154d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java @@ -92,7 +92,7 @@ public interface IXzSecurityQualityInspectionRecordService extends IService riskChart(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java index af6297314..90ff283a2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java @@ -300,20 +300,20 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv noticeService.addUserNoticeAndApp(record.getChangeId(), "您有一条安全检查待整改，问题：" + record.getDangerItemContent(), "安全管理待整改", "10", PushPayloads.buildPushPayload(10, record)); if (record.getEngineeringId() == null) { - noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}检查到一条{}的{}安全隐患问题，请注意监督整改！", + noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}检查到一条{}的{}安全隐患问题，请注意监督整改！", record.getRegionName(), enterpriseInfo.getEnterpriseName(), StrUtil.subAfter(record.getDangerItemContent(), "/", true))); } else { DangerousEngineeringRecord d = dangerousEngineeringRecordMapper.selectById(record.getEngineeringId()); - noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}的{}的{}发现一条{}，请注意监督整改！", + noticeBigScreen("32", record, record.getInspectTime(), StrUtil.format("{}的{}的{}发现一条{}，请注意监督整改！", enterpriseInfo.getEnterpriseName(), d.getEngineeringName(), record.getRegionName(), record.getDangerItemContent())); } } else if (record.getRecordType() == 2) { if (record.getEngineeringId() == null) { - noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}已排查了{}的安全隐患问题，今日排查暂无次安全隐患！", + noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}已排查了{}的安全隐患问题，今日排查暂无次安全隐患！", record.getRegionName(), StrUtil.subAfter(record.getDangerItemContent(), "/", true))); } else { DangerousEngineeringRecord d = dangerousEngineeringRecordMapper.selectById(record.getEngineeringId()); - noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}的{}的{}今日排查暂无隐患", + noticeBigScreen("32", record, record.getInspectTime(), StrUtil.format("{}的{}的{}今日排查暂无隐患", enterpriseInfo.getEnterpriseName(), d.getEngineeringName(), record.getRegionName())); } } @@ -728,11 +728,11 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv } @Override - public void noticeBigScreen(XzSecurityQualityInspectionRecord qualityInspectionRecord, String time, String format) { + public void noticeBigScreen(String type, XzSecurityQualityInspectionRecord qualityInspectionRecord, String time, String format) { List systemUsers = systemUserMapper.getSystemUsers(new MapBuilder().put("sn", qualityInspectionRecord.getProjectSn()).put("type", 3).build()); for (SystemUser systemUser : systemUsers) { Notice notice = new Notice(); - notice.setType("31"); + notice.setType(type); notice.setMsg(format); notice.setAccountId(systemUser.getUserId()); notice.setTitle("大屏通知"); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java index fb20fd8f7..b30b0a59f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java @@ -86,7 +86,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service tempQualityInspectionRecord.setStatus(3); noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getReviewId(), "您有一条安全检查的整改结果需要复查，请及时查看。", "安全管理整改结果待复查", "10", PushPayloads.buildPushPayload(10, tempQualityInspectionRecord)); - qualityInspectionRecordService.noticeBigScreen(tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}整改了{}的一条{}安全隐患问题，请注意监督复查！", + qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}整改了{}的一条{}安全隐患问题，请注意监督复查！", enterpriseInfo.getEnterpriseName(), tempQualityInspectionRecord.getRegionName(), StrUtil.subAfter(tempQualityInspectionRecord.getDangerItemContent(), "/", true))); } else { tempQualityInspectionRecord.setStatus(2); @@ -97,7 +97,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service tempQualityInspectionRecord.setStatus(4); noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getVerifyManId(), "您有一条安全检查的整改结果需要核验，请及时查看。", "安全管理整改结果核验通知", "10", PushPayloads.buildPushPayload(10, tempQualityInspectionRecord)); - qualityInspectionRecordService.noticeBigScreen(tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}复查了{}的一条{}安全隐患问题，请注意监督复核！", + qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}复查了{}的一条{}安全隐患问题，请注意监督复核！", enterpriseInfo.getEnterpriseName(), tempQualityInspectionRecord.getRegionName(), StrUtil.subAfter(tempQualityInspectionRecord.getDangerItemContent(), "/", true))); } else { tempQualityInspectionRecord.setStatus(2); @@ -110,7 +110,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service tempQualityInspectionRecord.setStatus(5); noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "您提交的安全检查的整改结果已通过核验。", "安全管理整改结果核验通知", "10", PushPayloads.buildPushPayload(10, tempQualityInspectionRecord)); - qualityInspectionRecordService.noticeBigScreen(tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}核验了{}的一条{}安全隐患问题，请注意查看！", + qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}核验了{}的一条{}安全隐患问题，请注意查看！", enterpriseInfo.getEnterpriseName(), tempQualityInspectionRecord.getRegionName(), StrUtil.subAfter(tempQualityInspectionRecord.getDangerItemContent(), "/", true))); } else { tempQualityInspectionRecord.setStatus(2);