feat：积分包管理显示手机号

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleOutput.java

@@ -56,6 +56,8 @@ public class WmScorePackageSettleOutput {
 
 	private String userNames;
 
+	private String userPhones;
+
 	private String subType;
 
 	private SubjectLocation subjectLocation;

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

@@ -1499,18 +1499,20 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	/**
 	 * 积分包结算列表（分页）
 	 *
-	 * @param page
-	 * @param input
-	 * @return
+	 * @param page  分页信息
+	 * @param input 分页条件
+	 * @return 分页结果
 	 */
 	@Override
 	public Page<WmScorePackageSettleOutput> listPackageSettleList(Page<WmScorePackageSettleOutput> page, WmScorePackageSettleInput input) {
-		Page<WmScorePackageSettleOutput> settleListPage = null;
+		Page<WmScorePackageSettleOutput> settleListPage;
+
 		if (StrUtil.isNotBlank(input.getUserNames())) {
 			settleListPage = wmScorePackageMapper.listPackageSettleList2(page, input);
 		} else {
 			settleListPage = wmScorePackageMapper.listPackageSettleList(page, input);
 		}
+		
 		List<WmScorePackageSettleOutput> settleList = settleListPage.getRecords();
 		for (WmScorePackageSettleOutput ouPut : settleList) {
 			WmScorePackageStatus statusQuery = new WmScorePackageStatus();
@@ -1521,6 +1523,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					.map(WmScorePackageStatus::getUserId)
 					.collect(Collectors.joining(","));
 			ouPut.setUserNames(userNames);
+
+			Set<String> userIds = statusList.stream().map(WmScorePackageStatus::getUserId).collect(Collectors.toSet());
+			if (CollUtil.isNotEmpty(userIds)){
+				List<SysUser> users = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds));
+				String userPhones = users.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
+				ouPut.setUserPhones(userPhones);
+			}
 			// 查询结算成功时间
 			List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
 					.eq(WmScorePackageSettleNote::getPackageId, ouPut.getId()));
@@ -1839,7 +1848,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 						.collect(Collectors.toList());
 
 				List<String> userNameList = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
-						.in(SysUser::getUserId, userIdList))
+								.in(SysUser::getUserId, userIdList))
 						.stream()
 						.map(SysUser::getRealname)
 						.collect(Collectors.toList());
@@ -2045,7 +2054,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			}
 		} else {
 			int score = scorePackage.getUserNum() * (scorePackage.getTaskNum() == null ? 0 : scorePackage.getTaskNum());
-			if (score != 0){
+			if (score != 0) {
 				yshtt = yshnum * 100 / score;
 				shtgtt = shtgnum * 100 / score;
 				shbtgtt = shbtgnum * 100 / score;
@@ -2074,7 +2083,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					.collect(Collectors.toList());
 
 			List<String> userNameList = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
-					.in(SysUser::getUserId, userIdList))
+							.in(SysUser::getUserId, userIdList))
 					.stream()
 					.map(SysUser::getRealname)
 					.collect(Collectors.toList());
@@ -2432,7 +2441,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	/**
 	 * 查询excel报告导出状态
 	 *
-	 * @param wmScorePackage 列表
+	 * @param wmScorePackage      列表
 	 * @param excelReportCacheKey 缓存key
 	 */
 	@Override