diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java index 2164f9b1..9542fc5a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java @@ -65,11 +65,11 @@ public class CompetitionOfTeam extends BaseEntity private Long isDeleted; /** 联系人 */ - @Excel(name = "联系人") + @Excel(name = "领队人") private String contacts; /** 联系人电话 */ - @Excel(name = "联系人电话") + @Excel(name = "领队人电话") private String contactsTel; /** 联系人电话区号 */ @@ -79,5 +79,9 @@ public class CompetitionOfTeam extends BaseEntity /** 组内的序号 */ @Excel(name = "组内的序号") private Integer serialNumber; + @Excel(name = "球队logo") + private String teamLogo; + @Excel(name = "球队队长") + private String captain; } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml index 41ed6edd..336c8941 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml @@ -21,10 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, competition_id, team_id, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number from competition_of_team + select id, competition_id, team_id, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number,team_logo,captain from competition_of_team @@ -159,6 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND t.contacts_area_code like CONCAT('%',#{contactsAreaCode},'%') + + and t.captain like concat('%',#{captain}, '%') + order by t.created_time desc @@ -180,6 +192,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" contacts_tel, contacts_area_code, serial_number, + team_logo, + captain, #{competitionId}, @@ -197,6 +211,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{contactsTel}, #{contactsAreaCode}, #{serialNumber}, + #{teamLogo}, + #{captain}, @@ -218,6 +234,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" contacts_tel = #{contactsTel}, contacts_area_code = #{contactsAreaCode}, serial_number = #{serialNumber}, + team_logo = #{teamLogo}, + captain = #{captain}, where id = #{id}