From ee6a2aa9e265f498ce7df9c603d3148487c0b1e8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 五月 2025 12:00:20 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 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 6446212..5e9b046 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
@@ -643,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);
@@ -651,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);
@@ -779,6 +783,7 @@
         complaintAuditRecord.setReporterLevel(reporterLevel);
         complaintAuditRecord.setReporterId(reporterId);
         complaintAuditRecord.setApplyName(reporter);
+        complaintAuditRecord.setApplyPhone(phone);
         complaintAuditRecordService.save(complaintAuditRecord);
     }
 
@@ -1037,6 +1042,7 @@
         record1.setDepartmentName(departmentName);
         // 冗余申请人名称
         record1.setApplyName(reporter);
+        record1.setApplyPhone(loginUserInfoVO.getPhone());
         complaintAuditRecordService.save(record1);
     }
 
@@ -1556,6 +1562,7 @@
         String[] split = time.split(" - ");
         System.out.println(split[0]);
     }
+
     @Override
     public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(String time, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
         ArrayList<AnalyticStatisticsTwoVo> list = new ArrayList<>();
@@ -1617,7 +1624,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()
@@ -1629,11 +1636,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();
@@ -1642,7 +1649,7 @@
     @Override
     public AnalyticStatisticsFourVo analyticStatisticsFour(List<Complaint> complaints) {
         // 只计算评分了的
-        complaints = complaints.stream().filter(e ->e.getCommentRate() != null).collect(Collectors.toList());
+        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();
@@ -1671,7 +1678,7 @@
             targetId = partyMember.getId();
         } else if (identity.equals(2)) {
             //上级
-            if (StringUtils.isBlank(query.getAreaId())) {
+            if (Objects.nonNull(query.getTier()) && query.getTier().equals(-1)) {
                 accountLevel = systemUserLevel.getLevel();
                 switch (systemUserLevel.getLevel()) {
                     case 1:
@@ -1691,9 +1698,12 @@
                         targetId = systemUserLevel.getCommunityId();
                         break;
                 }
+            } else {
+                targetId = Long.valueOf(query.getAreaId());
+                accountLevel = query.getTier();
             }
         }
-        return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo);
+        return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo, query);
     }
 }
 

--
Gitblit v1.7.1