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 | 147 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 144 insertions(+), 3 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 033c4e6..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
@@ -2,12 +2,17 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
import com.java110.oa.bmo.oaWorkflow.IDeleteOaWorkflowBMO;
import com.java110.oa.bmo.oaWorkflow.IGetOaWorkflowBMO;
import com.java110.oa.bmo.oaWorkflow.ISaveOaWorkflowBMO;
import com.java110.oa.bmo.oaWorkflow.IUpdateOaWorkflowBMO;
+import com.java110.oa.bmo.oaWorkflowData.IDeleteOaWorkflowDataBMO;
+import com.java110.oa.bmo.oaWorkflowData.IGetOaWorkflowDataBMO;
+import com.java110.oa.bmo.oaWorkflowData.ISaveOaWorkflowDataBMO;
+import com.java110.oa.bmo.oaWorkflowData.IUpdateOaWorkflowDataBMO;
import com.java110.oa.bmo.oaWorkflowForm.IDeleteOaWorkflowFormBMO;
import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
import com.java110.oa.bmo.oaWorkflowForm.ISaveOaWorkflowFormBMO;
@@ -17,6 +22,7 @@
import com.java110.oa.bmo.oaWorkflowXml.ISaveOaWorkflowXmlBMO;
import com.java110.oa.bmo.oaWorkflowXml.IUpdateOaWorkflowXmlBMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
import com.java110.utils.util.Assert;
@@ -63,6 +69,17 @@
@Autowired
private IGetOaWorkflowFormBMO getOaWorkflowFormBMOImpl;
+
+
+ @Autowired
+ private ISaveOaWorkflowDataBMO saveOaWorkflowDataBMOImpl;
+ @Autowired
+ private IUpdateOaWorkflowDataBMO updateOaWorkflowDataBMOImpl;
+ @Autowired
+ private IDeleteOaWorkflowDataBMO deleteOaWorkflowDataBMOImpl;
+
+ @Autowired
+ private IGetOaWorkflowDataBMO getOaWorkflowDataBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -133,7 +150,10 @@
*/
@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 = "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) {
@@ -142,7 +162,10 @@
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);
}
@@ -362,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));
}
@@ -431,6 +462,31 @@
}
/**
+ * 鏌ヨ宸插姙
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/queryOaWorkflowUser
+ * @path /app/oaWorkflow/queryOaWorkflowUser
+ */
+ @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) {
+ JSONObject paramIn = new JSONObject();
+ paramIn.put("page", page);
+ paramIn.put("row", row);
+ paramIn.put("flowId", flowId);
+ paramIn.put("id", id);
+ paramIn.put("storeId", storeId);
+ paramIn.put("userId", userId);
+ return getOaWorkflowFormBMOImpl.queryOaWorkflowUser(paramIn);
+ }
+
+ /**
* 瀹℃牳娴佺▼
*
* @param storeId 灏忓尯ID
@@ -460,13 +516,98 @@
* @serviceCode /oaWorkflow/getNextTask
* @path /app/oaWorkflow/getNextTask
*/
- @RequestMapping(value = "/getNextTask", method = RequestMethod.POST)
+ @RequestMapping(value = "/getNextTask", method = RequestMethod.GET)
public ResponseEntity<String> getNextTask(@RequestHeader(value = "store-id") String storeId,
- @RequestHeader(value = "user-id") String userId,
- @RequestParam(value = "taskId") String taskId) {
+ @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);
}
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/saveOaWorkflowData
+ * @path /app/oaWorkflow/saveOaWorkflowData
+ */
+ @RequestMapping(value = "/saveOaWorkflowData", method = RequestMethod.POST)
+ public ResponseEntity<String> saveOaWorkflowData(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "businessKey", "璇锋眰鎶ユ枃涓湭鍖呭惈businessKey");
+ Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈context");
+
+
+ OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
+ return saveOaWorkflowDataBMOImpl.save(oaWorkflowDataPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/updateOaWorkflowData
+ * @path /app/oaWorkflow/updateOaWorkflowData
+ */
+ @RequestMapping(value = "/updateOaWorkflowData", method = RequestMethod.POST)
+ public ResponseEntity<String> updateOaWorkflowData(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "businessKey", "璇锋眰鎶ユ枃涓湭鍖呭惈businessKey");
+ Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈context");
+ Assert.hasKeyAndValue(reqJson, "dataId", "dataId涓嶈兘涓虹┖");
+
+
+ OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
+ return updateOaWorkflowDataBMOImpl.update(oaWorkflowDataPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/deleteOaWorkflowData
+ * @path /app/oaWorkflow/deleteOaWorkflowData
+ */
+ @RequestMapping(value = "/deleteOaWorkflowData", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteOaWorkflowData(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+
+ Assert.hasKeyAndValue(reqJson, "dataId", "dataId涓嶈兘涓虹┖");
+
+
+ OaWorkflowDataPo oaWorkflowDataPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowDataPo.class);
+ return deleteOaWorkflowDataBMOImpl.delete(oaWorkflowDataPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/queryOaWorkflowData
+ * @path /app/oaWorkflow/queryOaWorkflowData
+ */
+ @RequestMapping(value = "/queryOaWorkflowData", method = RequestMethod.GET)
+ public ResponseEntity<String> queryOaWorkflowData(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "businessKey") String businessKey,
+ @RequestParam(value = "row") int row) {
+ OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
+ oaWorkflowDataDto.setPage(page);
+ oaWorkflowDataDto.setRow(row);
+ oaWorkflowDataDto.setStoreId(storeId);
+ oaWorkflowDataDto.setBusinessKey(businessKey);
+ return getOaWorkflowDataBMOImpl.get(oaWorkflowDataDto);
+ }
}
--
Gitblit v1.8.0