From 461845e1d1d3e706b2a93b203b36e2e31bb5d3fd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 25 八月 2021 16:42:03 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
index 2c6895e..1f61a7c 100644
--- a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
+++ b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
@@ -99,7 +99,7 @@
datas = new ArrayList<>();
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) oaWorkflowFormDto.getRow()), count, datas);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.get("row")), count, datas);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
@@ -242,6 +242,33 @@
return responseEntity;
}
+ @Override
+ public ResponseEntity<String> auditOaWorkflow(JSONObject reqJson) {
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setStoreId(reqJson.getString("storeId"));
+ oaWorkflowDto.setFlowId(reqJson.getString("flowId"));
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
+
+ OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+ oaWorkflowFormDto.setFlowId(reqJson.get("flowId").toString());
+ oaWorkflowFormDto.setStoreId(reqJson.get("storeId").toString());
+ oaWorkflowFormDto.setRow(1);
+ oaWorkflowFormDto.setPage(1);
+ List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+ Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
+
+
+ reqJson.put("createUserId", reqJson.getString("userId"));
+ boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
+ if (isLastTask) {
+ reqJson.put("state", "1005");
+ reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
+ oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
+ }
+ return ResultVo.success();
+ }
+
/**
* 鍒峰叆琛ㄥ崟鏁版嵁
*
--
Gitblit v1.8.0