From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index 15eb630..6c37a89 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -1,15 +1,20 @@
package com.panzhihua.service_community.service.impl;
+import java.math.BigDecimal;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Resource;
import javax.xml.bind.DatatypeConverter;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterExportVO;
+import com.panzhihua.service_community.dao.ComActReserveRecordMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -46,6 +51,8 @@
@Resource
private ComActReserveSubMapper comActReserveSubMapper;
+ @Resource
+ private ComActReserveRecordMapper comActReserveRecordMapper;
/**
* 导出登记明细数据
@@ -277,6 +284,26 @@
return R.ok(exportVO);
}
+ @Override
+ public R bigScreenStaticsReserve(Long communityId) {
+ BigScreenStaticsReserve bigScreenStaticsReserve=comActReserveRecordMapper.biggestScreen(communityId);
+ bigScreenStaticsReserve.setReservePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getReserveCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
+ bigScreenStaticsReserve.setFirePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getFireCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
+ bigScreenStaticsReserve.setHomePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getHomeCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
+ bigScreenStaticsReserve.setGasPercent(BigDecimal.valueOf(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
+ List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList=this.getPoints();
+ bigScreenStaticsReserveMonthList.forEach(bigScreenStaticsReserveMonth -> {
+ BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX());
+ bigScreenStaticsReserveMonth.setCount(bigScreenStaticsReserveMonth1.getCount());
+ bigScreenStaticsReserveMonth.setReserveCount(bigScreenStaticsReserveMonth1.getReserveCount());
+ bigScreenStaticsReserveMonth.setFireCount(bigScreenStaticsReserveMonth1.getFireCount());
+ bigScreenStaticsReserveMonth.setGasCount(bigScreenStaticsReserveMonth1.getGasCount());
+ bigScreenStaticsReserveMonth.setHomeCount(bigScreenStaticsReserveMonth1.getHomeCount());
+ });
+ bigScreenStaticsReserve.setBigScreenStaticsReserveMonthList(bigScreenStaticsReserveMonthList);
+ return R.ok(bigScreenStaticsReserve);
+ }
+
private List<ComActQuestnaireSubVO> retrieveQuestnaireSub(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
//查询题目
List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
@@ -291,4 +318,44 @@
});
return listSubVo;
}
+
+ public List<BigScreenStaticsReserveMonth> getPoints(){
+ List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonths=new ArrayList<>();
+ String nowMonth=DateUtils.getDateFormatString(new Date(),"MM");
+ String nowYear=DateUtils.getDateFormatString(new Date(),"yyyy");
+ String nowYearMonth=DateUtils.getDateFormatString(new Date(),"yyyyMM");
+ if(Integer.parseInt(nowYearMonth)<202212){
+ for(int i=9;i<=12;i++){
+ String aDate="";
+ if(i<10){
+ aDate = "0"+i;
+ }
+ else {
+ aDate=i+"";
+ }
+ BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
+ bigScreenStaticsReserveMonth.setX(aDate);
+ bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
+ }
+ }
+ if(Integer.parseInt(nowYear)>2021){
+ for(int i=1;i<=Integer.parseInt(nowMonth);i++){
+ if(bigScreenStaticsReserveMonths.size()>=12){
+ bigScreenStaticsReserveMonths.remove(0);
+ }
+ String aDate="";
+ if(i<10){
+ aDate = "0"+i;
+ }
+ else {
+ aDate=i+"";
+ }
+ BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
+ bigScreenStaticsReserveMonth.setX(aDate);
+ bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
+ }
+ }
+ return bigScreenStaticsReserveMonths;
+ }
+
}
--
Gitblit v1.7.1