From f63a0a153e71ee8e0df7cbfc1507ab04a42d0434 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 13 一月 2023 18:37:14 +0800
Subject: [PATCH] 设置调用超时时间
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 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 1b706d4..9bdef1c 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
@@ -436,7 +436,8 @@
oaWorkflowFormDto.setRow(1);
oaWorkflowFormDto.setPage(1);
List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
- Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
+ //Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
+ OaWorkflowFormDto tmpOaWorkflowFormDto = (oaWorkflowFormDtos == null || oaWorkflowFormDtos.size() < 1)?null:oaWorkflowFormDtos.get(0);
OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
oaWorkflowDataDto.setFlowId(paramIn.getString("flowId"));
@@ -455,7 +456,7 @@
datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
}
//鍒锋柊 琛ㄥ崟鏁版嵁
- freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
+ freshFormData(datas, paramIn, tmpOaWorkflowFormDto);
}
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
@@ -470,33 +471,19 @@
* @param datas
*/
private void freshFormData(List<JSONObject> datas, JSONObject paramIn, OaWorkflowFormDto oaWorkflowFormDto) {
- List<String> ids = new ArrayList<>();
+
List<String> userIds = new ArrayList<>();
for (JSONObject data : datas) {
- ids.add(data.getString("id"));
if (!StringUtil.isEmpty(data.getString("staffId"))) {
userIds.add(data.getString("staffId"));
}
}
- if (ids.size() < 1) {
- return;
- }
- Map paramMap = new HashMap();
- paramMap.put("storeId", paramIn.getString("storeId"));
- paramMap.put("ids", ids.toArray(new String[ids.size()]));
- paramMap.put("tableName", oaWorkflowFormDto.getTableName());
- paramMap.put("page", 1);
- paramMap.put("row", ids.size());
- List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
+ //杈撳叆formData
+ refreshFormData(oaWorkflowFormDto,datas,paramIn);
+
long duration = 0L;
for (JSONObject data : datas) {
- for (Map form : formDatas) {
- if (data.getString("id").equals(form.get("id"))) {
- data.putAll(form);
- }
- }
-
if (data.containsKey("startTime") && data.containsKey("endTime")) {
try {
if (data.getString("endTime") == null) {
@@ -531,6 +518,35 @@
}
}
+ private void refreshFormData(OaWorkflowFormDto oaWorkflowFormDto, List<JSONObject> datas, JSONObject paramIn) {
+ if(oaWorkflowFormDto == null){
+ return ;
+ }
+
+ 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()]));
+ paramMap.put("tableName", oaWorkflowFormDto.getTableName());
+ paramMap.put("page", 1);
+ paramMap.put("row", 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);
+ }
+ }
+ }
+ }
+
public String getCostTime(Long time) {
if (time == null) {
return "00:00";
--
Gitblit v1.8.0