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/service/impl/PreparationMoneyServiceImpl.java

@@ -281,6 +281,20 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         LambdaQueryWrapper<DocumentStation> q = new LambdaQueryWrapper<>();
         q.eq(DocumentStation::getPreparationMoneyId, sequenceNbr);
         List<DocumentStation> lih = documentStationMapper.selectList(q);
+
+        if(lih != null && lih.size() > 0) {
+            lih.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+                }
+            });
+
+        }
+
+
+
+
         preparationMoney.setPeasantHouseholdId(lih);
 
         LambdaUpdateWrapper<PreparationMoneyLog> q1 = new LambdaUpdateWrapper<>();
@@ -328,7 +342,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         designInformation.setCable(cable);
         Map<String, Object> map2 = Bean.BeantoMap(preparationMoney);
 
-
         LambdaQueryWrapper<HygfReplenishment> files = new LambdaQueryWrapper<>();
         files.eq(HygfReplenishment::getPreparationMoneyId,sequenceNbr);
         files.orderByDesc(BaseEntity::getRecDate);