解决冲突

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

@@ -629,7 +629,7 @@
         `rec_date` recDate,
         `rec_user_id` recUserId,
         `rec_user_name` recUserName,
-        `sn_code` snCode,
+        hygf_jp_station.sn_code snCode,
         CAST( (FLOOR(`capacity` * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
         `name` ,
         `code` ,
@@ -646,7 +646,7 @@
         `module_count` moduleCount,
         `on_grid_type` onGridType,
         `on_grid_time` onGridTime,
-        `third_station_id` thirdStationId,
+        hygf_jp_station.third_station_id thirdStationId,
         `third_code` thirdCode,
         `station_id` stationId,
         `day_power_use` dayPowerUse,
@@ -670,8 +670,10 @@
         rated_power ratedPower,
         CAST( (FLOOR(`day_generate`/capacity * 1000) / 1000) AS DECIMAL(20, 3)) fullhour,
         (select privilege_company.COMPANY_NAME from privilege_company where
-        privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code) regionalCompaniesName
+        privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code) regionalCompaniesName,
+        newTable.sn_code nbqSnCode
         from hygf_jp_station
+        left join (select hygf_jp_inverter.sn_code, hygf_jp_inverter.third_station_id from hygf_jp_station left join hygf_jp_inverter on hygf_jp_station.third_station_id = hygf_jp_inverter.third_station_id) newTable on hygf_jp_station.third_station_id = newTable.third_station_id
         <where>
             <if test="dto.name!=null">
                 and hygf_jp_station.name like concat(concat('%',#{dto.name}),'%')
@@ -706,6 +708,9 @@
             <if test="dto.amosCompanyCode!=null">
                 and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
             </if>
+            <if test="dto.nbqSnCode!=null">
+                and newTable.sn_code =#{dto.nbqSnCode}
+            </if>
         </where>
         ORDER BY CASE
         WHEN state = '报警' THEN 1