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

@@ -884,7 +884,7 @@ public class CommonServiceImpl implements ICommonService {
 
             for (Map map : urlList) {
                 if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && obj.getString("taskType").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && map.get("pageType").equals("edit")) {
-                    lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
+                    lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams);
                     break;
                 } else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals(obj.getOrDefault("pageType","edit"))) {
                     lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
@@ -905,7 +905,7 @@ public class CommonServiceImpl implements ICommonService {
             }
             for (Map map : urlList) {
                 if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && obj.getString("taskType").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && map.get("pageType").equals("edit")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams);
                     break;
                 } else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("edit")) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);

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

@@ -108,6 +108,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
 
         String instanceId = "";
+        jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString());
+        jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString());
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
             if (map.containsKey("instanceId") && !ObjectUtils.isEmpty(map.get("instanceId"))){
                 // 只调用执行API，返回下个节点信息，用于填充业务字段
@@ -137,8 +139,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 } else {
                     jgEnableDisable.setExecuteSequence(workflowResultDto.getNextExecutorRoleIds());
                 }
-                jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString());
-                jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString());
                 jgEnableDisable.setPromoter(RequestContext.getExeUserId());
                 jgEnableDisable.setNextExecutorIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
@@ -174,6 +174,13 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 //业务数据组装等
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
             }
+        } else {
+            jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
+            jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
+            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());
         }
         // 仅保存
         this.saveOrUpdate(jgEnableDisable);

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

@@ -283,7 +283,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
             taskModelDto.setStartUserCompanyName(scrapCancel.getUseUnitName());
             taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
-            taskModelDto.setStartDate(scrapCancel.getCreateDate());
+            taskModelDto.setStartDate(scrapCancel.getCreateDate() == null ? new Date() : scrapCancel.getCreateDate());
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(scrapCancel, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
@@ -711,7 +711,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             code = jgScrapCancel.getReceiveOrgCode();
         } else {
             //驳回
-            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getName().equals(jgScrapCancel.getAuditStatus()) ||
+            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) ||
                     WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) ||
                     WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
                 code = jgScrapCancel.getUseUnitCode();