优化流程结束环节

service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java

@@ -263,8 +263,13 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
             throw new IllegalArgumentException("任务已处理");
         }
 
-        //扩展 工作流功能
-        doTaskAuditAgree(reqJson);
+        //判断是否为结束流程
+        if("1500".equals(reqJson.getString("auditCode"))){
+            doTaskFinish(reqJson);
+        }else {
+            //扩展 工作流功能
+            doTaskAuditAgree(reqJson);
+        }
 
         String processInstanceId = task.getProcessInstanceId();
         Authentication.setAuthenticatedUserId(reqJson.getString("nextUserId"));
@@ -280,6 +285,25 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         return false;
     }
 
+    private void doTaskFinish(JSONObject reqJson){
+        OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
+        oaWorkflowDataDto.setStoreId(reqJson.getString("storeId"));
+        oaWorkflowDataDto.setBusinessKey(reqJson.getString("id"));
+        oaWorkflowDataDto.setPage(1);
+        oaWorkflowDataDto.setRow(1);
+        List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
+
+        if(oaWorkflowDataDtos == null || oaWorkflowDataDtos.size() < 1){
+            return;
+        }
+        //修改 当前 为完成
+        OaWorkflowDataPo   oaWorkflowDataPo = new OaWorkflowDataPo();
+        oaWorkflowDataPo.setDataId(oaWorkflowDataDtos.get(0).getDataId());
+        oaWorkflowDataPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
+        oaWorkflowDataInnerServiceSMOImpl.updateOaWorkflowData(oaWorkflowDataPo);
+    }
+
     /**
      * 处理 审核状态
      *