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

@@ -353,7 +353,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         WorkflowResultDto workflowResult = new WorkflowResultDto();
         JgChangeRegistrationTransfer transfer = this.getById(id);
-        try {
+
         String taskId = transfer.getNextTaskId();
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
@@ -373,9 +373,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
         // 更新下一步执行人
         this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+
     }
 
     /**
@@ -1032,7 +1030,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * 启动工作流
      */
     private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) {
-        try {
         ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO();
         List<ActWorkflowStartDTO> workflowList = new ArrayList<>();
         ActWorkflowStartDTO workflow = new ActWorkflowStartDTO();
@@ -1046,10 +1043,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams);
         // 组装工作流返回的数据
         return commonService.buildWorkFlowInfo(processTasks).get(0);
-        } catch (Exception e) {
-            log.error("提交失败：{}", e);
-            throw new BadRequest("提交失败" + e.getMessage());
-        }
     }
 
     /**

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

@@ -50,7 +50,6 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
@@ -202,7 +201,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
-            try {
             processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
             instanceId = processTaskDTOS.get(0).getProcessInstance().getId();
@@ -211,10 +209,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             workflowResultDtos = commonService.buildWorkFlowInfo(processTaskDTOS);
             nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
             this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
-            } catch (Exception e) {
-                log.error("提交失败：{}", e);
-                throw new BadRequest("提交失败" + e.getMessage());
-            }
         }
 
         List<JgScrapCancel> list = new ArrayList<>();
@@ -356,7 +350,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 发起流程
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
                 //未进流程直接发起并执行
-                try {
+
                 List<ProcessTaskDTO> processTasks;
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -385,10 +379,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 BeanUtil.copyProperties(jgScrapCancelDto, bean);
                 commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
                 createTaskModel(bean, taskName, "1", nextUserIds);
-                } catch (Exception e) {
-                    log.error("提交失败：{}", e);
-                    throw new BadRequest("提交失败" + e.getMessage());
-                }
             } else {
                 // 已经在流程中，执行一步
                 ProcessTaskDTO processTaskDTO = submit(op, jgScrapCancelDto.getNextTaskId());
@@ -602,7 +592,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
-        try {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
         //组装信息
@@ -622,9 +611,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
         updateExecuteIds(instanceId, id, operate, processTaskDTO);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }