27328 施工管理每个设备信息填写完成后可保存

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

@@ -180,4 +180,10 @@ public class PowerStationConstructionData extends BaseEntity {
 	@TableField("work_order_power_station_id")
     private Long workOrderPowerStationId;
 
+    /**
+     * 是否提交流程
+     */
+    @TableField(exist = false)
+    private boolean commitFlow;
+
 }

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

@@ -202,7 +202,7 @@ public class WorkOrderController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/getPowerStationConstructionData")
     @ApiOperation(httpMethod = "GET",value = "无分页查询",  notes = "无分页查询")
-    public ResponseModel<Map<String,Object>> getPowerStationConstructionData(
+    public ResponseModel<PowerStationConstructionData> getPowerStationConstructionData(
             @RequestBody PowerStationConstructionData  powerStationConstructionData
     ) {
 	    //查询施工信息
@@ -210,10 +210,7 @@ public class WorkOrderController extends BaseController {
         up.eq(PowerStationConstructionData::getWorkOrderId,powerStationConstructionData.getWorkOrderId());
         up.eq(PowerStationConstructionData::getWorkOrderPowerStationId,powerStationConstructionData.getWorkOrderPowerStationId());
         PowerStationConstructionData da=  powerStationConstructionDataMapper.selectOne(up);
-        Map<String,Object> map =new HashMap<>();
-        map.put("powerStationConstructionData",da!=null?da:new PowerStationConstructionData());
-        map.put("powerStationConstructionDatafj",da!=null?da:new PowerStationConstructionData());
-        return ResponseHelper.buildResponse(map);
+        return ResponseHelper.buildResponse(da!=null?da:new PowerStationConstructionData());
     }
 
 
@@ -221,7 +218,7 @@ public class WorkOrderController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/addOrUpdate")
-    @ApiOperation(httpMethod = "GET",value = "无分页查询",  notes = "无分页查询")
+    @ApiOperation(httpMethod = "POST",value = "施工信息添加或者修改",  notes = "施工信息添加或者修改")
     public ResponseModel<PowerStationConstructionData> addOrUpdate(
             @RequestBody PowerStationConstructionData  powerStationConstructionData
     ) {

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

@@ -254,7 +254,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 	@Transactional
 	public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
-
+		//如果不是提交进行单独保存
+		if(powerStationConstructionData.isCommitFlow()){
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
 			// 修改施工电站状态
 			LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
@@ -293,6 +294,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			}
 			workOrderMapper.update(null, upq);
 
+		}
         // 新增施工信息
         // 防止重复添加
         LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
@@ -316,6 +318,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
             constructionRecordsServiceImpl.save(da);
         }
 
+
 //        }else{
 //           //修改施工电站状态
 //            LambdaUpdateWrapper<WorkOrderPowerStation> up=new LambdaUpdateWrapper();