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/AcceptanceCheckDto.java

@@ -76,4 +76,7 @@ public class AcceptanceCheckDto  extends BaseDto {
  private String isAudit;
 
  private String rectificationStatus;
+
+// 电站安装规模
+ 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

@@ -251,6 +251,16 @@ public class WorkOrderController extends BaseController {
         workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
         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()));
+                }
+            });
+
+        }
+
         return ResponseHelper.buildResponse(list);
     }
 

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

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
 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.AcceptanceCheckMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckService;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
@@ -57,6 +58,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
     @Autowired
+    HouseholdContractMapper householdContractMapper;
+    @Autowired
     ConstructionAcceptanceRecordsServiceImpl acceptanceRecordsService;
 
 
@@ -80,6 +83,16 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("basicGridNodes",basicGridNodes);
         map.put("type",type);
         List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
+
+        if(list != null && list.size() > 0) {
+            list.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                }
+            });
+        }
+
+
         PageInfo<AcceptanceCheckDto> page = new PageInfo(list);
         Page<AcceptanceCheckDto> pageNew = new Page<>();
         pageNew.setCurrent(current);

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

@@ -527,6 +527,17 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	public Page<WorkOrderPage> queryForwgpage(int pageNum, int pageSize, WorkOrderPage workOrder) {
 		PageHelper.startPage(pageNum, pageSize);
 		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()));
+				}
+			});
+
+		}
+
+
 		PageInfo<WorkOrderPage> page = new PageInfo(list);
 		Page<WorkOrderPage> pagenew = new Page<WorkOrderPage>();
 		pagenew.setCurrent(pageNum);