Merge remote-tracking branch 'origin/developer' into developer

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

@@ -83,4 +83,7 @@ public class WorkOrderPage {
     private String  auditIdea ;
     @ApiModelProperty(value = "实例id")
     private String  instanceId ;
+
+    @ApiModelProperty(value = "电站安装规模")
+    private String  scale ;
 }

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

@@ -9,10 +9,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationConstructionDataMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderPowerStationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkOrderServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -47,6 +44,8 @@ public class WorkOrderController extends BaseController {
     WorkOrderPowerStationMapper workOrderPowerStationMapper;
     @Autowired
     WorkOrderMapper workOrderMapper;
+    @Autowired
+    HouseholdContractMapper householdContractMapper;
 
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
@@ -213,6 +212,7 @@ public class WorkOrderController extends BaseController {
         Page<WorkOrderPage> workOrderPagePage = workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(), workOrder.getSize(), workOrder);
         if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
             workOrderPagePage.getRecords().forEach(e->{
+
                if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode())){
                 e.setIsAudit("0");
                }else {
@@ -221,6 +221,12 @@ public class WorkOrderController extends BaseController {
             });
         }
 
+        workOrderPagePage.getRecords().forEach(e->{
+            if(e.getPeasantHouseholdNo() != null) {
+                e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+            }
+        });
+
         return ResponseHelper.buildResponse(workOrderPagePage);
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY)