From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupUserListVo.java | 4 +++-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/UserDetailsOfSearch.java | 2 +-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 20 +++++++++++---------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java | 2 +-
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js | 5 +++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java | 2 +-
cloud-server-management/src/main/java/com/dsh/course/model/vo/WorldCupUserListVo.java | 2 +-
cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java | 2 +-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java | 3 ++-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java | 2 +-
10 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
index 44e8560..1cdca40 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -1243,17 +1243,17 @@
.eq(WorldCupPaymentParticipant::getAlreadyEntered, 0));
ArrayList<WorldCupUserListVo> worldCupUserListVos = new ArrayList<>();
if(list.size()>0){
- List<Integer> collect = list.stream().map(WorldCupPaymentParticipant::getAppUserId).collect(Collectors.toList());
+ List<Long> collect = list.stream().map(WorldCupPaymentParticipant::getParticipantId).collect(Collectors.toList());
search.setUseIds(collect);
- List<AppUser> appUsers = appUserClient.queryAppUserByIds(search);
+ List<TStudent> appUsers = appUserClient.queryAppUserByIds(search);
- for (AppUser appUser : appUsers) {
+ for (TStudent appUser : appUsers) {
WorldCupUserListVo worldCupUserListVo = new WorldCupUserListVo();
- WorldCupPaymentParticipant worldCupPaymentParticipant = list.stream().filter(e -> e.getAppUserId().equals(appUser.getId())).findFirst().orElse(null);
+ WorldCupPaymentParticipant worldCupPaymentParticipant = list.stream().filter(e -> e.getParticipantId().toString().equals(appUser.getId().toString())).findFirst().orElse(null);
if(worldCupPaymentParticipant!=null){
- worldCupUserListVo.setId(worldCupPaymentParticipant.getId());
+ worldCupUserListVo.setId(worldCupPaymentParticipant.getId().toString());
worldCupUserListVo.setName(appUser.getName());
- worldCupUserListVo.setSex(appUser.getGender() !=null && appUser.getGender()==2?"女":"男");
+ worldCupUserListVo.setSex(appUser.getSex() !=null && appUser.getSex()==2?"女":"男");
worldCupUserListVo.setPhone(appUser.getPhone());
worldCupUserListVo.setIdCard(appUser.getIdCard());
// 当前日期和生日计算年龄
@@ -1297,7 +1297,7 @@
String code = UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3);
ArrayList<WorldCupCompetitor> worldCupCompetitors = new ArrayList<>(red.length + blue.length);
for (String s : blue) {
- WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().equals(s)).findFirst().orElse(null);
+ WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().toString().equals(s)).findFirst().orElse(null);
if(worldCupPaymentParticipant!=null){
WorldCupCompetitor worldCupCompetitor =new WorldCupCompetitor();
worldCupCompetitor.setCode(code);
@@ -1308,6 +1308,7 @@
worldCupCompetitor.setParticipant(1);
worldCupCompetitor.setStartTime(startTime);
worldCupCompetitor.setEndTime(endTime);
+ worldCupCompetitor.setOurScore(blueScore);
if(blueScore>redScore){
worldCupCompetitor.setMatchResult(1);
worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
@@ -1353,7 +1354,7 @@
}
for (String s : red) {
- WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().equals(s)).findFirst().orElse(null);
+ WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().toString().equals(s)).findFirst().orElse(null);
if(worldCupPaymentParticipant!=null){
WorldCupCompetitor worldCupCompetitor =new WorldCupCompetitor();
worldCupCompetitor.setCode(code);
@@ -1361,9 +1362,10 @@
worldCupCompetitor.setParticipantType(worldCupPaymentParticipant.getParticipantType());
worldCupCompetitor.setAppUserId(worldCupPaymentParticipant.getAppUserId());
worldCupCompetitor.setParticipantId(worldCupPaymentParticipant.getParticipantId());
- worldCupCompetitor.setParticipant(1);
+ worldCupCompetitor.setParticipant(2);
worldCupCompetitor.setStartTime(startTime);
worldCupCompetitor.setEndTime(endTime);
+ worldCupCompetitor.setOurScore(redScore);
if(redScore>blueScore){
worldCupCompetitor.setMatchResult(1);
worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java
index 8500aa9..3962449 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java
@@ -2,6 +2,7 @@
import com.dsh.communityWorldCup.feignclient.account.model.AppUser;
import com.dsh.communityWorldCup.feignclient.account.model.AppUserIdsByCityName;
+import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
import com.dsh.communityWorldCup.model.UserDetailsOfSearch;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -60,5 +61,5 @@
@PostMapping("/appUser/queryAppUserByIds")
- List<AppUser> queryAppUserByIds(UserDetailsOfSearch search);
+ List<TStudent> queryAppUserByIds(UserDetailsOfSearch search);
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/UserDetailsOfSearch.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/UserDetailsOfSearch.java
index 678cd05..352bdef 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/UserDetailsOfSearch.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/UserDetailsOfSearch.java
@@ -15,5 +15,5 @@
private String idCard;
- private List<Integer> useIds;
+ private List<Long> useIds;
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java
index 2c13147..d58b844 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java
@@ -11,8 +11,8 @@
@Data
@ApiModel
public class WorldCupListVo {
- @ApiModelProperty("世界杯id")
private String id;
+ @ApiModelProperty("世界杯id")
private Integer worldCupId;
@ApiModelProperty("名称")
private String name;
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupUserListVo.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupUserListVo.java
index b62da60..7c29eb2 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupUserListVo.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupUserListVo.java
@@ -1,12 +1,14 @@
package com.dsh.communityWorldCup.model;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class WorldCupUserListVo {
@ApiModelProperty("报名id")
- private Long id;
+ private String id;
@ApiModelProperty("姓名")
private String name;
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java
index 33f2634..746f3c4 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java
@@ -10,7 +10,7 @@
@Configuration
@PropertySource("classpath:redis.properties")
public class RedisConfig {
- @Value("192.168.110.106")
+ @Value("${spring.redis.host}")
private String host;
@Value("${spring.redis.port}")
diff --git a/cloud-server-management/src/main/java/com/dsh/course/model/vo/WorldCupUserListVo.java b/cloud-server-management/src/main/java/com/dsh/course/model/vo/WorldCupUserListVo.java
index bf5192f..ca4a6c6 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/model/vo/WorldCupUserListVo.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/model/vo/WorldCupUserListVo.java
@@ -6,7 +6,7 @@
@Data
public class WorldCupUserListVo {
@ApiModelProperty("报名id")
- private Long id;
+ private String id;
@ApiModelProperty("姓名")
private String name;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
index 8a5a69f..fde9380 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
@@ -324,7 +324,7 @@
values[i][1] = d.get("gender").toString();
values[i][2] = d.get("age").toString();
values[i][3] = d.get("phone").toString();
- values[i][4] = d.get("idcard").toString();
+ values[i][4] = d.get("idcard")==null ? "" : d.get("idcard").toString();
Integer state1 = Integer.valueOf(d.get("state").toString());
if(1 == state1){
values[i][5] = "正常";
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
index 1c7f9ac..698de32 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
@@ -256,7 +256,7 @@
@PostMapping("/userDetailsOfSearch")
public Object storeDetailsOfSearch(Integer id,String name,String phone,String idCard){
UserDetailsOfSearch userDetailsOfSearch = new UserDetailsOfSearch();
- userDetailsOfSearch.setId( id);
+ userDetailsOfSearch.setId(id);
userDetailsOfSearch.setName(name);
userDetailsOfSearch.setPhone(phone);
userDetailsOfSearch.setIdCard(idCard);
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js
index 75fa90b..73c55b0 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js
@@ -268,8 +268,9 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/worldCupRecords/savaData1", function(data){
Feng.success("保存成功!");
- window.parent.TVerified.table.refresh();
- TVerifiedInfoDlg.close();
+ WorldCupGameStatisticsListInfo.close1()
+ parent.WorldCupRecords.resetSearch2();
+
},function(data){
Feng.error("保存失败!" + data.responseJSON.message + "!");
});
--
Gitblit v1.7.1