Browse Source

维保记录保养中和已完成,新增返回维保执行人的名字,workerName1字段

wang-hai-cheng 4 years ago
parent
commit
d54ddfc8a1

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenanceRecordMapper.java

@@ -84,5 +84,5 @@ public interface MaintenanceRecordMapper extends BaseMapper<MaintenanceRecord> {
     String getGlobalSet(Long mtCompanyId);
 
     @Select("SELECT user_id,name FROM user_info WHERE user_id in (${userIds})")
-    List<Map<String, Object>> selectUserBy(String userIds);
+    List<Map<String, Object>> selectUserBy(@Param("userIds") String userIds);
 }

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -370,7 +370,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
                 if (!userMap.isEmpty()) {
                     userInfoMap = userMap.stream().
                             filter(u -> u.get("user_id") != null).
-                            collect(Collectors.toMap(k -> Long.valueOf((String) k.get("user_id")), v -> String.valueOf(v.get("name")), (k1, k2) -> k1));
+                            collect(Collectors.toMap(k -> Long.valueOf(k.get("user_id").toString()), v -> String.valueOf(v.get("name")), (k1, k2) -> k1));
                 }
             }
             Map<Long, String> finalUserInfoMap = userInfoMap;