派工发料列表添加字段

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

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
@@ -54,6 +55,8 @@ public class PreparationMoneyController extends BaseController {
     @Autowired
     PreparationMoneyMapper preparationMoneyMapper;
 	@Autowired
+	HouseholdContractMapper householdContractMapper;
+    @Autowired
     DesignInformationServiceImpl designInformationService;
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
@@ -226,6 +229,16 @@ public class PreparationMoneyController extends BaseController {
     ) {
         List<PeasantHousehold>  list=preparationMoneyMapper.getPeasantHouseholdData(sequenceNbr,ownersName);
 
+		if(list != null && list.size() > 0) {
+			list.forEach(e -> {
+				if(e.getPeasantHouseholdNo() != null) {
+					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+				}
+			});
+
+		}
+
+
        Page<PeasantHousehold> pagenew = new Page<>();
         pagenew.setRecords(list);
         pagenew.setTotal(list.size());

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

@@ -99,7 +99,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
 	@Autowired
 	PowerStationEngineeringInfoServiceImpl powerStationEngineeringInfoService;
-
+	@Autowired
+	HouseholdContractMapper householdContractMapper;
 	@Autowired
 	HygfOnGridMapper hygfOnGridMapper;
 	@Autowired
@@ -267,6 +268,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		for (PeasantHousehold documentStation : lih) {
 			ids.add(documentStation.getSequenceNbr());
 		}
+
+
+
 		QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>();
 		designInformationQueryWrapper.in("peasant_household_id", ids);
 		List<DesignInformation> li = designInformationMapper.selectList(designInformationQueryWrapper);
@@ -294,6 +298,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			}
 		}
 		List<PeasantHousehold> list = workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr, null);
+		if(list != null && list.size() > 0) {
+			list.forEach(e -> {
+				if(e.getPeasantHouseholdNo() != null) {
+					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+				}
+			});
+		}
 		Map<String, Object> map = new HashMap<>();
 		designInformation.setAssembly(assembly);
 		designInformation.setInverter(inverter);