户用管理和并网管理列表添加字段

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

@@ -73,4 +73,7 @@ public class BasicGridAcceptanceDto extends BaseDto {
     //并网登记id
 
     private Long fonGridId;
+
+//    电站安装规模(kW)
+    private String scale;
 }

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

@@ -54,6 +54,8 @@ public class BasicGridAcceptanceServiceImpl
 	@Autowired
 	PeasantHouseholdMapper peasantHouseholdMapper;
 	@Autowired
+	HouseholdContractMapper householdContractMapper;
+	@Autowired
 	private CommonServiceImpl commonService;
 
 	private final String OK = "0";
@@ -82,6 +84,15 @@ public class BasicGridAcceptanceServiceImpl
 		pageNew.setCurrent(current);
 		pageNew.setTotal(page.getTotal());
 		pageNew.setSize(size);
+
+		if(page.getList() != null && page.getList().size() > 0) {
+			page.getList().forEach(e -> {
+				if(e.getPeasantHouseholdNo() != null) {
+					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+				}
+			});
+		}
+
 		pageNew.setRecords(page.getList());
 		return pageNew;
 	}

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

@@ -271,6 +271,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         pagenew.setCurrent(current);
         pagenew.setTotal(objectPageInfo.getTotal());
         pagenew.setSize(size);
+
+        if(newRecords != null && newRecords.size() > 0) {
+            newRecords.forEach(e -> {
+                if(e.getSurveyInformationId() != null) {
+                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                }
+            });
+
+        }
+
         pagenew.setRecords(newRecords);
 
         return pagenew;