Merge branch 'develop_tzs_bugfix' of http://39.100.92.250:5000/moa/amos-boot-biz…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/PlanTaskMapper.java

@@ -24,4 +24,5 @@ public interface PlanTaskMapper extends BaseMapper {
 
 	List<Map<String, Object>> getPostList();
 
+    List<Map<String, String>> getUserByUserName(@Param("userIds") List<String> userIds);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/PlanTask.xml

@@ -135,6 +135,13 @@
 		WHERE
 			TYPE LIKE'%QYRYGW%'
 	</select>
+	<select id="getUserByUserName" resultType="java.util.Map">
+		SELECT amos_user_name as userName,name as realName from tzs_user_info
+		where amos_user_name in
+		<foreach collection="userIds" item="userId" open="(" separator="," close=")">
+			#{userId}
+		</foreach>
+	</select>
 
 
 </mapper>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizByTCMServiceImpl.java

@@ -357,6 +357,42 @@ public class EnterpriseBizByTCMServiceImpl {
         Map<String, Object> result = new HashMap<>();
         //查询列表信息
         Page<HashMap<String, Object>> pageList = planTaskMapper.getPlanTaskInfo(page,map);
+        //处理userName
+        if(!CollectionUtils.isEmpty(pageList.getRecords())) {
+            Map<String, String> userMap = new HashMap<>();
+            List<String> userIds = new ArrayList<>();
+            for (Map<String, Object> record : pageList.getRecords()) {
+                String ids = record.get("userName")+"";
+                if (StrUtil.isNotBlank(ids)) {
+                    for (String id : ids.split(",")) {
+                        userIds.add(id);
+                    }
+                }
+            }
+            if(!CollectionUtils.isEmpty(userIds)){
+                List<Map<String,String>> userinfoList =planTaskMapper.getUserByUserName(userIds);
+                for (Map<String, String> userinfo : userinfoList) {
+                    userMap.put(userinfo.get("userName"),userinfo.get("realName"));
+                }
+            }
+            for (Map<String, Object> record : pageList.getRecords()) {
+                String ids = record.get("userName")+"";
+                if (StrUtil.isNotBlank(ids)) {
+                    List<String> realNameList = new ArrayList<>();
+                    for (String id : ids.split(",")) {
+                        if(StrUtil.isNotBlank(userMap.get(id))) {
+                            realNameList.add(userMap.get(id));
+                        }
+                    }
+                    if(!CollectionUtils.isEmpty(realNameList)) {
+                        record.put("userName", realNameList.stream().collect(Collectors.joining(",")));
+                    }else{
+                        record.put("userName","");
+                    }
+                }
+            }
+        }
+
         result.put("taskList",pageList);
         //查询企业类型
         String unitType = planTaskMapper.getUnitTypeByUseUnitCode(map.getString("useUnitCode"));