From 9d1ab00d884b2225b60ee3efe3c00db510f91a29 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 二月 2025 17:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 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 255181b..654ac2f 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
@@ -135,6 +135,7 @@
complaint.setClosingTime(new Date(System.currentTimeMillis() + config.getDemandProcessingTime() * 24 * 60 * 60 * 1000));
// 保存诉求记录
save(complaint);
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
//保存记录
ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
complaintAuditRecord.setComplaintId(complaint.getId());
@@ -147,6 +148,7 @@
complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
complaintAuditRecord.setReportType(accountLevel);
complaintAuditRecord.setSuperiorId(superiorId);
+ complaintAuditRecord.setSort(count + 1);
complaintAuditRecordService.save(complaintAuditRecord);
}
@@ -372,20 +374,21 @@
// 添加审核记录
//complaintAuditRecordService.createComplaintAuditRecord(dto.getComplaintId(), 2, dto.getComment(), loginUserInfoVO,adminUser);
-
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
complaintAuditRecord.setComplaintId(complaint.getId());
complaintAuditRecord.setLatestFlag(true);
complaintAuditRecord.setAuditType(2);
complaintAuditRecord.setAuditStatus(0);
complaintAuditRecord.setCreateBy(loginUserInfoVO.getUserId());
- complaintAuditRecord.setCreateTime(new Date(System.currentTimeMillis()));
+ complaintAuditRecord.setCreateTime(new Date());
complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
- complaintAuditRecord.setUpdateTime(new Date(System.currentTimeMillis()));
+ complaintAuditRecord.setUpdateTime(new Date());
complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
complaintAuditRecord.setReportType(Objects.isNull(adminUser) ? 5 : adminUser.getAccountLevel());
complaintAuditRecord.setSuperiorId(currentId);
complaintAuditRecord.setComment(dto.getComment());
+ complaintAuditRecord.setSort(count + 1);
complaintAuditRecordService.save(complaintAuditRecord);
@@ -395,13 +398,14 @@
complaintAuditRecord2.setAuditType(2);
complaintAuditRecord2.setAuditStatus(0);
complaintAuditRecord2.setCreateBy(loginUserInfoVO.getUserId());
- complaintAuditRecord2.setCreateTime(new Date(System.currentTimeMillis()));
+ complaintAuditRecord2.setCreateTime(new Date());
complaintAuditRecord2.setUpdateBy(loginUserInfoVO.getUserId());
- complaintAuditRecord2.setUpdateTime(new Date(System.currentTimeMillis()));
+ complaintAuditRecord2.setUpdateTime(new Date());
complaintAuditRecord2.setReporter(loginUserInfoVO.getNickName());
complaintAuditRecord2.setReportType(reportType);
complaintAuditRecord2.setSuperiorId(superiorId);
complaintAuditRecord2.setComment(dto.getComment());
+ complaintAuditRecord2.setSort(count + 2);
complaintAuditRecordService.save(complaintAuditRecord2);
}
@@ -439,7 +443,7 @@
complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
.set(ComplaintAuditRecord::getLatestFlag, false));
-
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
ComplaintAuditRecord record = new ComplaintAuditRecord();
record.setComplaintId(complaint.getId());
record.setLatestFlag(true);
@@ -452,6 +456,7 @@
record.setReporter(loginUserInfoVO.getNickName());
record.setReportType(accountLevel);
record.setSuperiorId(dto.getDispatchId());
+ record.setSort(count + 1);
complaintAuditRecordService.save(record);
}
@@ -504,6 +509,7 @@
.set(ComplaintAuditRecord::getLatestFlag, false));
if (complaintReporAuditDTO.getAuditResult().equals(1)) {
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
ComplaintAuditRecord record = new ComplaintAuditRecord();
record.setComplaintId(complaint.getId());
record.setLatestFlag(true);
@@ -511,12 +517,13 @@
record.setAuditType(0);
record.setAuditStatus(1);
record.setCreateBy(loginUserInfoVO.getUserId());
- record.setCreateTime(new Date(System.currentTimeMillis()));
+ record.setCreateTime(new Date());
record.setUpdateBy(loginUserInfoVO.getUserId());
- record.setUpdateTime(new Date(System.currentTimeMillis()));
+ record.setUpdateTime(new Date());
record.setReporter(complaintAuditRecord.getReporter());
record.setReportType(complaintAuditRecord.getReportType());
record.setSuperiorId(superiorId);
+ record.setSort(count + 1);
complaintAuditRecordService.save(record);
@@ -545,7 +552,7 @@
superiorId = complaint.getCreateBy();
break;
}
-
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
ComplaintAuditRecord record2 = new ComplaintAuditRecord();
record2.setComplaintId(complaint.getId());
record2.setLatestFlag(true);
@@ -553,13 +560,14 @@
record2.setAuditorId(loginUserInfoVO.getUserId());
record2.setAuditStatus(2);
record2.setCreateBy(loginUserInfoVO.getUserId());
- record2.setCreateTime(new Date(System.currentTimeMillis()));
+ record2.setCreateTime(new Date());
record2.setUpdateBy(loginUserInfoVO.getUserId());
- record2.setUpdateTime(new Date(System.currentTimeMillis()));
+ record2.setUpdateTime(new Date());
record2.setReporter(complaintAuditRecord.getReporter());
record2.setReportType(systemUser.getAccountLevel() + 1);
record2.setSuperiorId(superiorId);
record2.setRejectReason(complaintReporAuditDTO.getRejectReason());
+ record2.setSort(count + 1);
complaintAuditRecordService.save(record2);
}
}
@@ -588,7 +596,7 @@
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
- reportType = accountLevel + 1;
+ reportType = accountLevel - 1;
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -617,33 +625,35 @@
complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
.set(ComplaintAuditRecord::getLatestFlag, false));
-
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, complaint.getId()));
ComplaintAuditRecord record1 = new ComplaintAuditRecord();
record1.setComplaintId(complaint.getId());
record1.setLatestFlag(true);
record1.setAuditType(2);
- record1.setAuditStatus(2);
+ record1.setAuditStatus(0);
record1.setCreateBy(loginUserInfoVO.getUserId());
record1.setCreateTime(new Date(System.currentTimeMillis()));
record1.setUpdateBy(loginUserInfoVO.getUserId());
record1.setUpdateTime(new Date(System.currentTimeMillis()));
record1.setReporter(loginUserInfoVO.getNickName());
- record1.setReportType(systemUser.getAccountLevel());
+ record1.setReportType(Objects.isNull(systemUser) ? 5 : systemUser.getAccountLevel());
record1.setSuperiorId(currentId);
+ record1.setSort(count + 1);
complaintAuditRecordService.save(record1);
ComplaintAuditRecord record2 = new ComplaintAuditRecord();
record2.setComplaintId(complaint.getId());
record2.setLatestFlag(true);
record2.setAuditType(2);
- record2.setAuditStatus(2);
+ record2.setAuditStatus(0);
record2.setCreateBy(loginUserInfoVO.getUserId());
record2.setCreateTime(new Date(System.currentTimeMillis()));
record2.setUpdateBy(loginUserInfoVO.getUserId());
record2.setUpdateTime(new Date(System.currentTimeMillis()));
record2.setReporter(loginUserInfoVO.getNickName());
- record2.setReportType(systemUser.getAccountLevel() - 1);
+ record2.setReportType(reportType);
record2.setSuperiorId(superiorId);
+ record2.setSort(count + 2);
complaintAuditRecordService.save(record2);
}
@@ -694,7 +704,7 @@
complaintAuditRecordService.update(new LambdaUpdateWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
.set(ComplaintAuditRecord::getLatestFlag, false));
-
+ int count = complaintAuditRecordService.count(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, dto.getId()));
ComplaintAuditRecord record1 = new ComplaintAuditRecord();
record1.setComplaintId(dto.getComplaintId());
record1.setLatestFlag(true);
@@ -708,6 +718,7 @@
record1.setReporter(complaintAuditRecord.getReporter());
record1.setReportType(systemUser.getAccountLevel());
record1.setSuperiorId(cunrrentId);
+ record1.setSort(count + 1);
complaintAuditRecordService.save(record1);
}
@@ -732,7 +743,8 @@
// 使用基本类型比较并补充默认分支
List<DispatchVO> dispatchVOList = new ArrayList<>();
if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- List<ComAct> list = comActService.list();
+ String streetId = adminUser.getStreetId();
+ List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0));
for (ComAct comAct : list) {
DispatchVO dispatchVO = new DispatchVO();
dispatchVO.setId(comAct.getCommunityId().toString());
@@ -740,7 +752,8 @@
dispatchVOList.add(dispatchVO);
}
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
- List<ComStreet> list = comStreetService.list();
+ String districtsCode = adminUser.getDistrictsCode();
+ List<ComStreet> list = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAreaCode, districtsCode));
for (ComStreet street : list) {
DispatchVO dispatchVO = new DispatchVO();
dispatchVO.setId(street.getStreetId().toString());
--
Gitblit v1.7.1