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

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

@@ -620,6 +620,18 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		up2.eq(PowerStationConstructionData::getWorkOrderPowerStationId, workOrderPowerStationId);
 		PowerStationConstructionData powerStationConstructionData = powerStationConstructionDataMapper.selectOne(up2);
 
+		//增加整改单数据
+		List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), PROCESSKEY);
+		if (CollectionUtil.isNotEmpty(hygfRectificationOrders)){
+			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrders.stream().filter(e -> e.getRectificationSource().equals("area")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  engineeringOrders = hygfRectificationOrders.stream().filter(e -> e.getRectificationSource().equals("engineering")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  designOrders = hygfRectificationOrders.stream().filter(e -> e.getRectificationSource().equals("design")).collect(Collectors.toList());
+			powerStationConstructionData.setAreaOrders(areaOrders.size()>0?areaOrders:null);
+			powerStationConstructionData.setEngineeringOrders(engineeringOrders.size()>0?engineeringOrders:null);
+			powerStationConstructionData.setDesignOrders(designOrders.size()>0?designOrders:null);
+		}
+
+
 		// 工程信息
 
 		LambdaQueryWrapper<PowerStationEngineeringInfo> up3 = new LambdaQueryWrapper();