驳回、撤回后再次保存增加判断

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -63,6 +63,22 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     ICmWorkflowService iCmWorkflowService;
     @Autowired
+    IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
+    @Autowired
+    IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
+    @Autowired
+    IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
+    @Autowired
+    IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
+    @Autowired
+    IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
+    @Autowired
+    IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
+    @Autowired
+    IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
+    @Autowired
+    IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
+    @Autowired
     private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
     @Autowired
     private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
@@ -92,23 +108,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
-    @Autowired
-    IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
-    @Autowired
-    IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
-    @Autowired
-    IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
-    @Autowired
-    IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
-    @Autowired
-    IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
-    @Autowired
-    IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
-    @Autowired
-    IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
-    @Autowired
-    IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
-
     /**
      * 分页查询
      */
@@ -187,7 +186,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
         jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgRegistrationHistory.setStatus("new");
-        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))&&ObjectUtils.isEmpty(map.get("onlySave"))) {
+        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
             jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgChangeRegistrationReform);
             jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
@@ -219,7 +218,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         }
 
-        if (!ObjectUtils.isEmpty(map.get("submit"))&&ObjectUtils.isEmpty(map.get("onlySave"))) {
+        if (!ObjectUtils.isEmpty(map.get("submit"))) {
             String instanceId = "";
             if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr()) && !ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
                 // 如果是旧流程则执行一步
@@ -503,7 +502,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
                 IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
                 if (!ValidationUtil.isEmpty(elevator)) {
-                    elevator.setSequenceNbr( String.valueOf(techInfo.get("ELEVATOR_SEQ")));
+                    elevator.setSequenceNbr(String.valueOf(techInfo.get("ELEVATOR_SEQ")));
                     iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
                 }
             }
@@ -511,7 +510,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
                 IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVehicle.class);
                 if (!ValidationUtil.isEmpty(vehicle)) {
-                    vehicle.setSequenceNbr( String.valueOf(techInfo.get("VEHICLE_SEQ")));
+                    vehicle.setSequenceNbr(String.valueOf(techInfo.get("VEHICLE_SEQ")));
                     iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle);
                 }
 
@@ -526,7 +525,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
                 IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRopeway.class);
                 if (!ValidationUtil.isEmpty(ropeway)) {
-                    ropeway.setSequenceNbr( String.valueOf(techInfo.get("ROPEWAY_SEQ")));
+                    ropeway.setSequenceNbr(String.valueOf(techInfo.get("ROPEWAY_SEQ")));
                     iIdxBizJgTechParamsRopewayService.saveOrUpdateData(ropeway);
                 }
 
@@ -548,7 +547,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
                 IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsBoiler.class);
                 if (!ValidationUtil.isEmpty(boiler)) {
-                    boiler.setSequenceNbr( String.valueOf(techInfo.get("BOILER_SEQ")));
+                    boiler.setSequenceNbr(String.valueOf(techInfo.get("BOILER_SEQ")));
                     iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler);
                 }
 
@@ -580,7 +579,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
                 IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsPipeline.class);
                 if (!ValidationUtil.isEmpty(pipeline)) {
-                    pipeline.setSequenceNbr( String.valueOf(techInfo.get("PIPELINE_SEQ")));
+                    pipeline.setSequenceNbr(String.valueOf(techInfo.get("PIPELINE_SEQ")));
                     iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline);
                 }
 
@@ -594,7 +593,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
                 IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsLifting.class);
                 if (!ValidationUtil.isEmpty(lifting)) {
-                    lifting.setSequenceNbr( String.valueOf(techInfo.get("LIFTING_SEQ")));
+                    lifting.setSequenceNbr(String.valueOf(techInfo.get("LIFTING_SEQ")));
                     iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting);
                 }