From 69b572a737db51e9af93eec12fe627055a7a4546 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Wed, 30 Oct 2024 10:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=AA=8C=E5=A4=8D=E6=9F=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QualityRectifyRecordServiceImpl.java  |  8 ++++----
 .../XzSecurityQualityRectifyRecordServiceImpl.java     | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRectifyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRectifyRecordServiceImpl.java
index 357ac99ad..a6469b1b0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRectifyRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRectifyRecordServiceImpl.java
@@ -177,17 +177,17 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
             //核验合格时候则该记录合格
             if (Objects.equals(qualityRectifyRecord.getStatus(), QualityRectifyRecordStatusEnum.VERIFY.getValue())) {
                 qualityInspectionRecord.setStatus(5);
-                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "质量管理整改结果核验通知", "您提交的质量检查的整改结果已通过核验。", "11",
+                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "质量管理整改结果复查通知", "您提交的质量检查的整改结果已通过复查。", "11",
                         PushPayloads.buildPushPayload(11, qualityInspectionRecord));
-                noticeService.addProjectLevelNoticeAndApp(projectSn, "质量管理整改结果核验通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的质量检查的整改结果已通过核验。", "11",
+                noticeService.addProjectLevelNoticeAndApp(projectSn, "质量管理整改结果复查通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的质量检查的整改结果已通过复查。", "11",
                         PushPayloads.buildPushPayload(11, qualityInspectionRecord));
                 this.deductScoreIf(qualityRectifyRecord);
 
             } else {
                 qualityInspectionRecord.setStatus(2);
-                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "质量管理整改结果核验通知", "您提交的质量检查的整改结果核验不通过，请及时重新整改。", "11",
+                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "质量管理整改结果复查通知", "您提交的质量检查的整改结果复查不通过，请及时重新整改。", "11",
                         PushPayloads.buildPushPayload(11, qualityInspectionRecord));
-                noticeService.addProjectLevelNoticeAndApp(projectSn, "质量管理整改结果核验通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的质量检查的整改结果核验不通过，请及时重新整改。", "11",
+                noticeService.addProjectLevelNoticeAndApp(projectSn, "质量管理整改结果复查通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的质量检查的整改结果复查不通过，请及时重新整改。", "11",
                         PushPayloads.buildPushPayload(11, qualityInspectionRecord));
             }
         }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java
index 3c68bbc45..dc50b603b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java
@@ -174,18 +174,18 @@ public class XzSecurityQualityRectifyRecordServiceImpl extends ServiceImpl<XzSec
             //核验合格时候则该记录合格
             if (Objects.equals(qualityRectifyRecord.getStatus(), XzSecurityQualityRectifyRecordStatusEnum.VERIFY.getValue())) {
                 tempQualityInspectionRecord.setStatus(5);
-                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "安全管理整改结果核验通知", "您提交的安全检查的整改结果已通过核验。", "10",
+                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "安全管理整改结果复查通知", "您提交的安全检查的整改结果已通过复查。", "10",
                         PushPayloads.buildPushPayload(10, tempQualityInspectionRecord));
-                noticeService.addProjectLevelNoticeAndApp(tempQualityInspectionRecord.getProjectSn(), "安全管理整改结果核验通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的安全检查的整改结果已通过核验。", "10",
+                noticeService.addProjectLevelNoticeAndApp(tempQualityInspectionRecord.getProjectSn(), "安全管理整改结果复查通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的安全检查的整改结果已通过复查。", "10",
                         PushPayloads.buildPushPayload(10, tempQualityInspectionRecord));
-                qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}核验了{}的一条{}安全隐患问题，请注意查看！",
+                qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{复查{}的一条{}安全隐患问题，请注意查看！",
                         enterpriseInfo.getEnterpriseName(), tempQualityInspectionRecord.getRegionName(), StrUtil.subAfter(tempQualityInspectionRecord.getDangerItemContent(), "/", true)));
                 this.deductScoreIf(qualityRectifyRecord);
             } else {
                 tempQualityInspectionRecord.setStatus(2);
-                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "安全管理整改结果核验通知", "您提交的安全检查的整改结果核验不通过，请及时重新整改。", "10",
+                noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "安全管理整改结果复查通知", "您提交的安全检查的整改结果复查不通过，请及时重新整改。", "10",
                         PushPayloads.buildPushPayload(10, tempQualityInspectionRecord));
-                noticeService.addProjectLevelNoticeAndApp(tempQualityInspectionRecord.getProjectSn(), "安全管理整改结果核验通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的安全检查的整改结果核验不通过，请及时重新整改。", "10",
+                noticeService.addProjectLevelNoticeAndApp(tempQualityInspectionRecord.getProjectSn(), "安全管理整改结果复查通知", systemUserService.getFrameUserNames(String.valueOf(tempQualityInspectionRecord.getChangeId())) + "提交的安全检查的整改结果复查不通过，请及时重新整改。", "10",
                         PushPayloads.buildPushPayload(10, tempQualityInspectionRecord));
             }
         }