From 1d4e7dc07b0ef56d852a02ffc6f02df0d28d4549 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 23 八月 2021 16:58:31 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 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 d87b1f3..881dc0f 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,16 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
+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.oaWorkflowForm.IDeleteOaWorkflowFormBMO;
+import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
+import com.java110.oa.bmo.oaWorkflowForm.ISaveOaWorkflowFormBMO;
+import com.java110.oa.bmo.oaWorkflowForm.IUpdateOaWorkflowFormBMO;
import com.java110.oa.bmo.oaWorkflowXml.IDeleteOaWorkflowXmlBMO;
import com.java110.oa.bmo.oaWorkflowXml.IGetOaWorkflowXmlBMO;
import com.java110.oa.bmo.oaWorkflowXml.ISaveOaWorkflowXmlBMO;
import com.java110.oa.bmo.oaWorkflowXml.IUpdateOaWorkflowXmlBMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -42,6 +48,16 @@
@Autowired
private IGetOaWorkflowXmlBMO getOaWorkflowXmlBMOImpl;
+
+ @Autowired
+ private ISaveOaWorkflowFormBMO saveOaWorkflowFormBMOImpl;
+ @Autowired
+ private IUpdateOaWorkflowFormBMO updateOaWorkflowFormBMOImpl;
+ @Autowired
+ private IDeleteOaWorkflowFormBMO deleteOaWorkflowFormBMOImpl;
+
+ @Autowired
+ private IGetOaWorkflowFormBMO getOaWorkflowFormBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -94,7 +110,6 @@
*/
@RequestMapping(value = "/deleteOaWorkflow", method = RequestMethod.POST)
public ResponseEntity<String> deleteOaWorkflow(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "flowId", "flowId涓嶈兘涓虹┖");
@@ -113,7 +128,8 @@
*/
@RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
- @RequestParam(value="flowId",required = false) String flowId,
+ @RequestParam(value = "flowId", required = false) String flowId,
+ @RequestParam(value = "state", required = false) String state,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
@@ -121,10 +137,9 @@
oaWorkflowDto.setRow(row);
oaWorkflowDto.setStoreId(storeId);
oaWorkflowDto.setFlowId(flowId);
+ oaWorkflowDto.setState(state);
return getOaWorkflowBMOImpl.get(oaWorkflowDto);
}
-
-
/**
@@ -200,7 +215,7 @@
*/
@RequestMapping(value = "/queryOaWorkflowXml", method = RequestMethod.GET)
public ResponseEntity<String> queryOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
- @RequestParam(value="flowId") String flowId,
+ @RequestParam(value = "flowId") String flowId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
@@ -210,4 +225,87 @@
oaWorkflowXmlDto.setFlowId(flowId);
return getOaWorkflowXmlBMOImpl.get(oaWorkflowXmlDto);
}
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/saveOaWorkflowForm
+ * @path /app/oaWorkflow/saveOaWorkflowForm
+ */
+ @RequestMapping(value = "/saveOaWorkflowForm", method = RequestMethod.POST)
+ public ResponseEntity<String> saveOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "flowId", "璇锋眰鎶ユ枃涓湭鍖呭惈flowId");
+ Assert.hasKeyAndValue(reqJson, "formJson", "璇锋眰鎶ユ枃涓湭鍖呭惈formJson");
+
+
+ OaWorkflowFormPo oaWorkflowFormPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowFormPo.class);
+ oaWorkflowFormPo.setStoreId(storeId);
+ return saveOaWorkflowFormBMOImpl.save(oaWorkflowFormPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/updateOaWorkflowForm
+ * @path /app/oaWorkflow/updateOaWorkflowForm
+ */
+ @RequestMapping(value = "/updateOaWorkflowForm", method = RequestMethod.POST)
+ public ResponseEntity<String> updateOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "flowId", "璇锋眰鎶ユ枃涓湭鍖呭惈flowId");
+ Assert.hasKeyAndValue(reqJson, "formJson", "璇锋眰鎶ユ枃涓湭鍖呭惈formJson");
+ Assert.hasKeyAndValue(reqJson, "formId", "formId涓嶈兘涓虹┖");
+
+ OaWorkflowFormPo oaWorkflowFormPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowFormPo.class);
+ oaWorkflowFormPo.setStoreId(storeId);
+ return updateOaWorkflowFormBMOImpl.update(oaWorkflowFormPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/deleteOaWorkflowForm
+ * @path /app/oaWorkflow/deleteOaWorkflowForm
+ */
+ @RequestMapping(value = "/deleteOaWorkflowForm", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "xmlId", "xmlId涓嶈兘涓虹┖");
+
+
+ OaWorkflowFormPo oaWorkflowFormPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowFormPo.class);
+ oaWorkflowFormPo.setStoreId(storeId);
+ return deleteOaWorkflowFormBMOImpl.delete(oaWorkflowFormPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/queryOaWorkflowForm
+ * @path /app/oaWorkflow/queryOaWorkflowForm
+ */
+ @RequestMapping(value = "/queryOaWorkflowForm", method = RequestMethod.GET)
+ public ResponseEntity<String> queryOaWorkflowForm(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "flowId", required = false) String flowId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+ oaWorkflowFormDto.setPage(page);
+ oaWorkflowFormDto.setRow(row);
+ oaWorkflowFormDto.setStoreId(storeId);
+ oaWorkflowFormDto.setFlowId(flowId);
+ return getOaWorkflowFormBMOImpl.get(oaWorkflowFormDto);
+ }
}
--
Gitblit v1.8.0