From 039abee6b27058ca46b1e1e82aa0b5407a5dad44 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 15:25:26 +0800
Subject: [PATCH] 优化 和修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java | 136 ++++++++++++++++++++++----------------------
1 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
index 77a0188..33eaa84 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
@@ -361,8 +361,8 @@
// 处理页面颜色展示和倒计时
Date nowLevelTime = record.getNowLevelTime();
if (record.getNowLevel() == 2) {
- Integer HandlingTime = config.getDistrictHandlingTime();
- Integer DeadlineReminder = config.getDistrictDeadlineReminder();
+ Long HandlingTime = config.getDistrictHandlingTime().longValue();
+ Long DeadlineReminder = config.getDistrictDeadlineReminder().longValue();
// 判断是超时 还是 临期
if (nowLevelTime.getTime() + HandlingTime * 24 * 60 * 60 * 1000 < date.getTime()) {
record.setRemindStatus(2);
@@ -374,8 +374,8 @@
BigDecimal result = new BigDecimal(days).setScale(1, RoundingMode.HALF_UP); // 保留1位小数
record.setRemindTime(result.doubleValue());
} else if (record.getNowLevel() == 3) {
- Integer HandlingTime = config.getStreetHandlingTime();
- Integer DeadlineReminder = config.getStreetDeadlineReminder();
+ Long HandlingTime = config.getStreetHandlingTime().longValue();
+ Long DeadlineReminder = config.getStreetDeadlineReminder().longValue();
// 判断是超时 还是 临期
if (nowLevelTime.getTime() + HandlingTime * 24 * 60 * 60 * 1000 < date.getTime()) {
record.setRemindStatus(2);
@@ -387,8 +387,8 @@
BigDecimal result = new BigDecimal(days).setScale(1, RoundingMode.HALF_UP); // 保留1位小数
record.setRemindTime(result.doubleValue());
} else if (record.getNowLevel() == 4) {
- Integer HandlingTime = config.getCommunityHandlingTime();
- Integer DeadlineReminder = config.getCommunityDeadlineReminder();
+ Long HandlingTime = config.getCommunityHandlingTime().longValue();
+ Long DeadlineReminder = config.getCommunityDeadlineReminder().longValue();
// 判断是超时 还是 临期
if (nowLevelTime.getTime() + HandlingTime * 24 * 60 * 60 * 1000 < date.getTime()) {
record.setRemindStatus(2);
@@ -406,21 +406,26 @@
if (count > 0) {
record.setEvaluateButtonStatus(1);
} else {
- if (systemUser != null) {
- if (record.getStatus() == 3 && systemUser.getAccountLevel() == record.getNowLevel()) {
- record.setEvaluateButtonStatus(0);
- } else if (record.getCreateBy().equals(loginUserInfoVO.getUserId()) && record.getStatus() == 3) {
- record.setEvaluateButtonStatus(0);
- } else {
- record.setEvaluateButtonStatus(1);
- }
- } else {
- if (record.getStatus() == 3 && loginUserInfoVO.getUserId().equals(record.getCreateBy())) {
- record.setEvaluateButtonStatus(0);
- } else {
- record.setEvaluateButtonStatus(1);
- }
+ if(record.getStatus()==3){
+ record.setEvaluateButtonStatus(0);
+ }else {
+ record.setEvaluateButtonStatus(1);
}
+// if (systemUser != null) {
+// if (record.getStatus() == 3 && systemUser.getAccountLevel() == record.getNowLevel()) {
+// record.setEvaluateButtonStatus(0);
+// } else if (record.getCreateBy().equals(loginUserInfoVO.getUserId()) && record.getStatus() == 3) {
+// record.setEvaluateButtonStatus(0);
+// } else {
+// record.setEvaluateButtonStatus(1);
+// }
+// } else {
+// if (record.getStatus() == 3 && loginUserInfoVO.getUserId().equals(record.getCreateBy())) {
+// record.setEvaluateButtonStatus(0);
+// } else {
+// record.setEvaluateButtonStatus(1);
+// }
+// }
}
}
@@ -707,56 +712,56 @@
if (systemUser != null) {
ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, id).eq(ComplaintAuditRecord::getLatestFlag, 1).last("limit 1"));
if (systemUser.getAccountLevel() == 2) {
- if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 2 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3) || one==null )) {
- detail.setStatus(-1);
- }else if (systemUser.getSystemRoleId() == 0) {
- // 查是否是当前层级处理 不是则都是正在办理
- if (detail.getNowLevel() != 4 && detail.getStatus() != 3 && detail.getStatus() != 8) {
+ if(detail.getStatus()!=5) {
+ if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 2 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1) || (one != null && one.getAuditStatus() == 3) || one == null)) {
+ detail.setStatus(-1);
+ } else if (systemUser.getSystemRoleId() == 0) {
+ // 查是否是当前层级处理 不是则都是正在办理
+ if (detail.getNowLevel() != 4 && detail.getStatus() != 3 && detail.getStatus() != 8) {
+ detail.setStatus(0);
+ }
+ } else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel() == 2) {
+ detail.setStatus(5);
+ } else if (detail.getStatus() == 3 || detail.getStatus() == 8) {
+ detail.setStatus(detail.getStatus());
+ } else {
detail.setStatus(0);
}
- }else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel()==2) {
- detail.setStatus(5);
- }else if(detail.getStatus()==3 || detail.getStatus()==8){
- detail.setStatus(detail.getStatus());
- }else {
- detail.setStatus(0);
+
}
-
-
}
if (systemUser.getAccountLevel() == 3) {
- if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 3 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3) || one==null )) {
- detail.setStatus(-1);
- }else if (systemUser.getSystemRoleId() == 0) {
- // 查是否是当前层级处理 不是则都是正在办理
- if (detail.getNowLevel() != 3 && detail.getStatus() != 3 && detail.getStatus() != 8) {
+ if(detail.getStatus()!=5) {
+ if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 3 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1) || (one != null && one.getAuditStatus() == 3) || one == null)) {
+ detail.setStatus(-1);
+ } else if (systemUser.getSystemRoleId() == 0) {
+ // 查是否是当前层级处理 不是则都是正在办理
+ if (detail.getNowLevel() != 3 && detail.getStatus() != 3 && detail.getStatus() != 8) {
+ detail.setStatus(0);
+ }
+ } else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel() == 3) {
+ detail.setStatus(5);
+ } else if (detail.getStatus() == 3 || detail.getStatus() == 8) {
+ detail.setStatus(detail.getStatus());
+ } else {
detail.setStatus(0);
}
- }else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel()==3) {
- detail.setStatus(5);
- }else if(detail.getStatus()==3 || detail.getStatus()==8){
- detail.setStatus(detail.getStatus());
- }else {
- detail.setStatus(0);
- }
+ }
}
if (systemUser.getAccountLevel() == 4) {
- if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 4 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3) || one==null )) {
- detail.setStatus(-1);
- }else if (systemUser.getSystemRoleId() == 0) {
- // 查是否是当前层级处理 不是则都是正在办理
- if (detail.getNowLevel() != 4 && detail.getStatus() != 3 && detail.getStatus() != 8) {
+ if(detail.getStatus()!=5){
+ if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getNowLevel() == 4 && detail.getAssignStatus() == 0 && ((one != null && one.getAuditStatus() == 1)||(one != null && one.getAuditStatus() == 3) || one==null )) {
+ detail.setStatus(-1);
+ }else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel()==4) {
+ detail.setStatus(5);
+ }else if(detail.getStatus()==3 || detail.getStatus()==8){
+ detail.setStatus(detail.getStatus());
+ }else {
detail.setStatus(0);
}
- }else if (detail.getStatus() != 3 && detail.getStatus() != 8 && detail.getFirstStatus() == 0 && detail.getNowLevel()==4) {
- detail.setStatus(5);
- }else if(detail.getStatus()==3 || detail.getStatus()==8){
- detail.setStatus(detail.getStatus());
- }else {
- detail.setStatus(0);
}
@@ -803,15 +808,9 @@
ComplaintComment comment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
detail.setComplaintComment(comment);
if (detail.getStatus() == 3 && 0 == count) {
- if (systemUserByPhone.isPresent()) {
- if (accountLevel.compareTo(detail.getNowLevel()) == 0) {
- detail.setEvaluateButtonStatus(0);
- }
- } else {
- if (detail.getCreateBy().equals(loginUserInfoVO.getUserId())) {
- detail.setEvaluateButtonStatus(0);
- }
- }
+ detail.setEvaluateButtonStatus(0);
+ }else {
+ detail.setEvaluateButtonStatus(1);
}
@@ -1239,7 +1238,7 @@
complaintAuditRecord.setAuditTime(new Date());
- if (systemUser.getSystemRoleId() != 1 || systemUser.getAccountLevel() != complaintAuditRecord.getReporterLevel()) {
+ if (systemUser.getSystemRoleId() > 2 || systemUser.getAccountLevel() != complaintAuditRecord.getReporterLevel()) {
throw new ServiceException("无权审核");
}
@@ -1260,6 +1259,7 @@
Complaint complaint = this.getById(complaintReporAuditDTO.getId());
complaint.setAssignPersonId(complaintReporAuditDTO.getDeptId());
complaint.setAssignStatus(1);
+ complaint.setFirstStatus(1);
complaint.setLastSuperiorId(complaint.getSuperiorId());
complaint.setLastLevel(complaint.getNowLevel());
complaint.setRemark(complaintReporAuditDTO.getRemark());
@@ -1522,7 +1522,7 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
List<DispatchVO> dispatchVOList = new ArrayList<>();
SystemUser adminUser = identityInformation.getSystemUser();
- if (adminUser.getSystemRoleId() != 1) {
+ if (adminUser.getSystemRoleId() >2) {
throw new ServiceException("无权查看");
}
Integer oneDepartmentId = adminUser.getOneDepartmentId();
@@ -1642,7 +1642,7 @@
if (count > 0) {
record.setEvaluateButtonStatus(1);
} else {
- if (record.getStatus() == 3 && loginUserInfo.getAccountLevel() == record.getNowLevel()) {
+ if (record.getStatus() == 3 ) {
record.setEvaluateButtonStatus(0);
} else {
record.setEvaluateButtonStatus(1);
--
Gitblit v1.7.1