From eadc0790df8b8dcf17dcb22f4bec302ee9f57b7b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 28 八月 2021 23:17:53 +0800
Subject: [PATCH] 优化办理逻辑
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 f47ee8a..177aca8 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
@@ -249,7 +249,7 @@
if (count > 0) {
datas = oaWorkflowUserInnerServiceSMOImpl.getUserHistoryTasks(auditUser);
//鍒锋柊 琛ㄥ崟鏁版嵁
- freshFormData(datas, paramIn,oaWorkflowFormDtos.get(0));
+ freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
} else {
datas = new ArrayList<>();
}
@@ -276,14 +276,34 @@
List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
-
- reqJson.put("nextUserId", reqJson.getString("taskId"));
- boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
- if (isLastTask) {
- reqJson.put("state", "1005");
+ //涓氬姟鍔炵悊
+ if ("1100".equals(reqJson.getString("auditCode"))) {
+ reqJson.put("nextUserId", reqJson.getString("staffId"));
+ boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
+ if (isLastTask) {
+ reqJson.put("state", "1005");
+ } else {
+ reqJson.put("state", "1002");
+ }
reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
+ } 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);
+ reqJson.put("state", "1003");
+ reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
+ oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
+ } else {
+ throw new IllegalArgumentException("涓嶆敮鎸佺殑绫诲瀷");
}
+
+
return ResultVo.success();
}
--
Gitblit v1.8.0