From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
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 cc7c86c..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
@@ -2,15 +2,13 @@
import com.dsh.course.feignClient.communityWorldCup.Model.*;
import com.dsh.course.feignClient.communityWorldCup.WorldCupClient;
+import com.dsh.course.model.dto.UserDetailsOfSearch;
import com.dsh.guns.modular.system.util.ExcelUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -47,10 +45,30 @@
return PREFIX + "worldCupGameStatisticsInfo.html";
}
+ @RequestMapping("/addWorldCupGameStatisticsInfo")
+ public String addWorldCupGameStatisticsInfo(Model model, Integer id){
+ WorldCup worldCupById = worldCupClient.getWorldCupById(id);
+ model.addAttribute("item", worldCupById);
+ return PREFIX + "addWorldCupGameStatisticsListInfo.html";
+ }
+ @RequestMapping("/userList")
+ public String userList(Integer id,Model model){
+ WorldCup worldCupById = worldCupClient.getWorldCupById(id);
+ model.addAttribute("item", worldCupById);
+ return PREFIX + "TUserList.html";
+ }
+ @RequestMapping("/userList1")
+ public String userList1(Integer id,Model model){
+ WorldCup worldCupById = worldCupClient.getWorldCupById(id);
+ model.addAttribute("item", worldCupById);
+ return PREFIX + "TUserList1.html";
+ }
+
@RequestMapping("/openWorldCupGameStatisticsListInfo")
- public String openWorldCupGameStatisticsListInfo(Model model, Integer id){
- model.addAttribute("id", id);
+ public String openWorldCupGameStatisticsListInfo(Model model, Long participantId, Integer participantType){
+ model.addAttribute("participantId", participantId);
+ model.addAttribute("participantType", participantType);
return PREFIX + "worldCupGameStatisticsListInfo.html";
}
@@ -135,7 +153,7 @@
public void exportUserStatistics(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList, HttpServletResponse response){
worldCupGameStatisticsInfoList.setOffset(0);
worldCupGameStatisticsInfoList.setLimit(100000);
- Map<String, Object> map = worldCupClient.worldCupGameStatisticsInfoList(worldCupGameStatisticsInfoList);
+ Map<String, Object> map = worldCupClient.getUserGameRecordList(worldCupGameStatisticsInfoList);
List<Map<String, Object>> list = (List<Map<String, Object>>)map.get("rows");
try {
@@ -150,7 +168,7 @@
values[i] = new String[title.length];
values[i][0] = d.get("name").toString();
values[i][1] = d.get("phone").toString();
- values[i][2] = d.get("idcard").toString();
+ values[i][2] = null == d.get("idcard") ? "" : d.get("idcard").toString();
values[i][3] = d.get("totalSession").toString();
values[i][4] = d.get("win").toString() + "-" + d.get("lose").toString();
values[i][5] = d.get("winRate").toString() + "%";
@@ -232,4 +250,26 @@
e.printStackTrace();
}
}
+
+
+ @ResponseBody
+ @PostMapping("/userDetailsOfSearch")
+ public Object storeDetailsOfSearch(Integer id,String name,String phone,String idCard){
+ UserDetailsOfSearch userDetailsOfSearch = new UserDetailsOfSearch();
+ userDetailsOfSearch.setId(id);
+ userDetailsOfSearch.setName(name);
+ userDetailsOfSearch.setPhone(phone);
+ userDetailsOfSearch.setIdCard(idCard);
+ // 获取报了名的用户 未产生赛事
+ return worldCupClient.userDetailsOfSearch(userDetailsOfSearch);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/savaData1")
+ public Object savaData1(SaveData saveData){
+ // 修改WorldCupPaymentParticipant 参赛状态 savet_world_cup_competitor
+ worldCupClient.savaData1(saveData);
+ return ResultUtil.success();
+ }
}
--
Gitblit v1.7.1