From db3fc1165777c9e66e179ce018fc05aa15d2c051 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 10 三月 2022 10:27:52 +0800
Subject: [PATCH] 大屏院落议事相关代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
index c2a1199..7420353 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -17,6 +17,7 @@
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO;
@@ -882,6 +883,17 @@
jjwtTotalPolylineData.add(temp);
});
statisticsInfo.setJjwtTotalPolylineData(jjwtTotalPolylineData);
+ //新增院落议事数
+ List<StatisticsCommVO> ylysAddPolylineData = comActFourMemberDao.retrieveYLYSAddPolylineData(communityId);
+ statisticsInfo.setYlysAddPolylineData(ylysAddPolylineData);
+ //累计院落议事数
+ List<StatisticsCommVO> ylysTotalPolylineData = new ArrayList<>();
+ ylysAddPolylineData.forEach(e -> {
+ StatisticsCommVO temp = comActFourMemberDao.retrieveYLYSTotalPolylineData(communityId, e.getFiled());
+ temp.setFiled(e.getFiled());
+ ylysTotalPolylineData.add(temp);
+ });
+ statisticsInfo.setYlysTotalPolylineData(ylysTotalPolylineData);
return R.ok(statisticsInfo);
}
@@ -1166,6 +1178,39 @@
return R.ok(comActMicroWishDAO.pageFourMemberResolve(page, pageBaseDTO));
}
+ /**
+ * 金沙定制页面-四长四员院落议事展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @Override
+ public R pageCourtyardDiscuss(PageBaseDTO pageBaseDTO) {
+ Page page = retrievePage(pageBaseDTO);
+ return R.ok(comActDiscussDAO.pageCourtyardDiscuss(page, pageBaseDTO));
+ }
+
+ /**
+ * 金沙定制页面-院落议事
+ * @param communityId
+ * @return
+ */
+ @Override
+ public R getCourtyardBaseData(Long communityId) {
+ BigScreenCourtyardStatisticsInfo statisticsInfo = comActDiscussDAO.getCourtyardBaseData(communityId);
+ //新增院落议事数
+ List<StatisticsCommVO> discussAddPolylineData = comActFourMemberDao.retrieveYLYSAddPolylineData(communityId);
+ statisticsInfo.setDiscussAddPolylineData(discussAddPolylineData);
+ //累计院落议事数
+ List<StatisticsCommVO> discussTotalPolylineData = new ArrayList<>();
+ discussAddPolylineData.forEach(e -> {
+ StatisticsCommVO temp = comActFourMemberDao.retrieveYLYSTotalPolylineData(communityId, e.getFiled());
+ temp.setFiled(e.getFiled());
+ discussTotalPolylineData.add(temp);
+ });
+ statisticsInfo.setDiscussTotalPolylineData(discussTotalPolylineData);
+ return R.ok(statisticsInfo);
+ }
+
private Page retrievePage(PageBaseDTO pageBaseDTO) {
Long pageNum = pageBaseDTO.getPageNum();
Long size = pageBaseDTO.getPageSize();
--
Gitblit v1.7.1