From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 14 三月 2025 11:27:47 +0800 Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java index 9eeb578..35f9664 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java @@ -371,6 +371,9 @@ //complaint.setReportType(+); complaint.setSuperiorType(reportType); complaint.setSuperiorId(superiorId); + if (complaint.getStatus() != 0) { + complaint.setStatus(0); + } updateById(complaint); // 标记最新 @@ -651,6 +654,7 @@ record1.setReportType(Objects.isNull(systemUser) ? 5 : systemUser.getAccountLevel()); record1.setSuperiorId(currentId); record1.setSort(count + 1); + record1.setComment(dto.getComment()); complaintAuditRecordService.save(record1); ComplaintAuditRecord record2 = new ComplaintAuditRecord(); @@ -666,6 +670,7 @@ record2.setReportType(reportType); record2.setSuperiorId(superiorId); record2.setSort(count + 2); + record1.setComment(dto.getComment()); complaintAuditRecordService.save(record2); } @@ -706,7 +711,7 @@ //complaintAuditRecordService.audit(complaintAuditRecord, loginUserInfoVO.getUserId(), // dto.getAuditResult(), dto.getRejectReason()); //审核通过后,设置诉求延期 - if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0)) { + if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) { Complaint complaint = getById(complaintAuditRecord.getComplaintId()); complaint.setStatus(1); updateById(complaint); @@ -720,7 +725,7 @@ ComplaintAuditRecord record1 = new ComplaintAuditRecord(); record1.setComplaintId(dto.getComplaintId()); record1.setLatestFlag(true); - record1.setAuditType(2); + record1.setAuditType(1); record1.setAuditorId(loginUserInfoVO.getUserId()); record1.setAuditStatus(dto.getAuditResult()); record1.setCreateBy(loginUserInfoVO.getUserId()); @@ -731,6 +736,7 @@ record1.setReportType(complaintAuditRecord.getReportType()); record1.setSuperiorId(complaintAuditRecord.getSuperiorId()); record1.setSort(count + 1); + record1.setRejectReason(dto.getRejectReason()); complaintAuditRecordService.save(record1); } -- Gitblit v1.7.1