From 28e7d3937f819a3486b22bfa1c84aee172aaccb4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 17:46:42 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 d603f6f..b4561d7 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
@@ -29,12 +29,7 @@
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -155,6 +150,7 @@
*/
@RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
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 = "state", required = false) String state,
@RequestParam(value = "page") int page,
@@ -165,6 +161,7 @@
oaWorkflowDto.setStoreId(storeId);
oaWorkflowDto.setFlowId(flowId);
oaWorkflowDto.setState(state);
+ oaWorkflowDto.setUserId(userId);
return getOaWorkflowBMOImpl.get(oaWorkflowDto);
}
@@ -384,6 +381,14 @@
if ("flowId".equals(key)) {
continue;
}
+ if("fileName".equals(key)){
+ continue;
+ }
+
+ if("realFileName".equals(key)){
+ continue;
+ }
+
columns.add(key);
values.add(reqJson.getString(key));
}
@@ -510,10 +515,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