From e1c4c857b03e28e224ce6dbb94d957b4d6fddcc3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 16:53:38 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupGameStatisticsListInfo.html | 3 ++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html | 2 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java | 11 ++++++++++-
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js | 6 ++++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java | 5 +++--
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupGameStatisticsListInfo.java | 6 +++++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html | 2 +-
cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js | 8 ++++++--
8 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupGameStatisticsListInfo.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupGameStatisticsListInfo.java
index 0098703..7cf30e3 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupGameStatisticsListInfo.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupGameStatisticsListInfo.java
@@ -11,7 +11,11 @@
/**
* 参赛数据id
*/
- private Long id;
+ private Long participantId;
+ /**
+ * 参赛人员类型
+ */
+ private Integer participantType;
/**
* 姓名
*/
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 150060b..4249541 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
@@ -161,7 +161,11 @@
@ResponseBody
@PostMapping("/addWorldCup")
public ResultUtil addWorldCup(WorldCup worldCup, String stores){
- worldCup.setStatus(1);
+ if(worldCup.getStartTime().before(new Date())){
+ worldCup.setStatus(2);
+ }else{
+ worldCup.setStatus(1);
+ }
worldCup.setCreateTime(new Date());
worldCup.setMatchNumber(0);
Integer integer = worldCupClient.addWorldCup(worldCup);
@@ -195,6 +199,11 @@
if(worldCup1.getStartTime().before(DateUtil.getDate())){
return ResultUtil.error("赛事已开始，不能编辑");
}
+ if(worldCup.getStartTime().before(new Date())){
+ worldCup.setStatus(2);
+ }else{
+ worldCup.setStatus(1);
+ }
worldCupClient.editWorldCup(worldCup);
worldCupStoreClient.delWorldCupStore(worldCup.getId());
JSONArray jsonArray = JSON.parseArray(stores);
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 a144fe6..a0d0121 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
@@ -49,8 +49,9 @@
@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";
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html
index be55692..77042f5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html
@@ -16,7 +16,7 @@
text-indent: 10px;
}
.el-upload__input{
- display: none;
+ display: none !important;
}
</style>
<div class="ibox float-e-margins">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html
index c11509e..8e90c3d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html
@@ -16,7 +16,7 @@
text-indent: 10px;
}
.el-upload__input{
- display: none;
+ display: none !important;
}
</style>
<div class="ibox float-e-margins">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupGameStatisticsListInfo.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupGameStatisticsListInfo.html
index cd5d2374..4102ebb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupGameStatisticsListInfo.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupGameStatisticsListInfo.html
@@ -8,7 +8,8 @@
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
- <input type="hidden" id="id" value="${id}">
+ <input type="hidden" id="participantId" value="${participantId}">
+ <input type="hidden" id="participantType" value="${participantType}">
<div class="row">
<div class="col-sm-3">
<#NameCon id="name" name="用户姓名：" />
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
index c12f83f..1e934ec 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
@@ -140,7 +140,6 @@
'name': name,
'startTime': new Date(startTime + " 00:00:00"),
'endTime': new Date(endTime + " 23:59:59"),
- 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -161,6 +160,9 @@
'intro': intro,
'content': content,
'stores': JSON.stringify(WorldCupInfo.stores)
+ }
+ if(null != registrationClosingTime && '' != registrationClosingTime){
+ data.registrationClosingTime = registrationClosingTime;
}
//提交信息
@@ -301,7 +303,6 @@
'name': name,
'startTime': new Date(startTime + " 00:00:00"),
'endTime': new Date(endTime + " 23:59:59"),
- 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -323,6 +324,9 @@
'content': content,
'stores': JSON.stringify(WorldCupInfo.stores)
}
+ if(null != registrationClosingTime && '' != registrationClosingTime){
+ data.registrationClosingTime = registrationClosingTime;
+ }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/worldCup/editWorldCup", function (res) {
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 eec2c24..812cae9 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
@@ -111,7 +111,8 @@
WorldCupGameStatisticsListInfo.search = function () {
var queryData = {};
- queryData['id'] = $("#id").val();
+ queryData['participantId'] = $("#participantId").val();
+ queryData['participantType'] = $("#participantType").val();
queryData['name'] = $("#name").val();
WorldCupGameStatisticsListInfo.table.refresh({query: queryData});
};
@@ -126,7 +127,8 @@
var table = new BSTable(WorldCupGameStatisticsListInfo.id, "/worldCupRecords/worldCupGameStatisticsListInfo", defaultColunms);
table.setPaginationType("server");
table.setQueryParams({
- 'id': $('#id').val()
+ 'participantId': $('#participantId').val(),
+ 'participantType': $('#participantType').val()
})
WorldCupGameStatisticsListInfo.table = table.init();
--
Gitblit v1.7.1