代码优化

sop-business/src/main/java/com/qmth/sop/business/bean/result/ProjectExchangeResult.java

@@ -43,7 +43,7 @@ public class ProjectExchangeResult extends WorkTaskResult implements Serializabl
     String projectExchangeFlowStatusStr;
 
     @ApiModelProperty(value = "审核人")
-    String approveUsersName;
+    String approveUsersName = "--";
 
     @ApiModelProperty(value = "是否是自己审核")
     boolean myself;

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBQualityProblemApplyResult.java

@@ -50,7 +50,7 @@ public class TBQualityProblemApplyResult extends TBQualityProblemApply implement
     private Integer setup;
 
     @ApiModelProperty(value = "当前负责人")
-    private String pendApproveUsers;
+    private String pendApproveUsers = "--";
 
     @ApiModelProperty(value = "流程id")
     @JsonSerialize(using = ToStringSerializer.class)

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -139,8 +139,8 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             for (DingApplyUnDoneResult d : dingApplyUnDoneResultIPage.getRecords()) {
                 TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(d.getFlowId());
                 if (Objects.nonNull(tfFlowLog) && Objects.nonNull(tfFlowLog.getPendApproveId())) {
-                    List<String> list = Arrays.asList(tfFlowLog.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
-                    List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(list.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
+                    List<String> userList = Arrays.asList(tfFlowLog.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
+                    List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userList.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
                     List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
                     d.setApproveUserName(StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
                 }
@@ -206,8 +206,8 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             for (DingApplyDoneResult d : dingApplyDoneResultIPage.getRecords()) {
                 String string = tfFlowLogService.findByLastFlowLogApproveUser(d.getFlowId());
                 if (Objects.nonNull(string)) {
-                    List<String> list = Arrays.asList(string.split(SystemConstant.LIST_JOIN_SPLIT));
-                    List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(list.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
+                    List<String> userList = Arrays.asList(string.split(SystemConstant.LIST_JOIN_SPLIT));
+                    List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userList.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
                     List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
                     d.setApproveUsersName(StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
                 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBProjectExchangeServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.reflect.TypeToken;
 import com.qmth.sop.business.activiti.service.ActivitiService;
 import com.qmth.sop.business.bean.dto.DataPermissionDto;
+import com.qmth.sop.business.bean.dto.OrgUserNameDto;
 import com.qmth.sop.business.bean.dto.UserDto;
 import com.qmth.sop.business.bean.params.FlowApproveParam;
 import com.qmth.sop.business.bean.result.*;
@@ -129,11 +130,10 @@ public class TBProjectExchangeServiceImpl extends ServiceImpl<TBProjectExchangeM
         for (ProjectExchangeResult p : list.getRecords()) {
             TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(p.getFlowId());
             if (Objects.nonNull(tfFlowLog) && Objects.nonNull(tfFlowLog.getPendApproveId())) {
-                List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(tfFlowLog.getPendApproveId().split(",")));
-                List<String> userName = sysUserList.stream().map(s -> s.getRealName()).collect(Collectors.toList());
-                p.setApproveUsersName(StringUtils.join(userName, ","));
-            } else {
-                p.setApproveUsersName("--");
+                List<String> userList = Arrays.asList(tfFlowLog.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
+                List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userList.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
+                List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
+                p.setApproveUsersName(StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
             }
             if (Objects.nonNull(p.getTaskId())) {
                 Task task = taskService.createTaskQuery().taskId(String.valueOf(p.getTaskId())).singleResult();

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBQualityProblemApplyServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.sop.business.activiti.service.ActivitiService;
 import com.qmth.sop.business.bean.dto.DataPermissionDto;
+import com.qmth.sop.business.bean.dto.OrgUserNameDto;
 import com.qmth.sop.business.bean.dto.UserDto;
 import com.qmth.sop.business.bean.params.FlowApproveParam;
 import com.qmth.sop.business.bean.result.FlowFormWidgetResult;
@@ -97,11 +98,10 @@ public class TBQualityProblemApplyServiceImpl extends ServiceImpl<TBQualityProbl
             }
             TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(p.getFlowId());
             if (Objects.nonNull(tfFlowLog) && Objects.nonNull(tfFlowLog.getPendApproveId())) {
-                List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(tfFlowLog.getPendApproveId().split(",")));
-                List<String> userName = sysUserList.stream().map(s -> s.getRealName()).collect(Collectors.toList());
-                p.setPendApproveUsers(StringUtils.join(userName, ","));
-            } else {
-                p.setPendApproveUsers("--");
+                List<String> userList = Arrays.asList(tfFlowLog.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
+                List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userList.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
+                List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
+                p.setPendApproveUsers(StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
             }
         }
         return resultIPage;

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.sop.business.activiti.service.ActivitiService;
 import com.qmth.sop.business.bean.dto.DataPermissionDto;
+import com.qmth.sop.business.bean.dto.OrgUserNameDto;
 import com.qmth.sop.business.bean.params.*;
 import com.qmth.sop.business.bean.result.*;
 import com.qmth.sop.business.entity.*;
@@ -448,6 +449,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
             String assistantEngineerUserId = (String) m.get("assistant_engineer_user_id_1");
             List<Long> userIdList = new ArrayList<>(3);
             Map<Long, String> map = new HashMap<>(3);
+            Map<Long, String> assistantEngineerMap = new HashMap<>();//助理工程师map
             if (Objects.nonNull(regionUserId)) {
                 userIdList.add(Long.parseLong(regionUserId));
                 map.put(Long.parseLong(regionUserId), "region_user_id_1");
@@ -457,24 +459,40 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 map.put(Long.parseLong(engineerUserId), "engineer_user_id_1");
             }
             if (Objects.nonNull(assistantEngineerUserId)) {
-                userIdList.add(Long.parseLong(assistantEngineerUserId));
-                map.put(Long.parseLong(assistantEngineerUserId), "assistant_engineer_user_id_1");
+                if (assistantEngineerUserId.contains(SystemConstant.LIST_JOIN_SPLIT)) {
+                    String[] strs = assistantEngineerUserId.split(",");
+                    for (int i = 0; i < strs.length; i++) {
+                        userIdList.add(Long.parseLong(strs[i]));
+                        assistantEngineerMap.put(Long.parseLong(strs[i]), "assistant_engineer_user_id_1");
+                    }
+                } else {
+                    userIdList.add(Long.parseLong(assistantEngineerUserId));
+                    assistantEngineerMap.put(Long.parseLong(assistantEngineerUserId), "assistant_engineer_user_id_1");
+                }
             }
             if (!CollectionUtils.isEmpty(userIdList)) {
-                List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
-                for (SysUser s : sysUsers) {
+                List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userIdList);
+                StringJoiner stringJoiner = new StringJoiner(SystemConstant.LIST_JOIN_SPLIT);
+                for (OrgUserNameDto s : orgUserNameDtoList) {
                     if (map.containsKey(s.getId())) {
-                        m.put(map.get(s.getId()), s.getRealName());
+                        m.put(map.get(s.getId()), s.getOrgUserName());
                     }
+                    if (assistantEngineerMap.containsKey(s.getId())) {
+                        stringJoiner.add(s.getOrgUserName());
+                    }
+                }
+                if (!CollectionUtils.isEmpty(assistantEngineerMap)) {
+                    m.put("assistant_engineer_user_id_1", stringJoiner.toString());
                 }
             }
 
             String flowId = (String) m.get("flowId");
             TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(Long.parseLong(flowId));
             if (Objects.nonNull(tfFlowLog) && Objects.nonNull(tfFlowLog.getPendApproveId())) {
-                List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(tfFlowLog.getPendApproveId().split(",")));
-                List<String> userName = sysUserList.stream().map(s -> s.getRealName()).collect(Collectors.toList());
-                m.put("pendApproveName", StringUtils.join(userName, ","));
+                List<String> userList = Arrays.asList(tfFlowLog.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
+                List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userList.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
+                List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
+                m.put("pendApproveName", StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
             } else {
                 m.put("pendApproveName", "--");
             }