核验复查调整
This commit is contained in:
parent
2d1e6b582e
commit
69b572a737
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user