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

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

@@ -175,6 +175,16 @@ public class WorkOrderController extends BaseController {
         Page<PeasantHousehold> page = new Page<>();
         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()));
+                }
+            });
+        }
+
         PageInfo<PeasantHousehold> pageInfo = new PageInfo<>(list);
         page.setSize(pageInfo.getSize());
         page.setCurrent(pageInfo.getPageNum());