puzhibing
2024-03-06 5c37e4dbd8cace0612621688236fe00a5ee66486
修改bug
6个文件已修改
35 ■■■■ 已修改文件
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java
@@ -32,4 +32,8 @@
     * @return
     */
    List<WorldCupListVo> getMyWorldCupList(@Param("item") MyWorldCupList myWorldCupList);
    int getCount(@Param("worldCupId") Integer worldCupId, @Param("worldCupPaymentId")List<Long> worldCupPaymentId);
}
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant;
import com.dsh.communityWorldCup.model.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -55,4 +56,7 @@
     * @return
     */
    Map<String, Object> getRegisteredPersonnel(RegisteredPersonnel registeredPersonnel);
    int getCount(Integer worldCupId, List<Long> worldCupPaymentId);
}
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -330,4 +330,9 @@
        map.put("total", list2.size());
        return map;
    }
    @Override
    public int getCount(Integer worldCupId, List<Long> worldCupPaymentId) {
        return this.baseMapper.getCount(worldCupId, worldCupPaymentId);
    }
}
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -771,12 +771,11 @@
            if(collect.size() == 0){
                stringObjectMap.put("applicants", 0);
            }else{
                int count1 = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>()
                        .eq("worldCupId", id).in("worldCupPaymentId", collect)
                        .groupBy("worldCupPaymentId, participantType"));
                int count1 = worldCupPaymentParticipantService.getCount(id, collect);
                stringObjectMap.put("applicants", count1);
            }
        }
        map.put("rows", mapList);
        int count = this.baseMapper.worldCupGameStatisticsCount(worldCupGameStatistics);
        map.put("total", count);
        return map;
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
@@ -130,7 +130,7 @@
        a.id,
        a.`name`,
        DATE_FORMAT(a.startTime, '%Y.%m.%d %H:%i') as startTime,
        DATE_FORMAT(a.endTime, '%Y.%m.%d %H:%i') as endTime,
        DATE_FORMAT(a.endTime, '%Y.%m.%d %H:%i') as endTime
        from t_world_cup a
        where 1 = 1
        <if test="null != item.name and '' != item.name">
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml
@@ -35,4 +35,19 @@
        </if>
        order by b.createTime desc limit #{item.pageNo}, #{item.pageSize}
    </select>
    <select id="getCount" resultType="int">
        select count(*) from (
          select
          worldCupPaymentId,
          participantType
          from t_world_cup_payment_participant1 where worldCupId = #{worldCupId} and worldCupPaymentId in
          <foreach collection="worldCupPaymentId" item="item" index="index" open="(" separator="," close=")">
              #{item}
          </foreach>
          group by worldCupPaymentId, participantType
        ) as aa
    </select>
</mapper>