From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java
index 21b3878..9dc9edc 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java
@@ -264,9 +264,9 @@
}
//鍒ゆ柇鏄惁涓虹粨鏉熸祦绋�
- if("1500".equals(reqJson.getString("auditCode"))){
+ if ("1500".equals(reqJson.getString("auditCode"))) {
doTaskFinish(reqJson);
- }else {
+ } else {
//鎵╁睍 宸ヤ綔娴佸姛鑳�
doTaskAuditAgree(reqJson);
}
@@ -285,7 +285,7 @@
return false;
}
- private void doTaskFinish(JSONObject reqJson){
+ private void doTaskFinish(JSONObject reqJson) {
OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
oaWorkflowDataDto.setStoreId(reqJson.getString("storeId"));
oaWorkflowDataDto.setBusinessKey(reqJson.getString("id"));
@@ -293,11 +293,11 @@
oaWorkflowDataDto.setRow(1);
List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
- if(oaWorkflowDataDtos == null || oaWorkflowDataDtos.size() < 1){
+ if (oaWorkflowDataDtos == null || oaWorkflowDataDtos.size() < 1) {
return;
}
//淇敼 褰撳墠 涓哄畬鎴�
- OaWorkflowDataPo oaWorkflowDataPo = new OaWorkflowDataPo();
+ OaWorkflowDataPo oaWorkflowDataPo = new OaWorkflowDataPo();
oaWorkflowDataPo.setDataId(oaWorkflowDataDtos.get(0).getDataId());
oaWorkflowDataPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
@@ -427,6 +427,18 @@
if (task == null) {
throw new IllegalArgumentException("浠诲姟宸插鐞�");
}
+// //閫�鍥炵粰鎻愪氦鑰�
+// if ("1400".equals(reqJson.getString("auditCode"))) {
+// String processInstanceId = task.getProcessInstanceId();
+// Authentication.setAuthenticatedUserId(reqJson.getString("startUserId"));
+// taskService.addComment(reqJson.getString("taskId"), processInstanceId, reqJson.getString("auditMessage"));
+// Map<String, Object> variables = new HashMap<String, Object>();
+// variables.put("nextUserId", reqJson.getString("startUserId"));
+// variables.put("auditCode", reqJson.getString("auditCode"));
+// taskService.complete(reqJson.getString("taskId"), variables);
+//
+// return true;
+// }
String event = doTaskAuditUnAgree(reqJson);
if (OaWorkflowDataDto.EVENT_COMMIT.equals(event)) { //鎻愪氦鐘舵��
@@ -465,7 +477,7 @@
oaWorkflowDataDto = new OaWorkflowDataDto();
oaWorkflowDataDto.setStoreId(reqJson.getString("storeId"));
- oaWorkflowDataDto.setDataId(reqJson.getString(oaWorkflowDataDtos.get(0).getPreDataId()));
+ oaWorkflowDataDto.setDataId(oaWorkflowDataDtos.get(0).getPreDataId());
oaWorkflowDataDto.setPage(1);
oaWorkflowDataDto.setRow(1);
List<OaWorkflowDataDto> preOaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
@@ -479,7 +491,7 @@
reqJson.put("nextUserId", preOaWorkflowDataDtos.get(0).getStaffId());
if ("1400".equals(reqJson.getString("auditCode"))) {
- reqJson.put("nextUserId", reqJson.getString("createUserId"));
+ reqJson.put("nextUserId", reqJson.getString("startUserId"));
}
oaWorkflowDataPo = new OaWorkflowDataPo();
oaWorkflowDataPo.setBusinessKey(preOaWorkflowDataDtos.get(0).getBusinessKey());
--
Gitblit v1.8.0