From 5ec41335471a9f1ad9a851cd70e27936325bae7f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 22 五月 2025 20:04:24 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 15 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 0f4afa9..df35992 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
@@ -21,6 +21,7 @@
import com.panzhihua.sangeshenbian.model.entity.*;
import com.panzhihua.sangeshenbian.model.excel.ComplaintExcel;
import com.panzhihua.sangeshenbian.model.query.AnalyticStatisticsQuery;
+import com.panzhihua.sangeshenbian.model.query.AppStaticsQuery;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.*;
@@ -264,7 +265,7 @@
Long reporterId = s.getReporterId();
Long superiorId = s.getSuperiorId2();
if (!targetId.equals(reporterId) && !targetId.equals(superiorId) && (s.getStatus() == 5)) {
- s.setStatus(0);
+// s.setStatus(0);
}
}
return page;
@@ -642,7 +643,12 @@
PartyMember partyMember = identityInformationVO.getPartyMember();
name = partyMember.getName();
}
- Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class);
+
+ Long complaintId = dto.getId();
+ Complaint complaint = this.getById(complaintId);
+ Date createTime = complaint.getCreateTime();
+ complaint = BeanUtil.copyProperties(dto, Complaint.class);
+
complaint.setUpdateTime(new Date());
complaint.setCompletionUserId(loginUserInfoVO.getUserId());
complaint.setCompletionUsername(name);
@@ -650,7 +656,6 @@
complaint.setCompletionTime(new Date());
complaint.setCompletionUserLevel(accountLevel);
// 计算处理时间
- Date createTime = complaint.getCreateTime();
long l = Duration.between(createTime.toInstant(), complaint.getCompletionTime().toInstant()).getSeconds() / 3600;
double handlingDay = new BigDecimal(l).divide(new BigDecimal("24"), 2, RoundingMode.HALF_UP).doubleValue();
complaint.setHandlingDay(handlingDay);
@@ -778,6 +783,7 @@
complaintAuditRecord.setReporterLevel(reporterLevel);
complaintAuditRecord.setReporterId(reporterId);
complaintAuditRecord.setApplyName(reporter);
+ complaintAuditRecord.setApplyPhone(phone);
complaintAuditRecordService.save(complaintAuditRecord);
}
@@ -924,6 +930,7 @@
}
complaintAuditRecord.setAuditorName(systemUser.getName());
complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
+ complaintAuditRecord.setAuditTime(new Date());
if (complaintReporAuditDTO.getAuditResult().equals(1)) {
complaintAuditRecord.setAuditStatus(1);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
@@ -1035,6 +1042,7 @@
record1.setDepartmentName(departmentName);
// 冗余申请人名称
record1.setApplyName(reporter);
+ record1.setApplyPhone(loginUserInfoVO.getPhone());
complaintAuditRecordService.save(record1);
}
@@ -1080,6 +1088,7 @@
}
complaintAuditRecord.setAuditorName(systemUser.getName());
complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
+ complaintAuditRecord.setAuditTime(new Date());
//审核通过后，设置诉求延期
if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) {
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
@@ -1092,6 +1101,11 @@
}
//审核不通过
if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(2)) {
+ Complaint complaint = getById(complaintAuditRecord.getComplaintId());
+ // 设置为正在办理
+ complaint.setStatus(0);
+ updateById(complaint);
+
complaintAuditRecord.setRejectReason(dto.getRejectReason());
complaintAuditRecord.setAuditStatus(2);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
@@ -1460,7 +1474,6 @@
// 诉求单量总计
vo.setAllTotal(complaints.size());
-
// 诉求单量本月
int thisMonthTotal = (int) complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).count();
vo.setThisMonthTotal(thisMonthTotal);
@@ -1512,8 +1525,9 @@
List<Complaint> lastMonthAverageTimeComplaints = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).collect(Collectors.toList());
if (lastMonthAverageTimeComplaints.size() > 0) {
double lastMonthAverageTime = lastMonthAverageTimeComplaints.stream().mapToDouble(v -> v.getHandlingDay() == null ? 0 : v.getHandlingDay()).average().getAsDouble();
- lastMonthAverageTime = BigDecimal.valueOf(lastMonthAverageTime).setScale(2, RoundingMode.HALF_UP).doubleValue();
- vo.setLastMonthCompareAverageTime(vo.getThisMonthAverageTime() - lastMonthAverageTime);
+ BigDecimal lastMonthAverageTime1 = BigDecimal.valueOf(lastMonthAverageTime).setScale(2, RoundingMode.HALF_UP);
+
+ vo.setLastMonthCompareAverageTime( new BigDecimal(vo.getThisMonthAverageTime()).subtract(lastMonthAverageTime1).setScale(2,RoundingMode.HALF_UP).doubleValue());
}
}
@@ -1548,12 +1562,18 @@
return vo;
}
+ public static void main(String[] args) {
+ String time = "2022-02-02 - 2023-02-02";
+ String[] split = time.split(" - ");
+ System.out.println(split[0]);
+ }
+
@Override
- public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
+ public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(String time, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
ArrayList<AnalyticStatisticsTwoVo> list = new ArrayList<>();
try {
- if (StringUtils.isNotEmpty(query.getTime())) {
- String[] split = query.getTime().split(" - ");
+ if (StringUtils.isNotEmpty(time)) {
+ 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());
@@ -1584,7 +1604,7 @@
}
} else {
- String time = DateUtils.getBeforeDay(6) + " 00:00:00";
+ 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());
@@ -1609,7 +1629,7 @@
}
@Override
- public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(AnalyticStatisticsQuery query, List<Complaint> complaints) {
+ public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(Integer rank, List<Complaint> complaints) {
Map<String, List<Complaint>> groupedByProblemType = complaints.stream()
.collect(Collectors.groupingBy(Complaint::getProblemType));
List<AnalyticStatisticsThreeVo> analyticStatisticsThreeVos = groupedByProblemType.entrySet().stream()
@@ -1621,11 +1641,11 @@
})
.collect(Collectors.toList());
analyticStatisticsThreeVos = analyticStatisticsThreeVos.stream().sorted(Comparator.comparing(AnalyticStatisticsThreeVo::getAllTotal).reversed()).collect(Collectors.toList());
- if (query.getRank() == null) {
+ if (rank == null) {
return analyticStatisticsThreeVos;
- } else if (query.getRank() == 5) {
+ } else if (rank == 5) {
return analyticStatisticsThreeVos.stream().limit(5).collect(Collectors.toList());
- } else if (query.getRank() == 10) {
+ } else if (rank == 10) {
return analyticStatisticsThreeVos.stream().limit(10).collect(Collectors.toList());
}
return Collections.emptyList();
@@ -1633,12 +1653,18 @@
@Override
public AnalyticStatisticsFourVo analyticStatisticsFour(List<Complaint> complaints) {
+ // 只计算评分了的
+ complaints = complaints.stream().filter(e -> e.getCommentRate() != null).collect(Collectors.toList());
AnalyticStatisticsFourVo vo = new AnalyticStatisticsFourVo();
// 0：不满意 1：一般 2：满意 3：非常满意
long count = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 0).count();
+ vo.setDissatisfactionNum((int) count);
long count1 = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 1).count();
+ vo.setGeneralSatisfactionNum((int) count1);
long count2 = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 2).count();
+ vo.setSatisfactionRateNum((int) count2);
long count3 = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 3).count();
+ vo.setGreatSatisfactionNum((int) count3);
if (complaints.size() > 0) {
vo.setDissatisfactionRate(BigDecimal.valueOf(count).divide(BigDecimal.valueOf(complaints.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).doubleValue());
vo.setGeneralSatisfactionRate(BigDecimal.valueOf(count1).divide(BigDecimal.valueOf(complaints.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).doubleValue());
@@ -1648,6 +1674,45 @@
return vo;
}
-
+ @Override
+ public List<Complaint> queryCompliantList(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
+ IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo);
+ Integer identity = identityInformation.getIdentity();
+ PartyMember partyMember = identityInformation.getPartyMember();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ Long targetId = null;
+ Integer accountLevel = 5;
+ //党员，查询该党员
+ if (identity.equals(1)) {
+ targetId = partyMember.getId();
+ } else if (identity.equals(2)) {
+ //上级
+ if (Objects.nonNull(query.getTier()) && query.getTier().equals(-1)) {
+ accountLevel = systemUserLevel.getLevel();
+ switch (systemUserLevel.getLevel()) {
+ case 1:
+ //市级
+ targetId = 510400L;
+ break;
+ case 2:
+ //区县级
+ targetId = Long.valueOf(systemUserLevel.getDistrictsCode());
+ break;
+ case 3:
+ //街道
+ targetId = Long.valueOf(systemUserLevel.getStreetId());
+ break;
+ case 4:
+ //社区
+ targetId = systemUserLevel.getCommunityId();
+ break;
+ }
+ } else {
+ targetId = Long.valueOf(query.getAreaId());
+ accountLevel = query.getTier();
+ }
+ }
+ return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo, query);
+ }
}
--
Gitblit v1.7.1