Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -421,6 +421,7 @@ public class JgInstallationNotice extends BaseEntity {
             @TableField(exist = false)
     private String factoryNum;
 
-
+//    @TableField("\"create_user_name\"")
+//    private String nextExecuteUserIds;
 
 }

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,39 +186,39 @@ 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());
             jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo"))));
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
         } else {
-            //暂存处理
-            // 业务管理设备信息保存
-            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
-            jgChangeRegistrationReformEq.setEquId(equipId);
-            ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
-            if (!result.getResult().isEmpty()) {
-                jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
-            } else {
-                throw new BadRequest("申请单编号生成失败,请稍后重试!");
-            }
-            jgChangeRegistrationReform.setRegDate(new Date());
-            jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-            jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-            this.save(jgChangeRegistrationReform);
-            jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
-            jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
-            //当前单据id
-            jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
-            jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
-            //暂存时生成待办数据
-            List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
-            commonServiceImpl.buildTaskModel(taskModelDtoList);
-
-        }
-
-        if (!ObjectUtils.isEmpty(map.get("submit"))&&ObjectUtils.isEmpty(map.get("onlySave"))) {
+                //暂存处理
+                // 业务管理设备信息保存
+                JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
+                jgChangeRegistrationReformEq.setEquId(equipId);
+                ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
+                if (!result.getResult().isEmpty()) {
+                    jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
+                } else {
+                    throw new BadRequest("申请单编号生成失败,请稍后重试!");
+                }
+                jgChangeRegistrationReform.setRegDate(new Date());
+                jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+                jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+                this.save(jgChangeRegistrationReform);
+                jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
+                jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
+                //当前单据id
+                jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
+                jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
+                //暂存时生成待办数据
+                List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
+                commonServiceImpl.buildTaskModel(taskModelDtoList);
+
+        }
+
+        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);
                 }
 

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/JgEnableDisableServiceImpl.java

@@ -189,7 +189,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisable.setRemark(map.get("remark") == null ? "" : map.get("remark").toString());
             jgEnableDisable.setApplyDate(new Date());
             jgEnableDisable.setApplyType(String.valueOf(map.get("applyType")));
-            jgEnableDisable.setAuditStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
+            jgEnableDisable.setAuditStatus(ObjectUtils.isEmpty(jgEnableDisable.getAuditStatus()) ? FlowStatusEnum.TO_BE_SUBMITTED.getName() : jgEnableDisable.getAuditStatus());
         }
         // 仅保存
         this.saveOrUpdate(jgEnableDisable);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -21,7 +21,7 @@
     "type": "102",
     "pageType": "draft",
     "name": "安装告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&roleIds={roleIds}&userId={userId}&formType=edit"
   },
   {
     "type": "102",