From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowFormInnerServiceSMOImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowFormInnerServiceSMOImpl.java b/service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowFormInnerServiceSMOImpl.java
index f4e9be9..8fecd1e 100644
--- a/service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowFormInnerServiceSMOImpl.java
+++ b/service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowFormInnerServiceSMOImpl.java
@@ -107,10 +107,10 @@
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
- int page = (int)paramIn.get("page");
+ int page = (int) paramIn.get("page");
if (page != PageDto.DEFAULT_PAGE) {
- paramIn.put("page",(page - 1) * (int)paramIn.get("row"));
+ paramIn.put("page", (page - 1) * (int) paramIn.get("row"));
}
List<Map> info = oaWorkflowFormServiceDaoImpl.queryOaWorkflowFormDatas(paramIn);
@@ -119,7 +119,17 @@
@Override
public int saveOaWorkflowFormData(@RequestBody JSONObject reqJson) {
- return oaWorkflowFormServiceDaoImpl.saveOaWorkflowFormDataInfo(BeanConvertUtil.beanCovertMap(reqJson));
+ return oaWorkflowFormServiceDaoImpl.saveOaWorkflowFormDataInfo(reqJson);
+ }
+
+ @Override
+ public int updateOaWorkflowFormData(@RequestBody JSONObject reqJson) {
+ return oaWorkflowFormServiceDaoImpl.updateOaWorkflowFormData(reqJson);
+ }
+
+ @Override
+ public int updateOaWorkflowFormDataAll(@RequestBody JSONObject reqJson) {
+ return oaWorkflowFormServiceDaoImpl.updateOaWorkflowFormDataAll(reqJson);
}
public IOaWorkflowFormServiceDao getOaWorkflowFormServiceDaoImpl() {
--
Gitblit v1.8.0