待发货电站添加字段

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

@@ -75,7 +75,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     private UnitInfoServiceImpl unitInfoService;
     @Autowired
     private PreparationMoneyLogServiceImpl preparationMoneyLogService;
-
     @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
     @Autowired
@@ -85,6 +84,10 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     @Autowired
     DesignInformationMapper designInformationMapper;
     @Autowired
+    HouseholdContractMapper householdContractMapper;
+    @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     PreparationMoneyLogMapper preparationMoneyLogMapper;
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
@@ -1176,7 +1179,19 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
          PageHelper.startPage(current,  size);
          List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state);
-         PageInfo<Map<String, Object>> page = new PageInfo(resultPage);
+
+        if(resultPage != null && resultPage.size() > 0) {
+            resultPage.forEach(e -> {
+                System.out.println("+++++++++++++++" + e.get("peasantHouseholdNo"));
+                if(e.get("peasantHouseholdNo") != null) {
+                    e.put("scale", householdContractMapper.getHygfCommercialScale((String) e.get("peasantHouseholdNo")));
+                    e.put("realScale", powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo((String) e.get("peasantHouseholdNo")));
+                }
+            });
+        }
+
+
+        PageInfo<Map<String, Object>> page = new PageInfo(resultPage);
          Page<Map<String, Object>> pagenew = new Page<>();
          pagenew.setTotal(page.getTotal());
          pagenew.setSize(size);