提交代码

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

@@ -6,11 +6,15 @@
 
     SELECT
         hygf_peasant_household.*,
-        hygf_peasant_household.sequence_nbr stationId
+        hygf_peasant_household.sequence_nbr stationId,
+        hygf_commercial.scale,
+        hygf_power_station_engineering_info.real_scale as realScale
     FROM
         hygf_work_order_power_station
         LEFT JOIN hygf_peasant_household ON hygf_work_order_power_station.peasant_household_id = hygf_peasant_household.sequence_nbr
-    WHERE
+        LEFT JOIN hygf_power_station_engineering_info on hygf_power_station_engineering_info.work_order_power_station_id=hygf_work_order_power_station.sequence_nbr
+        LEFT JOIN hygf_commercial on hygf_commercial.survey_information_id =hygf_peasant_household.survey_information_id
+        WHERE
         hygf_work_order_power_station.work_order_id=#{sequenceNbr}
         <if test="ownersName!=null and ownersName!=''">
             and hygf_peasant_household.owners_name like concat(concat('%',#{ownersName}),'%')

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -191,14 +191,14 @@ public class WorkOrderController extends BaseController {
         PageHelper.startPage(current,size);
         List<PeasantHousehold> list=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,ownersName);
 
-        if(list != null && list.size() > 0) {
-            list.forEach(e -> {
-                if(e.getPeasantHouseholdNo() != null) {
-                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
-                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
-                }
-            });
-        }
+//        if(list != null && list.size() > 0) {
+//            list.forEach(e -> {
+//                if(e.getPeasantHouseholdNo() != null) {
+//                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+//                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+//                }
+//            });
+//        }
 
         PageInfo<PeasantHousehold> pageInfo = new PageInfo<>(list);
         page.setSize(pageInfo.getSize());
@@ -280,15 +280,15 @@ public class WorkOrderController extends BaseController {
         workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
         List<WorkOrderPage>  list=workOrderMapper.queryForwgpage(workOrder);
 
-        if(list != null && list.size() > 0) {
-            list.forEach(e -> {
-                if(e.getPeasantHouseholdNo() != null) {
-                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
-                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
-                }
-            });
-
-        }
+//        if(list != null && list.size() > 0) {
+//            list.forEach(e -> {
+//                if(e.getPeasantHouseholdNo() != null) {
+//                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+//                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+//                }
+//            });
+//
+//        }
 
         return ResponseHelper.buildResponse(list);
     }