1、修改pc端任务管理、任务台账请求过慢问题

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanController.java

 package com.censoft.censoftrongtong.controller;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.convert.Convert;
+import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto;
 import com.censoft.censoftrongtong.domain.dto.RiskNotificationExportWordDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
+import com.censoft.censoftrongtong.service.ILedgerBuildingService;
 import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
 import com.censoft.censoftrongtong.service.IRiskPlanService;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.WordUtil;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -51,6 +57,12 @@ public class RiskPlanController extends BaseController
     @Resource
     private IRiskPlanInherentListService riskPlanInherentListService;
 
+    @Resource
+    private ILedgerBuildingService ledgerBuildingService;
+
+    @Resource
+    private ISysUserService userService;
+
     /**
      * 查询风险计划列表
      */
@@ -66,6 +78,18 @@ public class RiskPlanController extends BaseController
         List<RiskPlanAppTaskDetailsDto> list = riskPlanService.selectRiskPlanList(riskPlan);
         list.forEach(dto -> {
             dto.setStatusName(RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle());
+
+            List<String> buildingIds = Arrays.asList(dto.getBuildingIds().split(","));
+            String buildingNames = ledgerBuildingService.getBuildingListByIds(buildingIds)
+                    .stream().map(LedgerBuilding::getName)
+                    .collect(Collectors.joining(","));
+            dto.setBuildingNames(buildingNames);
+
+            List<String> workUserIds = Arrays.asList(dto.getWorkUserIds().split(","));
+            String workUserNames = userService.getByIds(workUserIds)
+                    .stream().map(SysUser::getNickName)
+                    .collect(Collectors.joining(","));
+            dto.setWorkUserNames(workUserNames);
         });
 
 

censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml

@@ -48,11 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sd2.ancestors AS ancestors,
         lp.city,
         rp.building_ids AS buildingIds,
-        ( SELECT GROUP_CONCAT( `name` ) FROM ledger_building WHERE FIND_IN_SET( id, rp.building_ids ) ) AS buildingNames,
+--         ( SELECT GROUP_CONCAT( `name` ) FROM ledger_building WHERE FIND_IN_SET( id, rp.building_ids ) ) AS buildingNames,
         su2.user_id AS leaderUserId,
         su2.nick_name AS leaderUserName,
         rp.work_user_ids AS workUserIds,
-        ( SELECT GROUP_CONCAT( nick_name ) FROM sys_user WHERE FIND_IN_SET( user_id, rp.work_user_ids ) ) AS workUserNames,
+--         ( SELECT GROUP_CONCAT( nick_name ) FROM sys_user WHERE FIND_IN_SET( user_id, rp.work_user_ids ) ) AS workUserNames,
         rp.start_time AS startTime,
         rp.end_time AS endTime,
         rp.status,

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -126,4 +126,6 @@ public interface SysUserMapper
     public SysUser checkEmailUnique(String email);
 
     List<SysUser> getListByDeptIdUnder(@Param("deptId") Long deptId);
+
+    List<SysUser> getByIds(@Param("userIds") List<String> userIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

 package com.ruoyi.system.service;
 
+import java.util.Arrays;
 import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
@@ -211,4 +212,6 @@ public interface ISysUserService
      * @return 用户信息集合信息
      */
     List<SysUser> getListByDeptIdUnder(Long deptId);
+
+    List<SysUser> getByIds(List<String> userIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -546,4 +546,12 @@ public class SysUserServiceImpl implements ISysUserService
     public List<SysUser> getListByDeptIdUnder(Long deptId) {
         return userMapper.getListByDeptIdUnder(deptId);
     }
+
+    @Override
+    public List<SysUser> getByIds(List<String> userIds) {
+        if (userIds == null || userIds.isEmpty()){
+            return new ArrayList();
+        }
+        return userMapper.getByIds(userIds);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -167,6 +167,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			u.del_flag = '0'
 		  AND ( u.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR find_in_set( #{deptId}, ancestors ) ) )
 	</select>
+    <select id="getByIds" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		WHERE
+			u.del_flag = '0'
+		  AND u.user_id in
+		<foreach collection="userIds" item="userId" open="(" separator="," close=")">
+			#{userId}
+		</foreach>
+	</select>
 
     <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(