修改验收整改单查询

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java

@@ -60,4 +60,8 @@ public class PowerStationEngineeringInfoAllDto {
     //派工单信息
 
     WorkOrder workOrder;
+    
+    //并网信息
+
+    AcceptanceCheck acceptanceCheck;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheck.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 并网验收节点
@@ -94,5 +95,28 @@ public class AcceptanceCheck extends BaseEntity {
     @TableField("acceptance_time")
     private String acceptanceTime;
 
+    
+    /**
+     * 片区整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  areaOrders;
+    
+    /**
+     * 投融整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  financeOrders;
+    
+    /**
+     * 法务整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  legalOrders;
 
+    /**
+     * 资产整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  propertyOrders;
 }

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

@@ -205,6 +205,7 @@ public class HygfRectificationOrderController extends BaseController {
 				workOrderPowerStationNodes.add("bw-engineering");
 				workOrderPowerStationNodes.add("bw-area");
 				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.整改中.name());
 				status.add(WorkOrderEnum.待审核.name());
 				status.add(WorkOrderEnum.已完成.name());
 			}if (longs.contains(delerKfId) ) {
@@ -212,6 +213,7 @@ public class HygfRectificationOrderController extends BaseController {
 				workOrderPowerStationNodes.add("bw-engineering");
 				workOrderPowerStationNodes.add("bw-area");
 				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.整改中.name());
 				status.add(WorkOrderEnum.待审核.name());
 				status.add(WorkOrderEnum.已完成.name());
 			}
@@ -277,6 +279,7 @@ public class HygfRectificationOrderController extends BaseController {
 				workOrderPowerStationNodes.add("ys-fawu");
 				workOrderPowerStationNodes.add("ys-area");
 				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.整改中.name());
 				status.add(WorkOrderEnum.待审核.name());
 				status.add(WorkOrderEnum.已完成.name());
 			}if (longs.contains(deveEngineeringId) ) {
@@ -285,6 +288,7 @@ public class HygfRectificationOrderController extends BaseController {
 				workOrderPowerStationNodes.add("ys-fawu");
 				workOrderPowerStationNodes.add("ys-area");
 				status.add(WorkOrderEnum.待整改.name());
+				status.add(WorkOrderEnum.整改中.name());
 				status.add(WorkOrderEnum.待审核.name());
 				status.add(WorkOrderEnum.已完成.name());
 			}

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

@@ -844,11 +844,11 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 					.setConstructionRegionManagerPhone(workOrder.getConstructionRegionManagerPhone());
 		}
 		// 并网信息
-		LambdaQueryWrapper<HygfOnGrid> up4 = new LambdaQueryWrapper();
+		LambdaQueryWrapper<HygfOnGrid> up4 = new LambdaQueryWrapper<HygfOnGrid>();
 		up4.eq(HygfOnGrid::getWorkOrderId, workOrderId);
 		up4.eq(HygfOnGrid::getWorkOrderPowerStationId, workOrderPowerStationId);
 		HygfOnGrid hygfOnGrid = hygfOnGridMapper.selectOne(up4);
-
+		
 		//增加整改单数据
 		List<HygfRectificationOrder> hygfRectificationOrderList= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.并网.getName());
 		if (CollectionUtil.isNotEmpty(hygfRectificationOrderList)){
@@ -859,15 +859,34 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			hygfOnGrid.setEngineeringOrders(engineeringOrders.size()>0?engineeringOrders:null);
 			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();
+		LambdaQueryWrapper<ConstructionRecords> up5 = new LambdaQueryWrapper<ConstructionRecords>();
 		up5.eq(ConstructionRecords::getWorkOrderId, workOrderId);
 		up5.eq(ConstructionRecords::getWorkOrderPowerStationId, workOrderPowerStationId);
 		up5.orderByAsc(ConstructionRecords::getRecDate);
@@ -876,7 +895,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		data.setConstructionRecordsList(li);
 		surveyInfoAllDto.setConstructionRecords(data);
 
-		LambdaQueryWrapper<BasicGridRecord> quv = new LambdaQueryWrapper();
+		LambdaQueryWrapper<BasicGridRecord> quv = new LambdaQueryWrapper<BasicGridRecord>();
 		quv.eq(BasicGridRecord::getPeasantHouseholdId, peasantHouseholdId);
 		BasicGridRecord basicGridAcceptance = basicGridRecordMapper.selectOne(quv);