Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -384,6 +384,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            if (ValidationUtil.isEmpty(dataObject)) {
+                log.warn("流程已结束, instanceId => {}", instanceId);
+                return;
+            }
             String taskId = dataObject.getString("id");
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
@@ -395,9 +399,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             dto.setComment(comments);
             // 执行流程
             AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
-            if (ObjectUtils.isEmpty(ajaxResult1)) {
 
-            }
         } catch (Exception e) {
             e.printStackTrace();
             log.error("执行工作流错误, => {}", params, e);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -368,41 +368,45 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 接收/驳回通知检验单
      */
     public void execueFlow(Map<String, Object> params) {
+        String role = "";
         String op = params.get("op").toString();
         String instanceId = params.get("instanceId").toString();
         String comments = params.get("comments").toString();
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-            String taskId = dataObject.getString("id");
-            //组装信息
-            TaskResultDTO dto = new TaskResultDTO();
+            if (!ValidationUtil.isEmpty(dataObject)) {
+                String taskId = dataObject.getString("id");
+                //组装信息
+                TaskResultDTO dto = new TaskResultDTO();
 //            dto.setResult(op);
-            dto.setResultCode("approvalStatus");
-            dto.setTaskId(taskId);
-            HashMap<String, Object> varibalble = new HashMap<>();
-            varibalble.put("approvalStatus", op);
-            dto.setVariable(varibalble);
-            dto.setComment(comments);
-            //执行流程
-            Workflow.taskClient.completeByTask(taskId, dto);
-            // 查询下节点任务
-            Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
-            if ("0".equals(op) && ObjectUtils.isNotEmpty(params.get("originalDataId"))) {
-                String originalDataId = params.get("originalDataId").toString();
-                JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
-                List<String> detectionRegion = (List<String>) params.get("detectionRegion");
+                dto.setResultCode("approvalStatus");
+                dto.setTaskId(taskId);
+                HashMap<String, Object> varibalble = new HashMap<>();
+                varibalble.put("approvalStatus", op);
+                dto.setVariable(varibalble);
+                dto.setComment(comments);
+                //执行流程
+                Workflow.taskClient.completeByTask(taskId, dto);
+                // 查询下节点任务
+                Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
+                if ("0".equals(op) && ObjectUtils.isNotEmpty(params.get("originalDataId"))) {
+                    String originalDataId = params.get("originalDataId").toString();
+                    JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
+                    List<String> detectionRegion = (List<String>) params.get("detectionRegion");
 //                String detectionRegionName =  params.get("detectionRegionName").toString();
-                if(!detectionRegion.isEmpty()){
-                    jyjcOpeningApplication.setDetectionRegion(detectionRegion);
-                }
+                    if(!detectionRegion.isEmpty()){
+                        jyjcOpeningApplication.setDetectionRegion(detectionRegion);
+                    }
 //                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
-                if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
-                    jyjcOpeningApplication.setAcceptDate(new Date());
+                    if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
+                        jyjcOpeningApplication.setAcceptDate(new Date());
+                    }
+                    jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
                 }
-                jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
+                role = (String) nextNodeInfo.get("role");
             }
-            String taskName = "";
+            String taskName = "流程结束";
             String status;
             if ("流程结束".equals(taskName)) {
                 status = FlowStatusEnum.TO_BE_FINISHED.getCode() + "";
@@ -410,7 +414,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 // 如果是回退, 则业务状态改为未提交
                 status = "1".equals(op) ? FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "" : FlowStatusEnum.SUBMITTED.getCode() + "";
             }
-            String role = (String) nextNodeInfo.get("role");
             updateModelByInstanceId(instanceId, status, role);
         } catch (Exception e) {
             e.printStackTrace();