From 7310466eff5cedab169708a336ee092f0155b2e3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 31 八月 2021 10:24:58 +0800
Subject: [PATCH] 优化 代码
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 a0594ba..635b906 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
@@ -23,7 +23,6 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -253,14 +252,14 @@
long count = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatasCount(oaWorkflowDataDto);
- List<JSONObject> datas = null;
-
+ List<JSONObject> datas = new ArrayList<>();
if (count > 0) {
- datas = BeanConvertUtil.covertBeanList(oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto), JSONObject.class);
+ List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
+ for (OaWorkflowDataDto oaWorkflowDataDto1 : oaWorkflowDataDtos) {
+ datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
+ }
//鍒锋柊 琛ㄥ崟鏁版嵁
freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
- } else {
- datas = new ArrayList<>();
}
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
@@ -368,7 +367,7 @@
if (count > 0) {
List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
- for(OaWorkflowDataDto oaWorkflowDataDto1 : oaWorkflowDataDtos){
+ for (OaWorkflowDataDto oaWorkflowDataDto1 : oaWorkflowDataDtos) {
datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
}
//鍒锋柊 琛ㄥ崟鏁版嵁
@@ -388,8 +387,10 @@
*/
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"));
+ userIds.add(data.getString("staffId"));
}
if (ids.size() < 1) {
return;
@@ -424,6 +425,24 @@
data.put("duration", getCostTime(duration));
}
}
+
+ if (userIds.size() < 1) {
+ return;
+ }
+
+ //鍒峰叆鍛樺伐淇℃伅
+ UserDto userDto = new UserDto();
+ userDto.setUserIds(userIds.toArray(new String[userIds.size()]));
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getStaffs(userDto);
+
+ for (JSONObject data : datas) {
+ for (UserDto userDto1 : userDtos) {
+ if(data.getString("staffId").equals(userDto1.getUserId())){
+ data.put("orgName",userDto1.getOrgName());
+ data.put("staffName",userDto1.getUserName());
+ }
+ }
+ }
}
public String getCostTime(Long time) {
--
Gitblit v1.8.0