bug修改

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

@@ -42,7 +42,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 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.*;
@@ -161,30 +160,25 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
     public void flowExecute(Long id, String instanceId, String operate, String comment, Boolean update) {
-        try {
-            JgMaintenanceContract contract = this.getBaseMapper().selectById(id);
-            String taskId = contract.getNextTaskId();
-            //组装信息
-            TaskResultDTO dto = new TaskResultDTO();
-            dto.setResultCode("approvalStatus");
-            dto.setTaskId(taskId);
-            dto.setComment(comment);
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("approvalStatus", operate);
-            if (WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) ||
-                    WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
-                map.put("approvalStatus", "提交");
-            }
-            dto.setVariable(map);
-            //下一节点执行人单位（下节点接收机构code）
-            dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, contract));
-            ProcessTaskDTO complete = workflowService.complete(taskId, dto);
-            // 更新下一步执行人、创建待办
-            updateExecuteIds(instanceId, id, operate, complete);
-        } catch (Exception e) {
-            log.error("提交失败：{}", e);
-            throw new BadRequest(e.getMessage());
+        JgMaintenanceContract contract = this.getBaseMapper().selectById(id);
+        String taskId = contract.getNextTaskId();
+        //组装信息
+        TaskResultDTO dto = new TaskResultDTO();
+        dto.setResultCode("approvalStatus");
+        dto.setTaskId(taskId);
+        dto.setComment(comment);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("approvalStatus", operate);
+        if (WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) ||
+                WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
+            map.put("approvalStatus", "提交");
         }
+        dto.setVariable(map);
+        //下一节点执行人单位（下节点接收机构code）
+        dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, contract));
+        ProcessTaskDTO complete = workflowService.complete(taskId, dto);
+        // 更新下一步执行人、创建待办
+        updateExecuteIds(instanceId, id, operate, complete);
     }
 
     public String getNextUserOrgCode(String operate, JgMaintenanceContract contract) {