Merge branch 'developer' into 'developer_bw'

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

@@ -94,5 +94,7 @@ public class JpCollectorDto  extends BaseDto {
 
  @ApiModelProperty(value = "流量到期时间", example = "2036-12-31 23:59:59")
  private String contractTimeStr;
+ @ApiModelProperty(value = "项目公司")
+ private String regionalCompaniesCode;
 
 }

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

@@ -125,5 +125,7 @@ public class JpInverterDto  extends BaseDto {
    @ApiModelProperty(value = "投运时间")
    private String fisTimeStr;
 
+   @ApiModelProperty(value = "项目公司")
+   private String regionalCompaniesCode;
 
 }

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

@@ -70,6 +70,9 @@
         <if test="dto.stationName != null and dto.stationName !=''">
             AND   hjc.station_name like concat('%',#{dto.stationName},'%')
         </if>
+        <if test="dto.regionalCompaniesCode!=null and dto.regionalCompaniesCode != ''">
+            and sta.regional_companies_code = #{dto.regionalCompaniesCode}
+        </if>
     </where>
         ORDER BY CASE
         WHEN hjc.state = '报警' THEN 1
@@ -97,6 +100,9 @@
             <if test="dto.state != null and dto.state !=''">
                 hjc.state = #{dto.state}
             </if>
+            <if test="dto.stationName != null and dto.stationName !=''">
+                AND   hjc.station_name like concat('%',#{dto.stationName},'%')
+            </if>
         </where>
     </select>
     <select id="selectInverterState" resultType="java.util.Map">

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

@@ -92,6 +92,9 @@
           <if test="dto.stationName != null and dto.stationName !=''">
               AND   hjc.station_name like concat('%',#{dto.stationName},'%')
           </if>
+          <if test="dto.regionalCompaniesCode!=null and dto.regionalCompaniesCode != ''">
+              and sta.regional_companies_code = #{dto.regionalCompaniesCode}
+          </if>
         </where>
         ORDER BY CASE
         WHEN hjc.state = '报警' THEN 1
@@ -122,6 +125,12 @@
             <if test="dto.maxValue != null and dto.maxValue !=''">
                 AND  hjc.capacity <![CDATA[<=]]> #{dto.maxValue}
             </if>
+            <if test="dto.stationName != null and dto.stationName !=''">
+                AND   hjc.station_name like concat('%',#{dto.stationName},'%')
+            </if>
+            <if test="dto.regionalCompaniesCode!=null and dto.regionalCompaniesCode != ''">
+                and sta.regional_companies_code = #{dto.regionalCompaniesCode}
+            </if>
         </where>
     </select>
     <select id="selectInverterState" resultType="java.util.Map">