wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

赛会赛程

Browse Source
This commit is contained in:
wuyibo
2022-11-12 11:27:33 +08:00
parent 0d5e13affe
commit a8fdd22503
9 changed files with 150 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.system.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -43,7 +45,7 @@ public class CompetitionTeamVsTeamController extends BaseController
public TableDataInfo list(CompetitionTeamVsTeam competitionTeamVsTeam)
{
startPage();
List<CompetitionTeamVsTeam> list = competitionTeamVsTeamService.selectCompetitionTeamVsTeamList(competitionTeamVsTeam);
List<CompetitionTeamVsTeamVo> list = competitionTeamVsTeamService.selectCompetitionTeamVsTeamList(competitionTeamVsTeam);
return getDataTable(list);
}
@@ -55,8 +57,8 @@ public class CompetitionTeamVsTeamController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, CompetitionTeamVsTeam competitionTeamVsTeam)
{
List<CompetitionTeamVsTeam> list = competitionTeamVsTeamService.selectCompetitionTeamVsTeamList(competitionTeamVsTeam);
ExcelUtil<CompetitionTeamVsTeam> util = new ExcelUtil<CompetitionTeamVsTeam>(CompetitionTeamVsTeam.class);
List<CompetitionTeamVsTeamVo> list = competitionTeamVsTeamService.selectCompetitionTeamVsTeamList(competitionTeamVsTeam);
ExcelUtil<CompetitionTeamVsTeamVo> util = new ExcelUtil<CompetitionTeamVsTeamVo>(CompetitionTeamVsTeamVo.class);
util.exportExcel(response, list, "赛会中-球队VS球队关系数据");
}

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java
View File

@@ -41,8 +41,8 @@ public class CompetitionTeamVsTeam extends BaseEntity
private String guestTeamName;
/** 比赛时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "比赛时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "比赛时间", width = 60, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date competitionTime;
/** 球场ID */

20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamVsTeamVo.java Normal file
View File

@@ -0,0 +1,20 @@
package com.ruoyi.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.system.domain.CompetitionTeamVsTeam;
import lombok.Data;
import java.util.Date;
/**
* @author 吴一博
* @date 2022年11月11日 17:02
* @Description
*/
@Data
public class CompetitionTeamVsTeamVo extends CompetitionTeamVsTeam {
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "比赛时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date competitionDate;
}

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionTeamVsTeamMapper.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.CompetitionTeamVsTeam;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
/**
* 赛会中-球队VS球队关系Mapper接口
@@ -17,7 +18,7 @@ public interface CompetitionTeamVsTeamMapper
* @param id 赛会中-球队VS球队关系主键
* @return 赛会中-球队VS球队关系
*/
public CompetitionTeamVsTeam selectCompetitionTeamVsTeamById(Long id);
public CompetitionTeamVsTeamVo selectCompetitionTeamVsTeamById(Long id);
/**
* 查询赛会中-球队VS球队关系列表
@@ -25,7 +26,7 @@ public interface CompetitionTeamVsTeamMapper
* @param competitionTeamVsTeam 赛会中-球队VS球队关系
* @return 赛会中-球队VS球队关系集合
*/
public List<CompetitionTeamVsTeam> selectCompetitionTeamVsTeamList(CompetitionTeamVsTeam competitionTeamVsTeam);
public List<CompetitionTeamVsTeamVo> selectCompetitionTeamVsTeamList(CompetitionTeamVsTeam competitionTeamVsTeam);
/**
* 新增赛会中-球队VS球队关系

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.CompetitionTeamVsTeam;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
/**
* 赛会中-球队VS球队关系Service接口
@@ -17,7 +18,7 @@ public interface ICompetitionTeamVsTeamService
* @param id 赛会中-球队VS球队关系主键
* @return 赛会中-球队VS球队关系
*/
public CompetitionTeamVsTeam selectCompetitionTeamVsTeamById(Long id);
public CompetitionTeamVsTeamVo selectCompetitionTeamVsTeamById(Long id);
/**
* 查询赛会中-球队VS球队关系列表
@@ -25,7 +26,7 @@ public interface ICompetitionTeamVsTeamService
* @param competitionTeamVsTeam 赛会中-球队VS球队关系
* @return 赛会中-球队VS球队关系集合
*/
public List<CompetitionTeamVsTeam> selectCompetitionTeamVsTeamList(CompetitionTeamVsTeam competitionTeamVsTeam);
public List<CompetitionTeamVsTeamVo> selectCompetitionTeamVsTeamList(CompetitionTeamVsTeam competitionTeamVsTeam);
/**
* 新增赛会中-球队VS球队关系

6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl;
import java.util.List;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper;
@@ -26,7 +28,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
* @return 赛会中-球队VS球队关系
*/
@Override
public CompetitionTeamVsTeam selectCompetitionTeamVsTeamById(Long id)
public CompetitionTeamVsTeamVo selectCompetitionTeamVsTeamById(Long id)
{
return competitionTeamVsTeamMapper.selectCompetitionTeamVsTeamById(id);
}
@@ -38,7 +40,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
* @return 赛会中-球队VS球队关系
*/
@Override
public List<CompetitionTeamVsTeam> selectCompetitionTeamVsTeamList(CompetitionTeamVsTeam competitionTeamVsTeam)
public List<CompetitionTeamVsTeamVo> selectCompetitionTeamVsTeamList(CompetitionTeamVsTeam competitionTeamVsTeam)
{
return competitionTeamVsTeamMapper.selectCompetitionTeamVsTeamList(competitionTeamVsTeam);
}

15
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml
View File

@@ -30,12 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectCompetitionTeamVsTeamVo">
select id, competition_id, main_team_id, main_team_name, guest_team_id, guest_team_name, competition_time, building_id, building_name, competition_address, competition_group, status, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, main_team_score, guest_team_score, vs_type, batch_number from competition_team_vs_team
select id, competition_id, main_team_id, main_team_name, guest_team_id, guest_team_name, competition_time, DATE_FORMAT(competition_time,'%Y-%m-%d') as competitionDate, building_id, building_name, competition_address, competition_group, status, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, main_team_score, guest_team_score, vs_type, batch_number from competition_team_vs_team
</sql>
<select id="selectCompetitionTeamVsTeamList" parameterType="CompetitionTeamVsTeam" resultMap="CompetitionTeamVsTeamResult">
<select id="selectCompetitionTeamVsTeamList"
resultType="com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo">
<include refid="selectCompetitionTeamVsTeamVo"/>
<where>
<where>
<if test="competitionId != null "> and competition_id = #{competitionId}</if>
<if test="mainTeamId != null "> and main_team_id = #{mainTeamId}</if>
<if test="mainTeamName != null and mainTeamName != ''"> and main_team_name like concat('%', #{mainTeamName}, '%')</if>
@@ -58,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
</where>
</select>
<select id="selectCompetitionTeamVsTeamById" parameterType="Long" resultMap="CompetitionTeamVsTeamResult">
<select id="selectCompetitionTeamVsTeamById"
resultType="com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo">
<include refid="selectCompetitionTeamVsTeamVo"/>
where id = #{id}
</select>
<insert id="insertCompetitionTeamVsTeam" parameterType="CompetitionTeamVsTeam" useGeneratedKeys="true" keyProperty="id">
insert into competition_team_vs_team
<trim prefix="(" suffix=")" suffixOverrides=",">