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 | 306 ++++++++++++++++++++++++++++++++------------------
1 files changed, 193 insertions(+), 113 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 b8eb4a8..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
@@ -79,11 +79,14 @@
private final IPartyMemberService partyMemberService;
private final IdentityInformationService identityInformationService;
private final IDepartmentService departmentService;
+ private final WestPopUpService westPopUpService;
private final RedisUtils redisUtils;
@Override
- public void saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
+ public HashMap<String, String> saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
+ HashMap<String, String> map = new HashMap<>();
+ String timeStr = null;
// 获取当前日期（年月日）
String datePrefix = new SimpleDateFormat("yyyyMMdd").format(new Date());
@@ -113,6 +116,7 @@
SystemUser systemUser = identityInformationVO.getSystemUser();
Integer identity = identityInformationVO.getIdentity();
if (identity == 2) {
+ loginUserInfoVO.setUserId(Long.valueOf(systemUser.getId()));
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 2:
@@ -121,8 +125,6 @@
complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
complaint.setReportUserName(systemUser.getName());
complaint.setReportUserPhone(systemUser.getPhone());
-
-
complaint.setSuperiorId(Long.valueOf(systemUser.getDistrictsCode()));
break;
case 3:
@@ -188,6 +190,18 @@
complaint.setReportUserName(loginUserInfoVO.getName());
complaint.setReportUserPhone(loginUserInfoVO.getPhone());
complaint.setSuperiorId(loginUserInfoVO.getCommunityId());
+
+
+ ComAct byId = comActService.getById(loginUserInfoVO.getCommunityId());
+ String name = byId.getName();
+ WestPopUp one = westPopUpService.getOne(new LambdaQueryWrapper<WestPopUp>().eq(WestPopUp::getName, name));
+
+ if(one!=null){
+ map.put("name", one.getDeptName());
+ map.put("phone", one.getPhone());
+ }
+
+
}
@@ -220,6 +234,11 @@
complaint.setNowLevelSms(0);
// 保存诉求记录
save(complaint);
+
+
+
+
+ return map;
}
@Override
@@ -247,6 +266,7 @@
saveResult(complaintCompletionDTO, loginUserInfo);
}
+
@Override
public Page<ComplaintVO> complaintList(ComplaintQuery query, LoginUserInfoVO loginUserInfoVO) {
@@ -266,6 +286,7 @@
if (systemUserByPhone.isPresent() && null != identity && identity == 2) {
systemUser = systemUserByPhone.get();
accountLevel = systemUser.getAccountLevel();
+ query.setUserId(Long.valueOf(systemUser.getId()));
switch (accountLevel) {
case 2:
//区县级
@@ -304,7 +325,7 @@
// 西区单位 如果是西区单位，则只看自己上报的
if (systemUser.getSystemRoleId() == 1 || systemUser.getSystemRoleId() == 2) {
// 是管理员 看所有的
- page = baseMapper.selectComplaintPage3(page, query, accountLevel, targetId,systemUser.getSystemRoleId() );
+ page = baseMapper.selectComplaintPage3(page, query, accountLevel, targetId, systemUser.getSystemRoleId());
} else {
// 不是管理员 看到指派给我的单位的诉求
page = baseMapper.selectComplaintPage4(page, query, systemUser.getOneDepartmentId());
@@ -340,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);
@@ -353,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);
@@ -366,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);
@@ -385,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);
+// }
+// }
}
}
@@ -686,52 +712,64 @@
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.getNowLevel() == 2 && detail.getAssignStatus() == 0 && one != null && one.getAuditStatus() == 1) {
- detail.setStatus(-1);
- }
- 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);
}
- }
- if (detail.getFirstStatus() == 0) {
- detail.setStatus(5);
+
}
}
if (systemUser.getAccountLevel() == 3) {
- if (detail.getNowLevel() == 3 && detail.getAssignStatus() == 0 && one != null && one.getAuditStatus() == 1) {
- detail.setStatus(-1);
- }
- 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);
}
+
}
- if (detail.getFirstStatus() == 0) {
- detail.setStatus(5);
- }
+
}
if (systemUser.getAccountLevel() == 4) {
- if (detail.getNowLevel() == 4 && detail.getAssignStatus() == 0 && one != null && one.getAuditStatus() == 1) {
- detail.setStatus(-1);
- }
- 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);
}
}
- if (detail.getFirstStatus() == 0) {
- detail.setStatus(5);
- }
+
+
}
} else {
if (detail.getFirstStatus() == 1 && detail.getStatus() != 3 && detail.getStatus() != 8) {
detail.setStatus(0);
- } else if (detail.getFirstStatus() == 0) {
+ } else if (detail.getFirstStatus() == 0 && detail.getCreateBy().equals(loginUserInfoVO.getUserId())) {
detail.setStatus(5);
} else if (detail.getFirstStatus() == 1 && detail.getStatus() == 3) {
detail.setStatus(3);
@@ -754,9 +792,9 @@
buttonPermission(detail, systemUserByPhone, loginUserInfoVO);
Long reporterId = detail.getReporterId();
Long superiorId = detail.getSuperiorId2();
- if (!String.valueOf(reporterId).equals(targetId) && !String.valueOf(superiorId).equals(targetId) && detail.getStatus() == 5) {
- detail.setStatus(0);
- }
+// if (!String.valueOf(reporterId).equals(targetId) && !String.valueOf(superiorId).equals(targetId) && detail.getStatus() == 5 && systemUser==null) {
+// detail.setStatus(0);
+// }
// if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
@@ -766,23 +804,18 @@
//已办结，显示评价按钮
int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
+ //查询评价
+ 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);
}
+
+
return detail;
}
-
-
-
-
@Override
@@ -1205,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("无权审核");
}
@@ -1226,11 +1259,15 @@
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());
complaint.setNowLevelTime(new Date());
complaint.setNowLevelSms(0);
+ if (StringUtils.isEmpty(complaint.getProblemType())) {
+ complaint.setProblemType(complaintReporAuditDTO.getProblemType());
+ }
// 分配流转
ComplaintFlow complaintFlow = new ComplaintFlow();
@@ -1485,12 +1522,22 @@
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();
Department byId = departmentService.getById(oneDepartmentId);
- List<Department> list1 = departmentService.list(new LambdaQueryWrapper<Department>().eq(Department::getTier, byId.getTier()));
+ LambdaQueryWrapper<Department> eq = new LambdaQueryWrapper<Department>().eq(Department::getTier, byId.getTier());
+ if(byId.getTier()==2){
+ eq.eq(Department::getDistrictsCode, byId.getDistrictsCode());
+ }
+ if(byId.getTier()==3){
+ eq.eq(Department::getStreetId, byId.getStreetId());
+ }
+ if(byId.getTier()==4){
+ eq.eq(Department::getCommunityId, byId.getCommunityId());
+ }
+ List<Department> list1 = departmentService.list(eq);
for (Department department : list1) {
DispatchVO dispatchVO = new DispatchVO();
dispatchVO.setId(department.getId().toString());
@@ -1565,27 +1612,27 @@
*/
@Override
public Page<ComplaintVO> pageList(MgtComplaintQuery query, SystemUserVo loginUserInfo) {
- Page<ComplaintVO> complaintVOPage=new Page<>();
+ Page<ComplaintVO> complaintVOPage = new Page<>();
if (loginUserInfo.getAccountLevel() == 2) {
- if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ if (loginUserInfo.getSystemRoleId() == 1 || loginUserInfo.getSystemRoleId() == 2) {
complaintVOPage = baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
- }else {
+ } else {
complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}
}
if (loginUserInfo.getAccountLevel() == 3) {
- if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ if (loginUserInfo.getSystemRoleId() == 1 || loginUserInfo.getSystemRoleId() == 2) {
// 获取这个街道所管的社区id
List<Long> communityIds = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, loginUserInfo.getStreetId())).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
- complaintVOPage = baseMapper.pageList2(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo,communityIds);
- }else {
+ complaintVOPage = baseMapper.pageList2(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo, communityIds);
+ } else {
complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}
}
if (loginUserInfo.getAccountLevel() == 4) {
- if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
- complaintVOPage = baseMapper.pageList3(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
- }else {
+ if (loginUserInfo.getSystemRoleId() == 1 || loginUserInfo.getSystemRoleId() == 2) {
+ complaintVOPage = baseMapper.pageList3(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
+ } else {
complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}
}
@@ -1595,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);
@@ -1642,29 +1689,29 @@
*/
@Override
public void export(MgtComplaintQuery query, SystemUserVo loginUserInfo) throws IOException {
- List<ComplaintVO> list =null;
+ List<ComplaintVO> list = null;
if (loginUserInfo.getAccountLevel() == 2) {
- if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ if (loginUserInfo.getSystemRoleId() == 1 || loginUserInfo.getSystemRoleId() == 2) {
list = baseMapper.pageListExport(query, loginUserInfo);
- }else {
+ } else {
list = baseMapper.pageList1Export(query, loginUserInfo);
}
}
if (loginUserInfo.getAccountLevel() == 3) {
- if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ if (loginUserInfo.getSystemRoleId() == 1 || loginUserInfo.getSystemRoleId() == 2) {
// 获取这个街道所管的社区id
List<Long> communityIds = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, loginUserInfo.getStreetId())).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
- list = baseMapper.pageList2Export(query, loginUserInfo,communityIds);
- }else {
- list = baseMapper.pageList1Export( query, loginUserInfo);
+ list = baseMapper.pageList2Export(query, loginUserInfo, communityIds);
+ } else {
+ list = baseMapper.pageList1Export(query, loginUserInfo);
}
}
if (loginUserInfo.getAccountLevel() == 4) {
- if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ if (loginUserInfo.getSystemRoleId() == 1 || loginUserInfo.getSystemRoleId() == 2) {
list = baseMapper.pageList3Export(query, loginUserInfo);
- }else {
- list = baseMapper.pageList1Export( query, loginUserInfo);
+ } else {
+ list = baseMapper.pageList1Export(query, loginUserInfo);
}
}
@@ -1678,7 +1725,8 @@
.registerWriteHandler(new AutoColumnWidthStrategy())
.doWrite(complaintExcels);
}
-// ComplaintVO(reporter=何健豪, reporterId=1676144498628919300, superiorId2=510403, auditCreateBy=1892421828085837826, reporterLevel=2, reporterPhone=null, departmentName=西区-金江镇, reportTime=Tue Jun 03 15:06:01 CST 2025, comment=1111, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=aa)
+
+ // ComplaintVO(reporter=何健豪, reporterId=1676144498628919300, superiorId2=510403, auditCreateBy=1892421828085837826, reporterLevel=2, reporterPhone=null, departmentName=西区-金江镇, reportTime=Tue Jun 03 15:06:01 CST 2025, comment=1111, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=aa)
// ComplaintVO(reporter=null, reporterId=null, superiorId2=null, auditCreateBy=null, reporterLevel=null, reporterPhone=null, departmentName=null, reportTime=null, comment=null, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=aa)
// ComplaintVO(reporter=刘, reporterId=1552661132500668416, superiorId2=510403, auditCreateBy=1892403820151992322, reporterLevel=2, reporterPhone=null, departmentName=西区-格里坪镇, reportTime=Fri Jun 27 10:04:18 CST 2025, comment=null, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=null)
// ComplaintVO(reporter=null, reporterId=null, superiorId2=null, auditCreateBy=null, reporterLevel=null, reporterPhone=null, departmentName=null, reportTime=null, comment=null, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=aa)
@@ -1853,7 +1901,7 @@
}
@Override
- public AnalyticStatisticsOneVo analyticStatisticsOne(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat,Integer level) {
+ public AnalyticStatisticsOneVo analyticStatisticsOne(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat, Integer level) {
String nowYearMonth;
String lastYearMonth;
int value = LocalDate.now().getMonth().getValue();
@@ -1875,18 +1923,18 @@
if (CollUtil.isEmpty(ids)) {
ids.add(0, -1L);
}
- complaints = this.baseMapper.getStatusForList(ids,level);
+ complaints = this.baseMapper.getStatusForList(ids, level);
AnalyticStatisticsOneVo vo = new AnalyticStatisticsOneVo();
// 诉求单量总计
vo.setAllTotal(complaints.size());
// 诉求单量本月
- int thisMonthTotal = (int) complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).count();
+ int thisMonthTotal = (int) complaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(nowYearMonth)).count();
vo.setThisMonthTotal(thisMonthTotal);
// 诉求单量同比上月
- int lastMonthTotal = (int) complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).count();
+ int lastMonthTotal = (int) complaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(lastYearMonth)).count();
vo.setLastMonthCompareTotal(thisMonthTotal - lastMonthTotal);
// 正在办理
@@ -1910,11 +1958,11 @@
vo.setOvertimeTransactTotal(overtimeComplaints.size());
// 超时办理本月
- int thisMonthOvertimeTransactTotal = (int) overtimeComplaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).count();
+ int thisMonthOvertimeTransactTotal = (int) overtimeComplaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(nowYearMonth)).count();
vo.setThisMonthOvertimeTransactTotal(thisMonthOvertimeTransactTotal);
// 超时办理同比上月
- int lastMonthOvertimeTransactTotal = (int) overtimeComplaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).count();
+ int lastMonthOvertimeTransactTotal = (int) overtimeComplaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(lastYearMonth)).count();
vo.setLastMonthOvertimeTransactCompareTotal(thisMonthOvertimeTransactTotal - lastMonthOvertimeTransactTotal);
// 平均处理时长
@@ -1923,13 +1971,13 @@
averageDay = BigDecimal.valueOf(averageDay).setScale(2, RoundingMode.HALF_UP).doubleValue();
vo.setAverageTime(averageDay);
- List<Complaint> thisMonthAverageTimeComplaints = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).collect(Collectors.toList());
+ List<Complaint> thisMonthAverageTimeComplaints = complaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(nowYearMonth)).collect(Collectors.toList());
if (thisMonthAverageTimeComplaints.size() > 0) {
double thisMonthAverageTime = thisMonthAverageTimeComplaints.stream().mapToDouble(v -> v.getHandlingDay() == null ? 0 : v.getHandlingDay()).average().getAsDouble();
thisMonthAverageTime = BigDecimal.valueOf(thisMonthAverageTime).setScale(2, RoundingMode.HALF_UP).doubleValue();
vo.setThisMonthAverageTime(thisMonthAverageTime);
}
- List<Complaint> lastMonthAverageTimeComplaints = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).collect(Collectors.toList());
+ List<Complaint> lastMonthAverageTimeComplaints = complaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(lastYearMonth)).collect(Collectors.toList());
if (lastMonthAverageTimeComplaints.size() > 0) {
double lastMonthAverageTime = lastMonthAverageTimeComplaints.stream().mapToDouble(v -> v.getHandlingDay() == null ? 0 : v.getHandlingDay()).average().getAsDouble();
BigDecimal lastMonthAverageTime1 = BigDecimal.valueOf(lastMonthAverageTime).setScale(2, RoundingMode.HALF_UP);
@@ -1949,7 +1997,7 @@
BigDecimal multiply = BigDecimal.valueOf(count).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
vo.setSatisfactionRate(multiply.doubleValue());
- List<Complaint> nowMonth = commentRateComplaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).collect(Collectors.toList());
+ List<Complaint> nowMonth = commentRateComplaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(nowYearMonth)).collect(Collectors.toList());
// 当月满意
long count1 = nowMonth.stream().filter(e -> e.getCommentRate() > 1).count();
// 当月的评价数
@@ -1959,7 +2007,7 @@
vo.setThisMonthSatisfactionRate(multiply1.doubleValue());
}
- List<Complaint> lastMonth = commentRateComplaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).collect(Collectors.toList());
+ List<Complaint> lastMonth = commentRateComplaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(lastYearMonth)).collect(Collectors.toList());
// 当月满意
long count2 = lastMonth.stream().filter(e -> e.getCommentRate() > 1).count();
// 当月的评价数
@@ -1976,9 +2024,11 @@
public static void main(String[] args) {
+ LocalDate localDate = LocalDate.now().plusDays(2);
+
String time = "2022-02-02 - 2023-02-02";
String[] split = time.split(" - ");
- System.out.println(split[0]);
+ System.out.println(localDate.toString());
}
@Override
@@ -1989,7 +2039,7 @@
String[] split = time.split(" - ");
Date parse = simpleDateFormat.parse(split[0] + " 00:00:00");
Date parse1 = simpleDateFormat.parse(split[1] + " 23:59:59");
- complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= parse1.getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
+ complaints = complaints.stream().filter(e -> e.getTime().getTime() <= parse1.getTime() && e.getTime().getTime() >= parse.getTime()).collect(Collectors.toList());
int day = DateUtils.getDay(parse, parse1);
if (day > 30) {
@@ -1999,7 +2049,7 @@
for (int i = 0; i <= day; i++) {
AnalyticStatisticsTwoVo analyticStatisticsTwoVo = new AnalyticStatisticsTwoVo();
if (i == 0) {
- List<Complaint> collect = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(split[0])).collect(Collectors.toList());
+ List<Complaint> collect = complaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(split[0])).collect(Collectors.toList());
analyticStatisticsTwoVo.setTime(split[0]);
analyticStatisticsTwoVo.setAllTotal(collect.size());
int count = (int) collect.stream().filter(e -> e.getStatus() == 3).count();
@@ -2007,7 +2057,7 @@
list.add(analyticStatisticsTwoVo);
} else {
String nextDay = DateUtils.getNextDay(parse, i);
- List<Complaint> collect = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nextDay)).collect(Collectors.toList());
+ List<Complaint> collect = complaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(nextDay)).collect(Collectors.toList());
analyticStatisticsTwoVo.setTime(nextDay);
analyticStatisticsTwoVo.setAllTotal(collect.size());
int count = (int) collect.stream().filter(e -> e.getStatus() == 3).count();
@@ -2020,12 +2070,12 @@
time = DateUtils.getBeforeDay(6) + " 00:00:00";
Date parse = simpleDateFormat.parse(time);
// 近7天数据
- complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= new Date().getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
+ complaints = complaints.stream().filter(e -> e.getTime().getTime() <= new Date().getTime() && e.getTime().getTime() >= parse.getTime()).collect(Collectors.toList());
for (int i = 6; i >= 0; i--) {
// 获取前7天的时间
String day = DateUtils.getBeforeDay(i);
- List<Complaint> complaintList = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(day)).collect(Collectors.toList());
+ List<Complaint> complaintList = complaints.stream().filter(e -> simpleDateFormat.format(e.getTime()).contains(day)).collect(Collectors.toList());
AnalyticStatisticsTwoVo analyticStatisticsTwoVo = new AnalyticStatisticsTwoVo();
analyticStatisticsTwoVo.setTime(day);
analyticStatisticsTwoVo.setAllTotal(complaintList.size());
@@ -2043,7 +2093,7 @@
@Override
public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(Integer rank, List<Complaint> complaints) {
- Map<String, List<Complaint>> groupedByProblemType = complaints.stream()
+ Map<String, List<Complaint>> groupedByProblemType = complaints.stream().filter(e->e.getProblemType()!=null)
.collect(Collectors.groupingBy(Complaint::getProblemType));
List<AnalyticStatisticsThreeVo> analyticStatisticsThreeVos = groupedByProblemType.entrySet().stream()
.map(entry -> {
@@ -2091,8 +2141,8 @@
public List<Complaint> queryCompliantList(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo);
SystemUser systemUserLevel = identityInformation.getSystemUser();
- if(systemUserLevel.getSystemRoleId()==1 || systemUserLevel.getSystemRoleId()==2){
- return baseMapper.queryCompliantList(systemUserLevel.getAccountLevel(),systemUserLevel.getSystemRoleId(),query);
+ if (systemUserLevel.getSystemRoleId() == 1 || systemUserLevel.getSystemRoleId() == 2) {
+ return baseMapper.queryCompliantList(systemUserLevel.getAccountLevel(), systemUserLevel.getSystemRoleId(), query);
}
return null;
}
@@ -2132,7 +2182,7 @@
if (currentIdentityInformation.getIdentity().equals(2)) {
SystemUser systemUser = currentIdentityInformation.getSystemUser();
Complaint complaint = baseMapper.selectById(complainId);
- if(StringUtils.isEmpty(complaint.getProblemType())){
+ if (StringUtils.isEmpty(complaint.getProblemType())) {
complaint.setProblemType(problemType);
}
if (systemUser.getSystemRoleId() != 1 || !complaint.getNowLevel().equals(systemUser.getAccountLevel())) {
@@ -2261,7 +2311,7 @@
complaint.setSuperiorId(systemUser.getCommunityId());
break;
}
-
+ complaint.setCreateBy(Long.valueOf(systemUser.getId()));
complaint.setReportType(accountLevel);
complaint.setNowLevel(accountLevel);
complaint.setLastLevel(accountLevel);
@@ -2293,5 +2343,35 @@
updateById(complaint);
}
+ @Override
+ public Map<String, Integer> getComplaintTip(LoginUserInfoVO loginUserInfo) {
+ HashMap<String, Integer> map = new HashMap<>();
+ IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
+ SystemUser systemUser = currentIdentityInformation.getSystemUser();
+ if (systemUser.getSystemRoleId() == 1) {
+ Integer accountLevel =systemUser.getAccountLevel();
+ String code = null;
+ switch (accountLevel) {
+ case 2:
+ code ="510403";
+ break;
+ case 3:
+ code =systemUser.getStreetId();
+ break;
+ case 4:
+ code =systemUser.getCommunityId().toString();
+ break;
+ default:
+ throw new ServiceException("无此权限");
+ }
+ // 待分配
+ map.put("waitAssign", this.baseMapper.getWaitAssign(accountLevel,code));
+ // 待处理
+ int count = this.count(new LambdaQueryWrapper<Complaint>().eq(Complaint::getAssignPersonId, systemUser.getOneDepartmentId()).notIn(Complaint::getStatus, 3, 8));
+ map.put("waitProcess", count);
+ }
+ return map;
+ }
+
}
--
Gitblit v1.7.1