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

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

@@ -430,6 +430,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
 
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {
+            JgChangeRegistrationName jgChangeRegistrationName = this.getBaseMapper().selectById(id);
             JSONObject task = workFlowFeignService.getTaskNoAuth(instanceId);
             JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
             String taskId = taskMessage.getString("id");
@@ -441,6 +442,11 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
             dto.setVariable(map);
+            if (!ObjectUtils.isEmpty(jgChangeRegistrationName.getInstanceStatus()) &&
+                    (jgChangeRegistrationName.getInstanceStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject()) ||
+                            jgChangeRegistrationName.getInstanceStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack()))) {
+                map.put("approvalStatus", "提交");
+            }
             //执行流程
             Workflow.taskClient.completeByTask(taskId, dto);
         } catch (Exception e) {

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

@@ -151,7 +151,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
-            if (!ObjectUtils.isEmpty(jgEnableDisable.getAuditStatus()) || WorkFlowStatusEnum.ENABLE_SUBMIT.getReject().equals(jgEnableDisable.getAuditStatus()) || WorkFlowStatusEnum.ENABLE_SUBMIT.getRollBack().equals(jgEnableDisable.getAuditStatus())) {
+            if (WorkFlowStatusEnum.ENABLE_SUBMIT.getReject().equals(jgEnableDisable.getAuditStatus()) || WorkFlowStatusEnum.ENABLE_SUBMIT.getRollBack().equals(jgEnableDisable.getAuditStatus())) {
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);

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

@@ -146,7 +146,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
-            if (!ObjectUtils.isEmpty(jgMaintenanceContract.getStatus()) || WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(jgMaintenanceContract.getStatus()) || WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(jgMaintenanceContract.getStatus())) {
+            if (WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(jgMaintenanceContract.getStatus()) || WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(jgMaintenanceContract.getStatus())) {
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);

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

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.CancelTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelEqMapper;
@@ -443,6 +444,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {
+            JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
             JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
             String taskId = taskMessage.getString("id");
@@ -454,6 +456,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
             dto.setVariable(map);
+            if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus()) &&
+                    (jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getReject()) ||
+                            jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack()))) {
+                map.put("approvalStatus", "提交");
+            }
             //执行流程
             Workflow.taskClient.completeByTask(taskId, dto);
         } catch (Exception e) {
@@ -541,7 +548,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 map1.put("ORG_BRANCH_NAME", "");
             }
             resultMap.put(jgScrapCancelEq.getEquId(), map1);
+            try {
                 tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgScrapCancel.setAuditPassDate(new Date());
         }

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

@@ -335,7 +335,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
-            if (!ObjectUtils.isEmpty(jgUseRegistration.getStatus()) || jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getReject()) || jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getRollBack())) {
+            if (jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getReject()) || jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getRollBack())) {
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);