仁和东区代码提交

101captain

2022-01-14 2bc69b919ef626e6093d598d7eae07c8f9e3e0e4

 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;

@@ -292,7 +293,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 +321,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;
    }