feat: feat 15 add dept name

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -45,6 +45,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmUserSignMapper;
 import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.admin.util.RegUtils;
+import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -119,7 +120,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     private final WmScoreTaskTypeService wmScoreTaskTypeService;
     private final WmTaskTypeService taskTypeService;
     private final SysUserService userService;
-    private final RedisTemplate<String, Object> redisTemplate;
+    private final RedisTemplate redisTemplate;
     private final UpmsConfig upmsConfig;
     private final SysCheckChainManager checkChainManager;
     private final SysDictItemService sysDictItemService;
@@ -2990,6 +2991,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             //     userSignPurposeMap.putAll(itemList.stream().collect(Collectors.groupingBy(SysDictItem::getType)));
             // }
 
+
+
             // 获取包的关联药品
             String[] drugtable = scorePackage.getDrugtable();
             String drugName;
@@ -3011,6 +3014,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                 mahName = "";
             }
 
+            List<SysDept> depts = redisTemplate.opsForList().range(CacheConstants.DEPT_KEY, 0, -1);
+            Map<Integer, String> deptId2EntityMap = depts.stream()
+                .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getName));
 
             // 查询任务字段配置
             Set<String> configedTaskTypeId = new HashSet<>();
@@ -3054,7 +3060,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             // task用户名称
             List<SysUser> userList = userService.listByIds(taskList.stream().map(WmTask::getTaskUserId).collect(Collectors.toSet()));
-            Map<Integer, String> userMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
+            Map<Integer, SysUser> userMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, Function.identity()));
 
             // 任务审核状态
             Set<Integer> taskIds = taskList.stream().mapToInt(task -> Integer.parseInt(task.getId())).boxed().collect(Collectors.toSet());
@@ -3076,9 +3082,11 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                 map.put("drugName", finalDrugName);
                 map.put("mah", finalMahName);
                 map.put("period", String.format("%s 至 %s", formatter.format(scorePackage.getStartTime()), formatter.format(scorePackage.getEndTime())));
-                map.put("taskUserName", userMap.get(Integer.parseInt(wmTask.getTaskUserId())));
+                SysUser sysUser = userMap.get(Integer.parseInt(wmTask.getTaskUserId()));
+                map.put("taskUserName", sysUser == null ? "" : sysUser.getUsername() );
                 map.put("taskInfo", wmTask);
                 map.put("id", wmTask.getId());
+                map.put("deptName", sysUser == null ? "" : deptId2EntityMap.get(sysUser.getDeptId()));
 
                 WmTaskContent wmTaskContent = taskContentMap.get(Integer.parseInt(wmTask.getTaskContentId()));
                 map.put("wmTaskContent", wmTaskContent);