From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 cc278d3..e032dfe 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
@@ -152,6 +152,8 @@
public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
@RequestHeader(value = "user-id") String userId,
@RequestParam(value = "flowId", required = false) String flowId,
+ @RequestParam(value = "flowName", required = false) String flowName,
+ @RequestParam(value = "flowType", required = false) String flowType,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
@@ -160,6 +162,8 @@
oaWorkflowDto.setRow(row);
oaWorkflowDto.setStoreId(storeId);
oaWorkflowDto.setFlowId(flowId);
+ oaWorkflowDto.setFlowName(flowName);
+ oaWorkflowDto.setFlowType(flowType);
oaWorkflowDto.setState(state);
oaWorkflowDto.setUserId(userId);
return getOaWorkflowBMOImpl.get(oaWorkflowDto);
@@ -381,6 +385,14 @@
if ("flowId".equals(key)) {
continue;
}
+ if ("fileName".equals(key)) {
+ continue;
+ }
+
+ if ("realFileName".equals(key)) {
+ continue;
+ }
+
columns.add(key);
values.add(reqJson.getString(key));
}
@@ -459,11 +471,11 @@
*/
@RequestMapping(value = "/queryOaWorkflowUser", method = RequestMethod.GET)
public ResponseEntity<String> queryOaWorkflowUser(@RequestHeader(value = "store-id") String storeId,
- @RequestHeader(value = "user-id") String userId,
- @RequestParam(value = "flowId", required = false) String flowId,
- @RequestParam(value = "id", required = false) String id,
- @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 = "id", required = false) String id,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
JSONObject paramIn = new JSONObject();
paramIn.put("page", page);
paramIn.put("row", row);
@@ -507,10 +519,15 @@
@RequestMapping(value = "/getNextTask", method = RequestMethod.GET)
public ResponseEntity<String> getNextTask(@RequestHeader(value = "store-id") String storeId,
@RequestHeader(value = "user-id") String userId,
+ @RequestParam(value = "flowId") String flowId,
+ @RequestParam(value = "id") String id,
@RequestParam(value = "taskId") String taskId) {
JSONObject reqJson = new JSONObject();
reqJson.put("storeId", storeId);
reqJson.put("taskId", taskId);
+ reqJson.put("userId", userId);
+ reqJson.put("flowId", flowId);
+ reqJson.put("id", id);
return getOaWorkflowFormBMOImpl.getNextTask(reqJson);
}
--
Gitblit v1.8.0