From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 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 4b6334d..bd87f5c 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.*;
@@ -778,6 +779,7 @@
complaintAuditRecord.setReporterLevel(reporterLevel);
complaintAuditRecord.setReporterId(reporterId);
complaintAuditRecord.setApplyName(reporter);
+ complaintAuditRecord.setApplyPhone(phone);
complaintAuditRecordService.save(complaintAuditRecord);
}
@@ -1036,6 +1038,7 @@
record1.setDepartmentName(departmentName);
// 冗余申请人名称
record1.setApplyName(reporter);
+ record1.setApplyPhone(loginUserInfoVO.getPhone());
complaintAuditRecordService.save(record1);
}
@@ -1550,12 +1553,17 @@
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());
@@ -1586,7 +1594,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());
@@ -1611,7 +1619,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()
@@ -1623,11 +1631,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();
@@ -1652,6 +1660,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);
+ }
}
--
Gitblit v1.7.1