From 46ae91d150985e38ecec8768634cc1ee15c5151b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 07 八月 2025 19:02:06 +0800
Subject: [PATCH] 赛事模块
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html | 7 +
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml | 6 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html | 32 ++++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListAll.java | 4
cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js | 7 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupListAll.java | 5 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup.html | 14 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html | 32 ++++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html | 28 +++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java | 23 ++++
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCup.java | 19 +++
cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js | 79 ++++++++++-----
12 files changed, 229 insertions(+), 27 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
index ccc170d..5075db5 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
@@ -101,6 +101,24 @@
*/
@TableField("winIntegral")
private Integer winIntegral;
+
+ /**
+ * 类型（1=智慧赛事，2=非智慧赛事）
+ */
+ @TableField("type")
+ private Integer type;
+
+ /**
+ * 平场获得积分
+ */
+ @TableField("drawIntegral")
+ private Integer drawIntegral;
+
+ /**
+ * 失败获得积分
+ */
+ @TableField("loseIntegral")
+ private Integer loseIntegral;
/**
* 省
*/
@@ -162,6 +180,11 @@
@TableField("content")
private String content;
/**
+ * 参赛协议
+ */
+ @TableField("contentOne")
+ private String contentOne;
+ /**
* 比赛状态（1=未开始，2=已开始，3=已结束，4=已取消）
*/
@TableField("status")
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListAll.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListAll.java
index 428c787..28de7f6 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListAll.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListAll.java
@@ -25,6 +25,10 @@
*/
private Integer status;
/**
+ * 1=智慧赛事，2= 非智慧赛事，
+ */
+ private Integer type;
+ /**
* 页码
*/
private Integer offset;
diff --git a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml b/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
index 6ad4d7d..cef2aed 100644
--- a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
+++ b/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
@@ -85,7 +85,8 @@
CONCAT(startAge, '至', endAge) as age,
gender,
maxPeople,
- status
+ status,
+ type
from t_world_cup
where 1 = 1
<if test="null != item.name and '' != item.name">
@@ -100,6 +101,9 @@
<if test="null != item.status">
and status= #{item.status}
</if>
+ <if test="null != item.type">
+ and type= #{item.type}
+ </if>
order by createTime desc limit #{item.offset}, #{item.limit}
</select>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCup.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCup.java
index 26193b0..76429a7 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCup.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCup.java
@@ -88,6 +88,21 @@
* 胜利获得积分
*/
private Integer winIntegral;
+
+ /**
+ * 类型（1=智慧赛事，2=非智慧赛事）
+ */
+ private Integer type;
+
+ /**
+ * 平场获得积分
+ */
+ private Integer drawIntegral;
+
+ /**
+ * 失败获得积分
+ */
+ private Integer loseIntegral;
/**
* 省
*/
@@ -141,6 +156,10 @@
*/
private String content;
/**
+ * 参赛协议
+ */
+ private String contentOne;
+ /**
* 比赛状态（1=未开始，2=已开始，3=已结束，4=已取消）
*/
private Integer status;
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupListAll.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupListAll.java
index 358edfb..b7a4705 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupListAll.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupListAll.java
@@ -24,6 +24,11 @@
* 比赛状态（1=未开始，2=已开始，3=已结束，4=已取消）
*/
private Integer status;
+
+ /**
+ * 1=智慧赛事，2=非智慧赛事
+ */
+ private Integer type;
/**
* 页码
*/
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup.html
index 023a2d8..0998b88 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup.html
@@ -22,6 +22,20 @@
<div class="input-group">
<div class="input-group-btn open">
<button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 赛事类别:
+ </button>
+ </div>
+ <select class="form-control" id="type">
+ <option value="">全部</option>
+ <option value="1">智慧赛事</option>
+ <option value="2">非智慧赛事</option>
+ </select>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
状态
</button>
</div>
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 a0d1c0b..0c8c771 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
@@ -31,6 +31,18 @@
<input class="form-control" id="name">
</div>
</div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*赛事类别：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="type">
+ <option value="1">智慧赛事</option>
+ <option value="2">非智慧赛事</option>
+ </select>
+ </div>
+ </div>
+
+
<div class="form-group">
<label class="col-sm-3 control-label">*开始时间：</label>
<div class="col-sm-3">
@@ -119,6 +131,20 @@
<input class="form-control" id="winIntegral" type="number" min="0">
</div>
</div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">平场可获积分</label>
+ <div class="col-sm-3">
+ <input class="form-control" id="drawIntegral" type="number" min="0">
+ </div>
+ <label style="float: left;line-height: 35px;">败场可获积分</label>
+ <div class="col-sm-3">
+ <input class="form-control" id="loseIntegral" type="number" min="0">
+ </div>
+ </div>
+
+
+
<div class="form-group">
<label class="col-sm-3 control-label">*比赛地点：</label>
<div class="col-sm-7">
@@ -224,6 +250,12 @@
<textarea id="content" style="height: 800px;width: 100%;"></textarea>
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*参赛协议</label>
+ <div class="col-sm-7" style="padding: 0px;">
+ <textarea id="contentOne" style="height: 800px;width: 100%;"></textarea>
+ </div>
+ </div>
</div>
</div>
<div class="row btn-group-m-t">
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 ddbe468..8c5aa53 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
@@ -32,6 +32,19 @@
<input class="form-control" id="name" value="${item.name}">
</div>
</div>
+
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*赛事类别：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="type">
+ <option value="1" ${1 == item.type ? 'selected' : ''}>智慧赛事</option>
+ <option value="2" ${2 == item.type ? 'selected' : ''}>非智慧赛事</option>
+ </select>
+ </div>
+ </div>
+
+
<div class="form-group">
<label class="col-sm-3 control-label">*开始时间：</label>
<div class="col-sm-3">
@@ -120,7 +133,20 @@
<input class="form-control" id="winIntegral" type="number" min="0" value="${item.winIntegral}">
</div>
</div>
+
+
<div class="form-group">
+ <label class="col-sm-3 control-label">平场可获积分</label>
+ <div class="col-sm-3">
+ <input class="form-control" id="drawIntegral" type="number" min="0" value="${item.drawIntegral}">
+ </div>
+ <label style="float: left;line-height: 35px;">败场可获积分</label>
+ <div class="col-sm-3">
+ <input class="form-control" id="loseIntegral" type="number" min="0" value="${item.loseIntegral}">
+ </div>
+ </div>
+
+ <div class="form-group">
<label class="col-sm-3 control-label">*比赛地点：</label>
<div class="col-sm-7">
<input class="form-control" id="address" onchange="WorldCupInfo.searchByStationName(this,1)" value="${item.address}">
@@ -226,6 +252,12 @@
<textarea id="content" style="height: 800px;width: 100%;">${item.content}</textarea>
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*参赛协议</label>
+ <div class="col-sm-7" style="padding: 0px;">
+ <textarea id="contentOne" style="height: 800px;width: 100%;">${item.contentOne}</textarea>
+ </div>
+ </div>
</div>
</div>
<div class="row btn-group-m-t">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html
index 9305a52..a767a67 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html
@@ -29,6 +29,17 @@
<input class="form-control" id="name" value="${item.name}" disabled>
</div>
</div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*赛事类别：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="type" disabled>
+ <option value="1" ${1 == item.type ? 'selected' : ''}>智慧赛事</option>
+ <option value="2" ${2 == item.type ? 'selected' : ''}>非智慧赛事</option>
+ </select>
+ </div>
+ </div>
+
<div class="form-group">
<label class="col-sm-3 control-label">*开始时间：</label>
<div class="col-sm-3">
@@ -117,6 +128,17 @@
<input class="form-control" id="winIntegral" type="number" min="0" value="${item.winIntegral}" disabled>
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">平场可获积分</label>
+ <div class="col-sm-3">
+ <input class="form-control" id="drawIntegral" type="number" min="0" value="${item.drawIntegral}" disabled>
+ </div>
+ <label style="float: left;line-height: 35px;">败场可获积分</label>
+ <div class="col-sm-3">
+ <input class="form-control" id="loseIntegral" type="number" min="0" value="${item.loseIntegral}" disabled>
+ </div>
+ </div>
+
<div class="form-group">
<label class="col-sm-3 control-label">*比赛地点：</label>
<div class="col-sm-7">
@@ -200,6 +222,12 @@
<textarea id="content" style="height: 800px;width: 100%;">${item.content}</textarea>
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">参赛协议</label>
+ <div class="col-sm-7" style="padding: 0px;">
+ <textarea id="contentOne" style="height: 800px;width: 100%;">${item.contentOne}</textarea>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html
index aff7a6e..615878e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html
@@ -25,6 +25,9 @@
<#NameCon id="city" name="所在城市：" />
</div>
<div class="col-sm-3">
+ <#NameCon id="time" name="比赛日期：" />
+ </div>
+ <div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="WorldCupRecords.search1()"/>
<#button name="重置" icon="fa-trash" clickFun="WorldCupRecords.resetSearch1()" space="true"/>
</div>
@@ -89,5 +92,9 @@
laydate.render({
elem: '#endTime'
});
+ laydate.render({
+ elem: '#time'
+ ,range: true
+ });
</script>
@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js
index 432c659..658d6d0 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js
@@ -15,6 +15,11 @@
{field: 'selectItem', checkbox: true},
{title: 'id', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '比赛名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
+ {title: '赛事类别', field: 'type', visible: true, align: 'center', valign: 'middle',width:'20%',
+ formatter:function (data) {
+ return {1:"智慧赛事",2:"非智慧赛事"}[data]
+ }
+ },
{title: '开始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
{title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle'},
{title: '报名条件', field: 'age', visible: true, align: 'center', valign: 'middle',
@@ -154,6 +159,7 @@
queryData['startTime'] =$("#startTime").val();
queryData['endTime'] =$("#endTime").val();
queryData['status'] =$("#status").val();
+ queryData['type'] =$("#type").val();
WorldCup.table.refresh({query: queryData});
};
@@ -162,6 +168,7 @@
$("#startTime").val("");
$("#endTime").val("");
$("#status").val("");
+ $("#type").val("");
WorldCup.search();
};
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 95dcffd..e3522fe 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
@@ -45,7 +45,11 @@
let intro = $('#intro').val();
let coverImg = $('#coverImg').val();
let homeBackdropImg = $('#homeBackdropImg').val();
+ let type = $('#type').val();
+ let drawIntegral = $('#drawIntegral').val();
+ let loseIntegral = $('#loseIntegral').val();
let content = editor.getContent();
+ let contentOne = editor1.getContent();
if(null == name || '' == name){
Feng.error("请填写有效的比赛名称");
return
@@ -120,20 +124,24 @@
Feng.error("请填写有效的赛事简介");
return
}
- if(null == coverImg || '' == coverImg){
- Feng.error("请上传有效的比赛封面图");
- return
- }
- if(null == homeBackdropImg || '' == homeBackdropImg){
- Feng.error("请上传有效的首页默认背景图");
- return
- }
- if(WorldCupInfo.goodsPicArray1 == 0){
- Feng.error("请上传有效的比赛图片");
- return
- }
+ // if(null == coverImg || '' == coverImg){
+ // Feng.error("请上传有效的比赛封面图");
+ // return
+ // }
+ // if(null == homeBackdropImg || '' == homeBackdropImg){
+ // Feng.error("请上传有效的首页默认背景图");
+ // return
+ // }
+ // if(WorldCupInfo.goodsPicArray1 == 0){
+ // Feng.error("请上传有效的比赛图片");
+ // return
+ // }
if(null == content || '' == content){
Feng.error("请填写有效的比赛详情");
+ return
+ }
+ if(null == contentOne || '' == contentOne){
+ Feng.error("请填写有效的参赛协议");
return
}
let data = {
@@ -159,7 +167,11 @@
'infoImg': JSON.stringify(WorldCupInfo.goodsPicArray1),
'intro': intro,
'content': content,
- 'stores': JSON.stringify(WorldCupInfo.stores)
+ 'stores': JSON.stringify(WorldCupInfo.stores),
+ 'type': type,
+ 'drawIntegral': drawIntegral,
+ 'loseIntegral': loseIntegral,
+ 'contentOne': contentOne
}
if(null != registrationClosingTime && '' != registrationClosingTime){
data.registrationClosingTime = new Date(registrationClosingTime + " 23:59:59");
@@ -208,6 +220,10 @@
let coverImg = $('#coverImg').val();
let homeBackdropImg = $('#homeBackdropImg').val();
let content = editor.getContent();
+ let type = $('#type').val();
+ let drawIntegral = $('#drawIntegral').val();
+ let loseIntegral = $('#loseIntegral').val();
+ let contentOne = editor1.getContent();
if(null == name || '' == name){
Feng.error("请填写有效的比赛名称");
return
@@ -282,22 +298,27 @@
Feng.error("请填写有效的赛事简介");
return
}
- if(null == coverImg || '' == coverImg){
- Feng.error("请上传有效的比赛封面图");
- return
- }
- if(null == homeBackdropImg || '' == homeBackdropImg){
- Feng.error("请上传有效的首页默认背景图");
- return
- }
- if(WorldCupInfo.goodsPicArray1 == 0){
- Feng.error("请上传有效的比赛图片");
- return
- }
+ // if(null == coverImg || '' == coverImg){
+ // Feng.error("请上传有效的比赛封面图1");
+ // return
+ // }
+ // if(null == homeBackdropImg || '' == homeBackdropImg){
+ // Feng.error("请上传有效的首页默认背景图");
+ // return
+ // }
+ // if(WorldCupInfo.goodsPicArray1 == 0){
+ // Feng.error("请上传有效的比赛图片");
+ // return
+ // }
if(null == content || '' == content){
Feng.error("请填写有效的比赛详情");
return
}
+ if(null == contentOne || '' == contentOne){
+ Feng.error("请填写有效的参赛协议");
+ return
+ }
+
let data = {
'id': $('#id').val(),
'name': name,
@@ -322,7 +343,11 @@
'infoImg': JSON.stringify(WorldCupInfo.goodsPicArray1),
'intro': intro,
'content': content,
- 'stores': JSON.stringify(WorldCupInfo.stores)
+ 'stores': JSON.stringify(WorldCupInfo.stores),
+ 'type': type,
+ 'drawIntegral': drawIntegral,
+ 'loseIntegral': loseIntegral,
+ 'contentOne': contentOne
}
if(null != registrationClosingTime && '' != registrationClosingTime){
data.registrationClosingTime = new Date(registrationClosingTime + " 23:59:59");
@@ -569,7 +594,9 @@
var editor = null;
+var editor1 = null;
$(function () {
//初始化编辑器
editor = UE.getEditor('content');
+ editor1 = UE.getEditor('contentOne');
});
\ No newline at end of file
--
Gitblit v1.7.1