From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 105 insertions(+), 1 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 3c7f770..780753e 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,11 +2,17 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
+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.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.oaWorkflowXml.OaWorkflowXmlPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +32,16 @@
@Autowired
private IGetOaWorkflowBMO getOaWorkflowBMOImpl;
+
+ @Autowired
+ private ISaveOaWorkflowXmlBMO saveOaWorkflowXmlBMOImpl;
+ @Autowired
+ private IUpdateOaWorkflowXmlBMO updateOaWorkflowXmlBMOImpl;
+ @Autowired
+ private IDeleteOaWorkflowXmlBMO deleteOaWorkflowXmlBMOImpl;
+
+ @Autowired
+ private IGetOaWorkflowXmlBMO getOaWorkflowXmlBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -78,7 +94,6 @@
*/
@RequestMapping(value = "/deleteOaWorkflow", method = RequestMethod.POST)
public ResponseEntity<String> deleteOaWorkflow(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "flowId", "flowId涓嶈兘涓虹┖");
@@ -97,12 +112,101 @@
*/
@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 = "page") int page,
@RequestParam(value = "row") int row) {
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
oaWorkflowDto.setPage(page);
oaWorkflowDto.setRow(row);
oaWorkflowDto.setStoreId(storeId);
+ oaWorkflowDto.setFlowId(flowId);
return getOaWorkflowBMOImpl.get(oaWorkflowDto);
}
+
+
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/saveOaWorkflowXml
+ * @path /app/oaWorkflow/saveOaWorkflowXml
+ */
+ @RequestMapping(value = "/saveOaWorkflowXml", method = RequestMethod.POST)
+ public ResponseEntity<String> saveOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "flowId", "璇锋眰鎶ユ枃涓湭鍖呭惈flowId");
+ Assert.hasKeyAndValue(reqJson, "bpmnXml", "璇锋眰鎶ユ枃涓湭鍖呭惈bpmnXml");
+
+
+ OaWorkflowXmlPo oaWorkflowXmlPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowXmlPo.class);
+ oaWorkflowXmlPo.setStoreId(storeId);
+ return saveOaWorkflowXmlBMOImpl.save(oaWorkflowXmlPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/updateOaWorkflowXml
+ * @path /app/oaWorkflow/updateOaWorkflowXml
+ */
+ @RequestMapping(value = "/updateOaWorkflowXml", method = RequestMethod.POST)
+ public ResponseEntity<String> updateOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "flowId", "璇锋眰鎶ユ枃涓湭鍖呭惈flowId");
+ Assert.hasKeyAndValue(reqJson, "bpmnXml", "璇锋眰鎶ユ枃涓湭鍖呭惈bpmnXml");
+ Assert.hasKeyAndValue(reqJson, "xmlId", "xmlId涓嶈兘涓虹┖");
+
+
+ OaWorkflowXmlPo oaWorkflowXmlPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowXmlPo.class);
+ oaWorkflowXmlPo.setStoreId(storeId);
+ return updateOaWorkflowXmlBMOImpl.update(oaWorkflowXmlPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /oaWorkflow/deleteOaWorkflowXml
+ * @path /app/oaWorkflow/deleteOaWorkflowXml
+ */
+ @RequestMapping(value = "/deleteOaWorkflowXml", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "xmlId", "xmlId涓嶈兘涓虹┖");
+
+
+ OaWorkflowXmlPo oaWorkflowXmlPo = BeanConvertUtil.covertBean(reqJson, OaWorkflowXmlPo.class);
+ oaWorkflowXmlPo.setStoreId(storeId);
+ return deleteOaWorkflowXmlBMOImpl.delete(oaWorkflowXmlPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 灏忓尯ID
+ * @return
+ * @serviceCode /oaWorkflow/queryOaWorkflowXml
+ * @path /app/oaWorkflow/queryOaWorkflowXml
+ */
+ @RequestMapping(value = "/queryOaWorkflowXml", method = RequestMethod.GET)
+ public ResponseEntity<String> queryOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value="flowId") String flowId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
+ oaWorkflowXmlDto.setPage(page);
+ oaWorkflowXmlDto.setRow(row);
+ oaWorkflowXmlDto.setStoreId(storeId);
+ oaWorkflowXmlDto.setFlowId(flowId);
+ return getOaWorkflowXmlBMOImpl.get(oaWorkflowXmlDto);
+ }
}
--
Gitblit v1.8.0