并网详情整改单添加

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationOrderEnum.java

@@ -8,7 +8,9 @@ import lombok.Getter;
 public enum RectificationOrderEnum {
 
 
-    施工("ProcessEngineering", "area,design,engineering");
+    施工("ProcessEngineering", "area,design,engineering"),
+    并网("GridConnected", "bw-area,bw-design,bw-engineering"),
+    验收("AcceptanceCheck", "ys-area,ys-tourong,ys-fawu");
 
     /**
      * 名称，描述

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

@@ -149,4 +149,21 @@ public class HygfOnGrid extends BaseEntity {
 
     @TableField(exist = false)
     private String type;
+
+
+    /**
+     * 片区整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  areaOrders;
+    /**
+     * 工程整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  engineeringOrders;
+    /**
+     * 设计整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  designOrders;
 }

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

@@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.DeliveryStateeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
@@ -849,6 +846,19 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		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.并网.getCode());
+		if (CollectionUtil.isNotEmpty(hygfRectificationOrderList)){
+			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("area")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  engineeringOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("engineering")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  designOrders = hygfRectificationOrderList.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);
+		}
+
+
 		surveyInfoAllDto.setHygfOnGrid(hygfOnGrid != null ? hygfOnGrid : new HygfOnGrid());
 		surveyInfoAllDto.setPowerStationConstructionData(powerStationConstructionData);
 		surveyInfoAllDto.setPowerStationEngineeringInfo(powerStationEngineeringInfo);