From 3632162b5cbffbe53f86094604f213d20fda2e35 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 27 六月 2025 14:50:36 +0800
Subject: [PATCH] 2.0后台模块接口
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java
index 4e99354..63e088b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/AnalyticStatisticsController.java
@@ -103,18 +103,27 @@
// 都为空 查他有的
if(query.getCityCode()==null && query.getDistrictCode()==null && query.getStreetId()==null && query.getCommunityId()==null){
- if(systemUser.getSystemRoleId()==1){
- wrapper.eq(Complaint::getNowLevel,systemUser.getAccountLevel());
+ if(systemUser.getSystemRoleId()==1 || systemUser.getSystemRoleId()==2){
+ if(systemUser.getSystemRoleId()==1){
+ wrapper.ne(Complaint::getProblemType,"检举");
+ }
+ if(accountLevel==3){
+ String streetId = systemUser.getStreetId();
+ List<Long> ids = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId)).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
+ wrapper.eq(Complaint::getNowLevel,systemUser.getAccountLevel()).or(wrapper1 ->wrapper1.in(Complaint::getSuperiorId,ids).eq(Complaint::getNowLevel,4));
+ }
+ if(accountLevel==4){
+ wrapper.eq(Complaint::getNowLevel,systemUser.getAccountLevel());
+ }
}else {
wrapper.eq(Complaint::getNowLevel,systemUser.getAccountLevel())
.eq(Complaint::getAssignPersonId,systemUser.getOneDepartmentId());
}
}
-
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Complaint> complaints =complaintService.list(wrapper);
// 第一部分数据
- AnalyticStatisticsOneVo analyticStatisticsOneVo = complaintService.analyticStatisticsOne(query,complaints,simpleDateFormat);
+ AnalyticStatisticsOneVo analyticStatisticsOneVo = complaintService.analyticStatisticsOne(query,complaints,simpleDateFormat,systemUser.getAccountLevel());
// 第二部分数据
List<AnalyticStatisticsTwoVo> analyticStatisticsTwoVos =complaintService.analyticStatisticsTwo(query.getTime(),complaints,simpleDateFormat);
--
Gitblit v1.7.1