From ee060884a27b901e24e5b532278d040265d5579c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 20 五月 2025 13:39:34 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java
index e8450f8..0d41c72 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java
@@ -1,20 +1,17 @@
package com.panzhihua.sangeshenbian.service.impl;
-import cn.hutool.core.date.DateUtil;
-import com.beust.jcommander.internal.Lists;
-import com.fasterxml.jackson.databind.ser.std.ObjectArraySerializer;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.sangeshenbian.dao.SystemUserMapper;
import com.panzhihua.sangeshenbian.model.entity.ComAct;
import com.panzhihua.sangeshenbian.model.entity.ComStreet;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
-import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.model.entity.SystemUserLevel;
import com.panzhihua.sangeshenbian.model.query.AppStaticsQuery;
+import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsFourVo;
import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsOneVo;
+import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsThreeVo;
import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsTwoVo;
import com.panzhihua.sangeshenbian.model.vo.RegionVO;
import com.panzhihua.sangeshenbian.service.IBcRegionService;
@@ -28,7 +25,6 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -146,6 +142,12 @@
return complaintService.analyticStatisticsOne(null, complaints, simpleDateFormat);
}
+ /**
+ *获取统计分析-第二部分（诉求单量统计柱状图）
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
public List<AnalyticStatisticsTwoVo> queryStaticsPartTwo(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
List<Complaint> complaints = complaintService.queryCompliantList(query,loginUserInfo);
//时间范围
@@ -172,4 +174,25 @@
return complaintService.analyticStatisticsTwo(time, complaints, simpleDateFormat);
}
+ /**
+ *获取统计分析-第三部分（问题类型排名）
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ public List<AnalyticStatisticsThreeVo> queryStaticsPartThree(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
+ List<Complaint> complaints = complaintService.queryCompliantList(query,loginUserInfo);
+ return complaintService.analyticStatisticsThree(query.getRank(), complaints);
+ }
+
+ /**
+ * 获取统计分析-第四部分（评价占比）
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ public AnalyticStatisticsFourVo queryStaticsPartFour(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
+ List<Complaint> complaints = complaintService.queryCompliantList(query,loginUserInfo);
+ return complaintService.analyticStatisticsFour(complaints);
+ }
}
--
Gitblit v1.7.1