提交代码

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

@@ -12,6 +12,8 @@ public class WebConstuctionDataAttachment {
 
     private boolean commitFlow=false;
 
+    private String constructionStatus="未完成";
+
     /**
      * 施工交底文件
      */

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

@@ -22,7 +22,6 @@ public class WebConstuctionDataBaseInfo {
 
     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/service/impl/WorkOrderServiceImpl.java

@@ -1952,7 +1952,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	public WebConstuctionData addOrUpdateWeb(WebConstuctionData webConstuctionData)
 	{
 		PowerStationConstructionData powerStationConstructionData = new PowerStationConstructionData();
-		powerStationConstructionData.setCommitFlow(webConstuctionData.getWebConstuctionDataAttachment().isCommitFlow());
+		powerStationConstructionData.setCommitFlow(true);
 		powerStationConstructionData.setConstructionInstructionsFile(webConstuctionData.getWebConstuctionDataAttachment().getConstructionInstructionsFile());
 		powerStationConstructionData.setLaborProtectionEquipmentConfig(webConstuctionData.getWebConstuctionDataAttachment().getLaborProtectionEquipmentConfig());
 		powerStationConstructionData.setSafetyPrecautionVideo(webConstuctionData.getWebConstuctionDataAttachment().getSafetyPrecautionVideo());
@@ -1971,6 +1971,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		powerStationConstructionData.setAcCableRouting(webConstuctionData.getWebConstuctionDataAttachment().getAcCableRouting());
 		powerStationConstructionData.setOtherPhotos(webConstuctionData.getWebConstuctionDataAttachment().getOtherPhotos());
 		powerStationConstructionData.setArchiveAttachments(webConstuctionData.getWebConstuctionDataAttachment().getArchiveAttachments());
+		powerStationConstructionData.setConstructionStatus(webConstuctionData.getWebConstuctionDataAttachment().getConstructionStatus());
 
 		powerStationConstructionData.setWorkOrderId(webConstuctionData.getWebConstuctionDataBaseInfo().getWorkOrderId());
 		powerStationConstructionData.setWorkOrderPowerStationId(webConstuctionData.getWebConstuctionDataBaseInfo().getWorkOrderPowerStationId());
@@ -1979,8 +1980,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());
-		if(webConstuctionData.getWebConstuctionDataAttachment().isCommitFlow())
+		if("已完成".equals(powerStationConstructionData.getConstructionStatus()))
 		{
 			if(Objects.isNull(powerStationConstructionData.getInstallerInfo())){
 				throw new BadRequest("安装人员不能为空");
@@ -2086,13 +2086,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 				webConstuctionData.getWebConstuctionDataAttachment().setAcCableRouting(powerStationConstructionData.getAcCableRouting());
 				webConstuctionData.getWebConstuctionDataAttachment().setOtherPhotos(powerStationConstructionData.getOtherPhotos());
 				webConstuctionData.getWebConstuctionDataAttachment().setArchiveAttachments(powerStationConstructionData.getArchiveAttachments());
+				webConstuctionData.getWebConstuctionDataAttachment().setConstructionStatus(powerStationConstructionData.getConstructionStatus());
 
 				webConstuctionData.getWebConstuctionDataBaseInfo().setInstallerInfo(powerStationConstructionData.getInstallerInfo());
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionComponentInfo(powerStationConstructionData.getConstructionComponentInfo());
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionInverterInfo(powerStationConstructionData.getConstructionInverterInfo());
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionCollectorBoxInfo(powerStationConstructionData.getConstructionCollectorBoxInfo());
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionGridBoxInfo(powerStationConstructionData.getConstructionGridBoxInfo());
-				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionStatus(powerStationConstructionData.getConstructionStatus());
 			}
 		}
 		//webConstuctionData.getWebConstuctionDataAttachment().setCommitFlow(false);