修改月报表

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthGenerateMapper.xml

@@ -13,7 +13,7 @@
                 </foreach>
             </if>
             <if test="dateTime!=null">
-             and   year = #{dateTime}
+             and   month_time = #{dateTime}
             </if>
         </where>
         LIMIT #{current} ,#{size}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -252,7 +253,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     @Override
     @UserLimits
     public Map<String, List<Object>> getPowerqxnew(String date,JpStationDto reviewDto) {
-
+         date = DateUtil.format(new Date(), "yyyy-MM-dd");
         List<String> statioId=new ArrayList();
         List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
         for (JpStation jpStation : dataJpStation) {
@@ -444,6 +445,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
                     hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()/jpStation.getCapacity())));
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
@@ -486,7 +488,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
-
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setDayGenerate(dayGenerate.getGenerate());
                     hd.setTimeDate(dayGenerate.getDayTime());
@@ -510,6 +512,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
                     hd.setMonthGenerate(dayGenerate.getGenerate());
                     hd.setMonthIncome(dayGenerate.getMonthIncome());
@@ -535,7 +538,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
-
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setYearGenerate(dayGenerate.getGenerate());
                     hd.setYearIncome(dayGenerate.getYearIncome());