修改问题

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

@@ -860,30 +860,10 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			hygfOnGrid.setDesignOrders(designOrders.size()>0?designOrders:null);
 		}
 		
-		//验收信息
-		LambdaQueryWrapper<AcceptanceCheck> up6 = new LambdaQueryWrapper<AcceptanceCheck>();
-		up6.eq(AcceptanceCheck::getWorkOrderId, workOrderId);
-		up6.eq(AcceptanceCheck::getWorkOrderPowerStationId, workOrderPowerStationId);
-		AcceptanceCheck acceptanceCheck = acceptanceCheckMapper.selectOne(up6);
-		
-		//增加整改单数据
-		List<HygfRectificationOrder> hygfRectificationOrderListYs= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.验收.getName());
-		if (CollectionUtil.isNotEmpty(hygfRectificationOrderListYs)){
-			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-area")).collect(Collectors.toList());
-			List<HygfRectificationOrder>  financeOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-tourong")).collect(Collectors.toList());
-			List<HygfRectificationOrder>  legalOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-fawu")).collect(Collectors.toList());
-			List<HygfRectificationOrder>  propertyOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-zichan")).collect(Collectors.toList());
-			acceptanceCheck.setAreaOrders(areaOrders.size()>0?areaOrders:null);
-			acceptanceCheck.setFinanceOrders(financeOrders.size()>0?financeOrders:null);
-			acceptanceCheck.setLegalOrders(legalOrders.size()>0?legalOrders:null);
-			acceptanceCheck.setPropertyOrders(propertyOrders.size()>0?propertyOrders:null);
-		}
-		
 		surveyInfoAllDto.setHygfOnGrid(hygfOnGrid != null ? hygfOnGrid : new HygfOnGrid());
 		surveyInfoAllDto.setPowerStationConstructionData(powerStationConstructionData);
 		surveyInfoAllDto.setPowerStationEngineeringInfo(powerStationEngineeringInfo);
 		surveyInfoAllDto.setWorkOrder(workOrder);
-		surveyInfoAllDto.setAcceptanceCheck(acceptanceCheck!= null ? acceptanceCheck : new AcceptanceCheck());
 
 		// 施工自审
 		LambdaQueryWrapper<ConstructionRecords> up5 = new LambdaQueryWrapper<ConstructionRecords>();
@@ -937,7 +917,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		LambdaQueryWrapper<AcceptanceCheck> quv1 = new LambdaQueryWrapper();
 		quv1.eq(AcceptanceCheck::getPeasantHouseholdId, peasantHouseholdId);
 		AcceptanceCheck acceptanceCheck = acceptanceCheckMapper.selectOne(quv1);
-
+		
+		//增加整改单数据
+		List<HygfRectificationOrder> hygfRectificationOrderListYs= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.验收.getName());
+		if (CollectionUtil.isNotEmpty(hygfRectificationOrderListYs)){
+			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-area")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  financeOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-tourong")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  legalOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-fawu")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  propertyOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-zichan")).collect(Collectors.toList());
+			acceptanceCheck.setAreaOrders(areaOrders.size()>0?areaOrders:null);
+			acceptanceCheck.setFinanceOrders(financeOrders.size()>0?financeOrders:null);
+			acceptanceCheck.setLegalOrders(legalOrders.size()>0?legalOrders:null);
+			acceptanceCheck.setPropertyOrders(propertyOrders.size()>0?propertyOrders:null);
+		}
+		
+		surveyInfoAllDto.setAcceptanceCheck(acceptanceCheck);
 		// 审核意见
 		if (Objects.nonNull(acceptanceCheck) && !StringUtils.isEmpty(acceptanceCheck.getInstanceId())) {
 			try {