From 34227abf67942462c57e8dbd5bfecba466c57dc5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:29:39 +0800
Subject: [PATCH] 优化查询待办
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 141 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 140 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 d4aeb5d..0fbb92c 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
@@ -5,6 +5,7 @@
import com.java110.dto.oaWorkflow.OaWorkflowDto;
import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
import com.java110.dto.user.UserDto;
+import com.java110.entity.audit.AuditUser;
import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
@@ -19,6 +20,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -97,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 / (int) paramIn.get("row")), count, datas);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
@@ -160,4 +162,141 @@
return ResultVo.success();
}
+ /**
+ * 鏌ヨ宸ヤ綔娴佸緟鍔�
+ *
+ * @param paramIn
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> queryOaWorkflowUserTaskFormData(JSONObject paramIn) {
+
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setStoreId(paramIn.getString("storeId"));
+ oaWorkflowDto.setFlowId(paramIn.getString("flowId"));
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
+
+ AuditUser auditUser = new AuditUser();
+ auditUser.setProcessDefinitionKey(oaWorkflowDtos.get(0).getProcessDefinitionKey());
+ auditUser.setFlowId(paramIn.getString("flowId"));
+ auditUser.setUserId(paramIn.getString("userId"));
+ auditUser.setStoreId(paramIn.getString("storeId"));
+ auditUser.setPage(paramIn.getInteger("page"));
+ auditUser.setRow(paramIn.getInteger("row"));
+
+ long count = oaWorkflowUserInnerServiceSMOImpl.getUserTaskCount(auditUser);
+
+ List<JSONObject> datas = null;
+
+ if (count > 0) {
+ datas = oaWorkflowUserInnerServiceSMOImpl.getUserTasks(auditUser);
+ //鍒锋柊 琛ㄥ崟鏁版嵁
+ freshFormData(datas, paramIn);
+ } else {
+ datas = new ArrayList<>();
+ }
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
+ }
+
+ /**
+ * 鏌ヨ宸ヤ綔娴佸緟鍔�
+ *
+ * @param paramIn
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> queryOaWorkflowUserHisTaskFormData(JSONObject paramIn) {
+
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setStoreId(paramIn.getString("storeId"));
+ oaWorkflowDto.setFlowId(paramIn.getString("flowId"));
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
+
+ AuditUser auditUser = new AuditUser();
+ auditUser.setProcessDefinitionKey(oaWorkflowDtos.get(0).getProcessDefinitionKey());
+ auditUser.setFlowId(paramIn.getString("flowId"));
+ auditUser.setUserId(paramIn.getString("userId"));
+ auditUser.setStoreId(paramIn.getString("storeId"));
+ auditUser.setPage(paramIn.getInteger("page"));
+ auditUser.setRow(paramIn.getInteger("row"));
+
+ long count = oaWorkflowUserInnerServiceSMOImpl.getUserHistoryTaskCount(auditUser);
+
+ List<JSONObject> datas = null;
+
+ if (count > 0) {
+ datas = oaWorkflowUserInnerServiceSMOImpl.getUserHistoryTasks(auditUser);
+ //鍒锋柊 琛ㄥ崟鏁版嵁
+ freshFormData(datas, paramIn);
+ } else {
+ datas = new ArrayList<>();
+ }
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ 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();
+ }
+
+ /**
+ * 鍒峰叆琛ㄥ崟鏁版嵁
+ *
+ * @param datas
+ */
+ private void freshFormData(List<JSONObject> datas, JSONObject paramIn) {
+ List<String> ids = new ArrayList<>();
+ for (JSONObject data : datas) {
+ ids.add(data.getString("id"));
+ }
+ if (ids.size() < 1) {
+ return;
+ }
+
+ Map paramMap = new HashMap();
+ paramMap.put("storeId", paramIn.getString("storeId"));
+ paramMap.put("ids", ids.toArray(new String[ids.size()]));
+ List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
+
+ for (JSONObject data : datas) {
+ for (Map form : formDatas) {
+ if (data.getString("id").equals(form.get("id"))) {
+ data.putAll(form);
+ }
+ }
+ }
+ }
+
}
--
Gitblit v1.8.0