From f5c2df6816d059e8ed5c8a9c3502c6aa11f64969 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 23 五月 2025 23:33:50 +0800 Subject: [PATCH] bug修改 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 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 c8469d3..c4c9f41 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 @@ -258,16 +258,16 @@ //page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior); page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId); - for (ComplaintVO s : page.getRecords()) { + /* for (ComplaintVO s : page.getRecords()) { buttonPermission(s, systemUserByPhone, loginUserInfoVO); Integer auditButtonStatus = s.getAuditButtonStatus(); 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; } @@ -1468,9 +1468,13 @@ } else { lastYearMonth = LocalDate.now().minusMonths(1).getYear() + "-" + LocalDate.now().minusMonths(1).getMonth().getValue(); } + + // 要根据驳回表来改状态 List<Long> ids = complaints.stream().map(Complaint::getId).collect(Collectors.toList()); + complaints = this.baseMapper.getStatusForList(ids); + AnalyticStatisticsOneVo vo = new AnalyticStatisticsOneVo(); // 诉求单量总计 @@ -1496,7 +1500,7 @@ vo.setPostponeTransactTotal(postponeTransactTotal); // 已办结 - int completeTransactTotal = (int) complaints.stream().filter(e -> e.getStatus() == 3).count(); + int completeTransactTotal = (int) complaints.stream().filter(e -> e.getStatus() == 3 || e.getStatus() == 8).count(); vo.setCompleteTransactTotal(completeTransactTotal); // 超时办理总量 @@ -1561,6 +1565,8 @@ if (lastMonthSize > 0) { BigDecimal multiply2 = BigDecimal.valueOf(count2).divide(new BigDecimal(lastMonthSize), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")); vo.setLastMonthCompareSatisfactionRate(vo.getThisMonthSatisfactionRate() - multiply2.doubleValue()); + }else { + vo.setLastMonthCompareSatisfactionRate(vo.getThisMonthSatisfactionRate()); } } return vo; -- Gitblit v1.7.1