From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 78 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 11 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 03ef102..ffb9ec1 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
@@ -4,6 +4,7 @@
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -12,7 +13,8 @@
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.common.model.vos.community.reserve.*;
+import com.panzhihua.service_community.dao.ComActReserveMapper;
import com.panzhihua.service_community.dao.ComActReserveRecordMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -52,6 +54,8 @@
private ComActReserveSubMapper comActReserveSubMapper;
@Resource
private ComActReserveRecordMapper comActReserveRecordMapper;
+ @Resource
+ private ComActReserveMapper comActReserveMapper;
/**
* 导出登记明细数据
@@ -124,6 +128,34 @@
}
resultPage.setRecords(resultMapList);
return R.ok(resultPage);
+ }
+
+ @Override
+ public R registerDetailedListAdminExport(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
+ String communityPhone=comActReserveMapper.selectCommunityPhoneByReserveId(detailedAdminDTO.getReserveId());
+ List<ComActReserveRegisterDetailedVO> comActReserveRegisterDetailedVOS = this.baseMapper.pageRegisterDetailedListAdminExport(detailedAdminDTO);
+ if(!comActReserveRegisterDetailedVOS.isEmpty()){
+ List<ReservePdfExportVO> reservePdfExportVOS=new ArrayList<>();
+ comActReserveRegisterDetailedVOS.forEach(comActReserveRegisterDetailedVO -> {
+ List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(comActReserveRegisterDetailedVO.getId());
+ if(!registerDetailedAnswerList.isEmpty()){
+ ReservePdfExportVO reservePdfExportVO=new ReservePdfExportVO();
+ reservePdfExportVO.setAddress(registerDetailedAnswerList.get(0).getAnswerContent());
+ reservePdfExportVO.setSign(registerDetailedAnswerList.get(1).getAnswerContent());
+ if(detailedAdminDTO.getPdfType()==1){
+ reservePdfExportVO.setTime(registerDetailedAnswerList.get(2).getAnswerContent());
+ }
+ if(detailedAdminDTO.getPdfType()==2){
+ reservePdfExportVO.setPhone(registerDetailedAnswerList.get(2).getAnswerContent());
+ reservePdfExportVO.setTime(registerDetailedAnswerList.get(3).getAnswerContent());
+ reservePdfExportVO.setCommunityPhone(communityPhone);
+ }
+ reservePdfExportVOS.add(reservePdfExportVO);
+ }
+ });
+ return R.ok(reservePdfExportVOS);
+ }
+ return R.ok();
}
/**
@@ -292,7 +324,7 @@
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 bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX(), bigScreenStaticsReserveMonth.getYear());
bigScreenStaticsReserveMonth.setCount(bigScreenStaticsReserveMonth1.getCount());
bigScreenStaticsReserveMonth.setReserveCount(bigScreenStaticsReserveMonth1.getReserveCount());
bigScreenStaticsReserveMonth.setFireCount(bigScreenStaticsReserveMonth1.getFireCount());
@@ -320,17 +352,41 @@
public List<BigScreenStaticsReserveMonth> getPoints(){
List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonths=new ArrayList<>();
- for(int i=9;i<=12;i++){
- String aDate="";
- if(i<10){
- aDate = "0"+i;
+ 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.setYear("2021");
+ bigScreenStaticsReserveMonth.setX(aDate);
+ bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
- else {
- aDate=i+"";
+ }
+ 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);
+ bigScreenStaticsReserveMonth.setYear(nowYear);
+ bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
- BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
- bigScreenStaticsReserveMonth.setX(aDate);
- bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
return bigScreenStaticsReserveMonths;
}
--
Gitblit v1.7.1