From b278a4b743d0cf45fd0b42bc78ff42f4e1124baf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 十月 2021 12:20:04 +0800
Subject: [PATCH] 优化diamante
---
service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 232 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 f01fb52..a1417eb 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,11 +22,11 @@
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;
import com.java110.utils.util.BeanConvertUtil;
-import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -64,6 +69,17 @@
@Autowired
private IGetOaWorkflowFormBMO getOaWorkflowFormBMOImpl;
+
+
+ @Autowired
+ private ISaveOaWorkflowDataBMO saveOaWorkflowDataBMOImpl;
+ @Autowired
+ private IUpdateOaWorkflowDataBMO updateOaWorkflowDataBMOImpl;
+ @Autowired
+ private IDeleteOaWorkflowDataBMO deleteOaWorkflowDataBMOImpl;
+
+ @Autowired
+ private IGetOaWorkflowDataBMO getOaWorkflowDataBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -134,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,
@@ -144,6 +161,7 @@
oaWorkflowDto.setStoreId(storeId);
oaWorkflowDto.setFlowId(flowId);
oaWorkflowDto.setState(state);
+ oaWorkflowDto.setUserId(userId);
return getOaWorkflowBMOImpl.get(oaWorkflowDto);
}
@@ -326,6 +344,7 @@
@RequestMapping(value = "/queryOaWorkflowFormData", method = RequestMethod.GET)
public ResponseEntity<String> queryOaWorkflowFormData(@RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "flowId", required = false) String flowId,
+ @RequestParam(value = "id", required = false) String id,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "createUserName", required = false) String createUserName,
@@ -339,6 +358,7 @@
paramIn.put("startTime", startTime);
paramIn.put("flowId", flowId);
paramIn.put("storeId", storeId);
+ paramIn.put("id", id);
return getOaWorkflowFormBMOImpl.queryOaWorkflowFormData(paramIn);
}
@@ -364,9 +384,218 @@
columns.add(key);
values.add(reqJson.getString(key));
}
- reqJson.put("columns",columns.toArray(new String[columns.size()]));
- reqJson.put("values",columns.toArray(new String[values.size()]));
+ reqJson.put("columns", columns.toArray(new String[columns.size()]));
+ reqJson.put("values", values.toArray(new String[values.size()]));
reqJson.put("storeId", storeId);
+ reqJson.put("userId", userId);
return getOaWorkflowFormBMOImpl.saveOaWorkflowFormData(reqJson);
}
+
+ /**
+ * 鏌ヨ寰呭姙
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/queryOaWorkflowUserTaskFormData
+ * @path /app/oaWorkflow/queryOaWorkflowUserTaskFormData
+ */
+ @RequestMapping(value = "/queryOaWorkflowUserTaskFormData", method = RequestMethod.GET)
+ public ResponseEntity<String> queryOaWorkflowUserTaskFormData(@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) {
+ JSONObject paramIn = new JSONObject();
+ paramIn.put("page", page);
+ paramIn.put("row", row);
+ paramIn.put("createUserName", createUserName);
+ paramIn.put("endTime", endTime);
+ paramIn.put("startTime", startTime);
+ paramIn.put("flowId", flowId);
+ paramIn.put("storeId", storeId);
+ paramIn.put("userId", userId);
+ return getOaWorkflowFormBMOImpl.queryOaWorkflowUserTaskFormData(paramIn);
+ }
+
+ /**
+ * 鏌ヨ宸插姙
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/queryOaWorkflowUserHisTaskFormData
+ * @path /app/oaWorkflow/queryOaWorkflowUserHisTaskFormData
+ */
+ @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) {
+ JSONObject paramIn = new JSONObject();
+ paramIn.put("page", page);
+ paramIn.put("row", row);
+ paramIn.put("createUserName", createUserName);
+ paramIn.put("endTime", endTime);
+ paramIn.put("startTime", startTime);
+ paramIn.put("flowId", flowId);
+ paramIn.put("storeId", storeId);
+ paramIn.put("userId", userId);
+ return getOaWorkflowFormBMOImpl.queryOaWorkflowUserHisTaskFormData(paramIn);
+ }
+
+ /**
+ * 鏌ヨ宸插姙
+ *
+ * @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
+ * @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("curUserId", userId);
+ return getOaWorkflowFormBMOImpl.auditOaWorkflow(reqJson);
+ }
+
+ /**
+ * 瀹℃牳娴佺▼
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/getNextTask
+ * @path /app/oaWorkflow/getNextTask
+ */
+ @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);
+ }
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @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