提交编辑详情

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

@@ -66,4 +66,7 @@ public class PowerStationEngineeringInfoAllDto {
     AcceptanceCheck acceptanceCheck;
     //保存标识 0 保存 1保存并提交
     Integer commitFlag;
+
+    //流程类型 0 并网 1是验收
+    Integer flowType;
 }

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

@@ -116,6 +116,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	PeasantHouseholdMapper peasantHouseholdMapper;
 	@Autowired
 	BasicGridAcceptanceServiceImpl basicGridAcceptanceService;
+	@Autowired
+	AcceptanceCheckServiceImpl acceptanceCheckService;
 
 	private static final String PROCESSKEY = "ProcessEngineering";
 
@@ -1425,9 +1427,18 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			commercialService.updateWithModel(commercial);
 		}
 		//提交
-		if(powerStationEngineeringInfoAllDto.getCommitFlag() == 1 && Objects.nonNull(hygfOnGrid)){
-			hygfOnGrid.setType("1");
-			basicGridAcceptanceService.saveAndCommit(hygfOnGrid,userId);
+		if(powerStationEngineeringInfoAllDto.getCommitFlag() == 1){
+			if(Objects.nonNull(hygfOnGrid) && powerStationEngineeringInfoAllDto.getFlowType() == 0) {
+				hygfOnGrid.setType("1");
+				basicGridAcceptanceService.saveAndCommit(hygfOnGrid,userId);
+			}
+			AcceptanceCheck acceptanceCheck = powerStationEngineeringInfoAllDto.getAcceptanceCheck();
+			if(powerStationEngineeringInfoAllDto.getFlowType() == 1 && Objects.nonNull(acceptanceCheck)) {
+				Map<String,Object> model =new HashMap<>();
+				model.put("type","1");
+				model.put("sequenceNbr",acceptanceCheck.getSequenceNbr());
+				acceptanceCheckService.saveAndCommit(model);
+			}
 		}
 	}
 }
\ No newline at end of file