From 5c37e4dbd8cace0612621688236fe00a5ee66486 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 06 三月 2024 20:19:36 +0800
Subject: [PATCH] 修改bug
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 5 ++---
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml | 2 +-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java | 4 ++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 5 +++++
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml | 15 +++++++++++++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java | 4 ++++
6 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java
index ec5aed5..11c7eb5 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java
+++ b/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);
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java
index 8ca453c..1667380 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java
+++ b/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);
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
index d27b96b..506e666 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
+++ b/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);
+ }
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index bf871a3..c68b323 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/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;
diff --git a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml b/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
index a295f55..4655e1b 100644
--- a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
+++ b/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">
diff --git a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml b/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml
index 0d15c3b..36858e6 100644
--- a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml
+++ b/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>
\ No newline at end of file
--
Gitblit v1.7.1