Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DayGenerateEX.java

@@ -33,24 +33,24 @@ public class DayGenerateEX {
      * 满发小时数
      *
      * */
-    @ExcelProperty(value = "满发小时数", index = 5)
+    @ExcelProperty(value = "满发小时数(h)", index = 5)
     private Double fullhour;
 
 
 
-    @ExcelProperty(value = "日发电量", index = 6)
+    @ExcelProperty(value = "日发电量(kWh)", index = 6)
     // 日发电量
     private Double dayGenerate;
 
 
-    @ExcelProperty(value = "日收益", index = 7)
+    @ExcelProperty(value = "日收益(元)", index = 7)
     // 日收益
     private Double dayIncome;
 
     /**
      * 累计发电量
      */
-    @ExcelProperty(value = "累计发电量", index = 8)
+    @ExcelProperty(value = "累计发电量（kWh）", index = 8)
     private Double accumulatedPower;
     /**
      * 状态

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java

@@ -96,7 +96,7 @@ public class JpStationDto extends BaseDto {
 	/**
 	 * 累计发电量
 	 */
-    @ExcelProperty(value = "累计发电量", index = 6)
+    @ExcelProperty(value = "累计发电量（mWh）", index = 6)
 	private Double accumulatedPower;
     @ExcelIgnore
 	/**
@@ -136,7 +136,7 @@ public class JpStationDto extends BaseDto {
 	private String area;
     @ExcelIgnore
 	List<JpPersonStation> statioId;
-    @ExcelProperty(value = "累计收益", index = 7)
+    @ExcelProperty(value = "累计收益（元）", index = 7)
 	// 累计收益
 	private Double cumulativeIncome;
     @ExcelIgnore
@@ -177,7 +177,7 @@ public class JpStationDto extends BaseDto {
      * 满发小时数
      *
      * */
-    @ExcelProperty(value = "满发小时数", index = 5)
+    @ExcelProperty(value = "满发小时数（h）", index = 5)
     private Double fullhour;
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthGenerateEX.java

@@ -35,7 +35,7 @@ public class MonthGenerateEX {
      * 满发小时数
      *
      * */
-    @ExcelProperty(value = "满发小时数", index = 5)
+    @ExcelProperty(value = "满发小时数(h)", index = 5)
     private Double fullhour;
 
 
@@ -43,15 +43,15 @@ public class MonthGenerateEX {
 
 
     // 月发电量
-    @ExcelProperty(value = "月发电量", index = 6)
+    @ExcelProperty(value = "月发电量(kWh)", index = 6)
     private Double monthGenerate;
 
     // 月收益
-    @ExcelProperty(value = "月收益", index = 7)
+    @ExcelProperty(value = "月收益(元)", index = 7)
     private Double monthIncome;
     /**
      * 累计发电量
      */
-    @ExcelProperty(value = "累计发电量", index = 8)
+    @ExcelProperty(value = "累计发电量（kWh）", index = 8)
     private Double accumulatedPower;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/YearGenerateEX.java

@@ -30,22 +30,22 @@ public class YearGenerateEX {
      * 满发小时数
      *
      * */
-    @ExcelProperty(value = "满发小时数", index = 5)
+    @ExcelProperty(value = "满发小时数(h)", index = 5)
     private Double fullhour;
 
 
 
     // 年发电量
-    @ExcelProperty(value = "年发电量", index = 6)
+    @ExcelProperty(value = "年发电量(kWh)", index = 6)
     private Double yearGenerate;
 
     // 年收益
-    @ExcelProperty(value = "年收益", index = 7)
+    @ExcelProperty(value = "年收益（元）", index = 7)
     private Double yearIncome;
 
     /**
      * 累计发电量
      */
-    @ExcelProperty(value = "累计发电量", index = 8)
+    @ExcelProperty(value = "累计发电量（kWh）", index = 8)
     private Double accumulatedPower;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -181,7 +181,7 @@
             <if test="dto.thirdStationIds!=null">
                 and hygf_jp_station.third_station_id in
                 <foreach collection="dto.thirdStationIds" item="item" index="index" open="(" separator="," close=")">
-                    #{item.stationId}
+                    #{item}
                 </foreach>
             </if>
             <if test="dto.thirdStationId!=null">

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

@@ -3,6 +3,7 @@ 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.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -375,6 +376,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     public Page<JpStationDto> queryReport(int pageNum, int pageSize, JpStationDto reviewDto,String type)   {
         //权限
         List<String> statioId=new ArrayList();
+        if(reviewDto.getThirdStationIds()!=null){
+            //平台bug，暂时处理
+            List<String>   dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
+            reviewDto.setThirdStationIds(dd);
+        }
+
         List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
             if(reviewDto.getThirdStationIds()==null){
                 for (JpStation jpStation : dataJpStation) {
@@ -556,6 +563,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         //权限
         //权限
         List<String> statioId=new ArrayList();
+        if(reviewDto.getThirdStationIds()!=null){
+            //平台bug，暂时处理
+            List<String>   dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
+            reviewDto.setThirdStationIds(dd);
+        }
         List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
         if(reviewDto.getThirdStationIds()==null){
             for (JpStation jpStation : dataJpStation) {