修改百城千团查询统计为单个用户,修改百城千团列表排序

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsBcqtTeamServiceImpl.java

@@ -283,7 +283,6 @@ public class KxsBcqtTeamServiceImpl extends ServiceImpl<KxsBcqtTeamMapper, KxsBc
         List<KxsBcqtTeam> list = list(Wrappers.<KxsBcqtTeam>query().lambda().eq(KxsBcqtTeam::getStatus, 1));
         //处理查询数据
         for (KxsBcqtTeam kxsBcqtTeam : list) {
-            ArrayList<GetActivityStatByIdAndTimeDTO> getActivityStatByIdAndTimeDTOS = new ArrayList<>();
             //构造该团队的查询日期
             LocalDateTime startTime = kxsBcqtTeam.getStartTime();//开始时间
             Integer activityDate = kxsBcqtTeam.getActivityDate();//活动时长
@@ -296,19 +295,22 @@ public class KxsBcqtTeamServiceImpl extends ServiceImpl<KxsBcqtTeamMapper, KxsBc
             }
             //查询团队所有成员
             List<KxsBcqtTeamDetail> kxsBcqtTeamDetailS = kxsBcqtTeamDetailMapper.selectList(Wrappers.<KxsBcqtTeamDetail>query().lambda()
-                    .eq(KxsBcqtTeamDetail::getTeamId,kxsBcqtTeam.getId()));
+                    .eq(KxsBcqtTeamDetail::getTeamId,kxsBcqtTeam.getId()).eq(KxsBcqtTeamDetail::getEndFlag, 0));
             //构造查询dto
+            List<GetActivityStatByIdAndTimeVO> activityStatByIdAndTimes = new ArrayList<>();
             for (KxsBcqtTeamDetail kxsBcqtTeamDetail : kxsBcqtTeamDetailS) {
+                ArrayList<GetActivityStatByIdAndTimeDTO> getActivityStatByIdAndTimeDTOS = new ArrayList<>();
                 GetActivityStatByIdAndTimeDTO getActivityStatByIdAndTimeDTO = new GetActivityStatByIdAndTimeDTO();
                 getActivityStatByIdAndTimeDTO.setUserId(kxsBcqtTeamDetail.getUserId());
                 getActivityStatByIdAndTimeDTO.setTimes(futureDates);
                 getActivityStatByIdAndTimeDTOS.add(getActivityStatByIdAndTimeDTO);
+                //查询得到统计数据
+                List<GetActivityStatByIdAndTimeVO> activityStatByIdAndTime = remoteKxsStatService.getActivityStatByIdAndTime(getActivityStatByIdAndTimeDTOS, SecurityConstants.FROM_IN);
+                activityStatByIdAndTimes.addAll(activityStatByIdAndTime);
             }
-            //查询得到统计数据
-            List<GetActivityStatByIdAndTimeVO> activityStatByIdAndTime = remoteKxsStatService.getActivityStatByIdAndTime(getActivityStatByIdAndTimeDTOS, SecurityConstants.FROM_IN);
             int reachNumber = 0;
             //修改查询到的数据的当前激活数
-            for (GetActivityStatByIdAndTimeVO getActivityStatByIdAndTimeVO : activityStatByIdAndTime) {
+            for (GetActivityStatByIdAndTimeVO getActivityStatByIdAndTimeVO : activityStatByIdAndTimes) {
                 Long userId = getActivityStatByIdAndTimeVO.getUserId();
                 Integer posActivityNumber = getActivityStatByIdAndTimeVO.getPosActivityNumber();
                 if (posActivityNumber != null){

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsBcqtTeamDetailMapper.xml

@@ -21,7 +21,7 @@
     </resultMap>
     <select id="getMyBcqtList" resultType="com.kxs.system.api.vo.kxsapp.camp.CampGetMyBcqtListVO">
         select
-        kbt.id,kbt.team_name,kbt.start_time,kbt.end_time,kbt.status,kbt.captain_id,kbt.username,kbt.team_number
+        kbt.id,kbt.team_name,kbt.start_time,kbt.end_time,kbt.status,kbt.captain_id,kbt.username,kbt.team_number,kbt.create_time
         from
             kxs_bcqt_team_detail kbtd
                 left join kxs_bcqt_team kbt on kbtd.team_id = kbt.id
@@ -30,6 +30,8 @@
             and kbt.del_flag != 1
             and kbtd.user_id = #{userId}
         </where>
+        order by
+        kbt.create_time desc
     </select>
 
 </mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsBcqtTeamMapper.xml

@@ -26,6 +26,13 @@
             <if test="keyword != null and keyword != ''">
                 and (team_name like concat('%', #{keyword}, '%') or username like concat('%', #{keyword}, '%'))
             </if>
+            ORDER BY
+            CASE
+            WHEN team_number = 10 THEN 1
+            ELSE 0
+            END,
+            create_time DESC
+
         </where>
     </select>