From d17dde4fe0adb550ab6c7fa3725a6e86e24d7f00 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 30 八月 2021 18:36:27 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
index 177aca8..2506888 100644
--- a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
+++ b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
@@ -277,7 +277,7 @@
Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
//涓氬姟鍔炵悊
- if ("1100".equals(reqJson.getString("auditCode"))) {
+ if ("1100".equals(reqJson.getString("auditCode"))) { //鍔炵悊鎿嶄綔
reqJson.put("nextUserId", reqJson.getString("staffId"));
boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
if (isLastTask) {
@@ -287,15 +287,17 @@
}
reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
- } else if ("1300".equals(reqJson.getString("auditCode"))) {
+ } else if ("1300".equals(reqJson.getString("auditCode"))) { //杞崟鎿嶄綔
reqJson.put("nextUserId", reqJson.getString("staffId"));
oaWorkflowUserInnerServiceSMOImpl.changeTaskToOtherUser(reqJson);
reqJson.put("state", "1004");
reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
- } else if ("1200".equals(reqJson.getString("auditCode"))) {
- reqJson.put("curUserId", reqJson.getString("curUserId"));
- oaWorkflowUserInnerServiceSMOImpl.goBackTask(reqJson);
+ } else if ("1200".equals(reqJson.getString("auditCode"))
+ || "1400".equals(reqJson.getString("auditCode"))
+ ) { //閫�鍥炴搷浣�
+ reqJson.put("nextUserId", reqJson.getString("staffId"));
+ oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
reqJson.put("state", "1003");
reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
@@ -307,6 +309,12 @@
return ResultVo.success();
}
+ @Override
+ public ResponseEntity<String> getNextTask(JSONObject reqJson) {
+ List<JSONObject> tasks = oaWorkflowUserInnerServiceSMOImpl.nextAllNodeTaskList(reqJson);
+ return ResultVo.createResponseEntity(tasks);
+ }
+
/**
* 鍒峰叆琛ㄥ崟鏁版嵁
*
--
Gitblit v1.8.0