From a7c8e8bdb3adc12185a47a10c3c2808e52339bcb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 25 八月 2021 12:05:41 +0800
Subject: [PATCH] 加入用户IDbug
---
service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java b/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java
index 29dfe61..c8777e5 100644
--- a/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java
+++ b/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java
@@ -366,6 +366,7 @@
reqJson.put("columns", columns.toArray(new String[columns.size()]));
reqJson.put("values", columns.toArray(new String[values.size()]));
reqJson.put("storeId", storeId);
+ reqJson.put("userId", userId);
return getOaWorkflowFormBMOImpl.saveOaWorkflowFormData(reqJson);
}
@@ -408,13 +409,13 @@
*/
@RequestMapping(value = "/queryOaWorkflowUserHisTaskFormData", method = RequestMethod.GET)
public ResponseEntity<String> queryOaWorkflowUserHisTaskFormData(@RequestHeader(value = "store-id") String storeId,
- @RequestHeader(value = "user-id") String userId,
- @RequestParam(value = "flowId", required = false) String flowId,
- @RequestParam(value = "startTime", required = false) String startTime,
- @RequestParam(value = "endTime", required = false) String endTime,
- @RequestParam(value = "createUserName", required = false) String createUserName,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestHeader(value = "user-id") String userId,
+ @RequestParam(value = "flowId", required = false) String flowId,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "createUserName", required = false) String createUserName,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
JSONObject paramIn = new JSONObject();
paramIn.put("page", page);
paramIn.put("row", row);
@@ -426,4 +427,26 @@
paramIn.put("userId", userId);
return getOaWorkflowFormBMOImpl.queryOaWorkflowUserHisTaskFormData(paramIn);
}
+
+ /**
+ * 淇濆瓨娴佺▼鏁版嵁
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/auditOaWorkflow
+ * @path /app/oaWorkflow/auditOaWorkflow
+ */
+ @RequestMapping(value = "/auditOaWorkflow", method = RequestMethod.POST)
+ public ResponseEntity<String> auditOaWorkflow(@RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId,
+ @RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "flowId", "flowId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "id", "id涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "taskId", "浠诲姟涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "auditMessage", "瀹℃牳鎰忚涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "auditCode", "瀹℃牳鐘舵�佷笉鑳戒负绌�");
+ reqJson.put("storeId", storeId);
+ reqJson.put("userId", userId);
+ return getOaWorkflowFormBMOImpl.auditOaWorkflow(reqJson);
+ }
}
--
Gitblit v1.8.0