修改发电量统计错误

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

@@ -108,6 +108,12 @@ public class JpStationDto extends BaseDto {
     @ExcelIgnore
 	private String type;
 	/**
+	 * 电站类型
+	 */
+	@ExcelIgnore
+	private String stationType;
+
+	/**
 	 * 组织编码
 	 */
     @ExcelIgnore

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/DayGenerateMapper.java

@@ -31,11 +31,11 @@ public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
 
 
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<PowerCurveDto>  getDayGeneratqx(@Param("date") String month, @Param("thirdStationId") String thirdStationId,@Param("dto")List<String> statioId);
+    List<PowerCurveDto>  getDayGeneratqx(@Param("date") String month,@Param("regionalCompaniesCode") String regionalCompaniesCode, @Param("amosCompanyCode") String amosCompanyCode, @Param("stationType") String stationType,  @Param("thirdStationId") String thirdStationId,@Param("dto")List<String> statioId);
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<PowerCurveDto>  getMonthGenerateqx(@Param("date") String month, @Param("thirdStationId") String thirdStationId, @Param("dto")List<String> statioId);
+    List<PowerCurveDto>  getMonthGenerateqx(@Param("date") String month,@Param("regionalCompaniesCode") String regionalCompaniesCode, @Param("amosCompanyCode") String amosCompanyCode, @Param("stationType") String stationType,  @Param("thirdStationId") String thirdStationId, @Param("dto")List<String> statioId);
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<PowerCurveDto>  getYearGenerateqx(@Param("date") String month, @Param("thirdStationId") String thirdStationId, @Param("dto")List<String> statioId);
+    List<PowerCurveDto>  getYearGenerateqx(@Param("date") String month,@Param("regionalCompaniesCode") String regionalCompaniesCode, @Param("amosCompanyCode") String amosCompanyCode, @Param("stationType") String stationType,  @Param("thirdStationId") String thirdStationId, @Param("dto")List<String> statioId);
 
 
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")

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

@@ -47,6 +47,15 @@
                 #{item}
             </foreach>
         </if>
+            <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
+                and regional_companies_code = #{regionalCompaniesCode}
+            </if>
+            <if test="amosCompanyCode!=null and amosCompanyCode != ''">
+                and amos_company_code = #{amosCompanyCode}
+            </if>
+            <if test="stationType!=null and stationType != ''">
+                and stationType = #{stationType}
+            </if>
 
         <if test="thirdStationId!=null and thirdStationId != ''">
             and third_station_id = #{thirdStationId}
@@ -72,6 +81,16 @@
                 </foreach>
             </if>
 
+            <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
+                and regional_companies_code = #{regionalCompaniesCode}
+            </if>
+            <if test="amosCompanyCode!=null and amosCompanyCode != ''">
+                and amos_company_code = #{amosCompanyCode}
+            </if>
+            <if test="stationType!=null and stationType != ''">
+                and stationType = #{stationType}
+            </if>
+
             <if test="thirdStationId!=null and thirdStationId != ''">
                 and third_station_id = #{thirdStationId}
             </if>
@@ -96,6 +115,16 @@
                 </foreach>
             </if>
 
+            <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
+                and regional_companies_code = #{regionalCompaniesCode}
+            </if>
+            <if test="amosCompanyCode!=null and amosCompanyCode != ''">
+                and amos_company_code = #{amosCompanyCode}
+            </if>
+            <if test="stationType!=null and stationType != ''">
+                and stationType = #{stationType}
+            </if>
+
             <if test="thirdStationId!=null and thirdStationId != ''">
                 and third_station_id = #{thirdStationId}
             </if>

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

@@ -241,17 +241,17 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
                 map= getDayListOfMonth(reviewDto.getTimeDateMonth());
 //                if(statioId!=null&&!statioId.isEmpty()) {
 
-                    data = dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(),reviewDto.getThirdStationId(), null);
+                    data = dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(),reviewDto.getRegionalCompaniesCode(), reviewDto.getAmosCompanyCode(), reviewDto.getStationType(),reviewDto.getThirdStationId(), null);
 //                }
             }else if(type.equals("year")){
                 map= getyearListOfMonth(reviewDto.getTimeDateYear());
 //                if(statioId!=null&&!statioId.isEmpty()) {
-                    data = dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(),reviewDto.getThirdStationId(), null);
+                    data = dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(),reviewDto.getRegionalCompaniesCode(), reviewDto.getAmosCompanyCode(), reviewDto.getStationType(),reviewDto.getThirdStationId(), null);
 //                }
             }else{
                 map= getyearList();
 //                if(statioId!=null&&!statioId.isEmpty()) {
-                    data = dayGenerateMapper.getYearGenerateqx(null,reviewDto.getThirdStationId(), null);
+                    data = dayGenerateMapper.getYearGenerateqx(null,reviewDto.getRegionalCompaniesCode(), reviewDto.getAmosCompanyCode(), reviewDto.getStationType(),reviewDto.getThirdStationId(), null);
 //                }
             }
             listx = map.get("x");

pom.xml

@@ -318,7 +318,6 @@
 	<modules>
 		<module>amos-boot-biz-common</module>
 		<module>amos-boot-core</module>
-		<module>amos-boot-utils</module>
 		<module>amos-boot-data</module>
 		<module>amos-boot-system-jxiop</module>
 	</modules>