提交代码

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

@@ -21,6 +21,8 @@ public class WebConstuctionDataBaseInfo {
     private Long workOrderId;
 
     private Long workOrderPowerStationId;
+
+    private String constructionStatus;
     /**
      * 安装人员信息
      */

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

@@ -509,7 +509,6 @@ public class WorkOrderController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "施工信息添加或者修改",  notes = "施工信息添加或者修改")
     public ResponseModel<WebConstuctionData> getWebConstuctionData(HttpServletRequest request,  @RequestParam(value = "sequenceNbr")Long sequenceNbr)
     {
-
         return ResponseHelper.buildResponse( workOrderServiceImpl.getWebConstuctionData(sequenceNbr));
     }
 }

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

@@ -1979,6 +1979,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		powerStationConstructionData.setConstructionInverterInfo(webConstuctionData.getWebConstuctionDataBaseInfo().getConstructionInverterInfo());
 		powerStationConstructionData.setConstructionCollectorBoxInfo(webConstuctionData.getWebConstuctionDataBaseInfo().getConstructionCollectorBoxInfo());
 		powerStationConstructionData.setConstructionGridBoxInfo(webConstuctionData.getWebConstuctionDataBaseInfo().getConstructionGridBoxInfo());
+		powerStationConstructionData.setConstructionStatus(webConstuctionData.getWebConstuctionDataBaseInfo().getConstructionStatus());
 		this.addOrUpdate(powerStationConstructionData);
         return webConstuctionData;
 	}
@@ -2036,6 +2037,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionInverterInfo(powerStationConstructionData.getConstructionInverterInfo());
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionCollectorBoxInfo(powerStationConstructionData.getConstructionCollectorBoxInfo());
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionGridBoxInfo(powerStationConstructionData.getConstructionGridBoxInfo());
+				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionStatus(powerStationConstructionData.getConstructionStatus());
 			}
 		}
 		return webConstuctionData;