赛事

src/main/java/com/izouma/awesomeadmin/dao/CompetitionMapper.java

@@ -33,6 +33,6 @@ public interface CompetitionMapper {
     List<Competition> query(Competition record);
     /*generatedEnd*/
 
-    int queryUserRank(@Param("competitionId") int competitionId, @Param("userId") int userId);
+    List<Competition> queryUserCompetitions(@Param("record") Competition record, @Param("userId") Integer userId);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/CompetitionMapper.xml

@@ -20,7 +20,8 @@
 
     <sql id="Base_Column_List">
         <!--generatedStart-->
-        id, del_flag, update_time, update_user, create_time, create_user, competition_name, start_time, end_time, type, bonus, status        <!--generatedEnd-->
+        id, del_flag, update_time, update_user, create_time, create_user, competition_name, start_time, end_time, type,
+        bonus, status        <!--generatedEnd-->
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -36,7 +37,8 @@
         WHERE id = #{id,jdbcType=INTEGER}
     </delete>
 
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.Competition" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.Competition" useGeneratedKeys="true"
+            keyProperty="id">
         INSERT INTO competition
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <!--generatedStart-->
@@ -171,8 +173,11 @@
         </if>
     </update>
 
-    <select id="queryCompetitionByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Competition">
-        SELECT <include refid="Base_Column_List"/> FROM competition
+    <select id="queryCompetitionByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.Competition">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM competition
         <where>
             AND del_flag = 'N'
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
@@ -268,8 +273,11 @@
         id DESC
     </select>
 
-    <select id="queryAllCompetition" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Competition">
-        SELECT <include refid="Base_Column_List"/> FROM competition
+    <select id="queryAllCompetition" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.Competition">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM competition
         <where>
             AND del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
@@ -365,7 +373,9 @@
     </select>
 
     <select id="queryCompetition" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.Competition">
-        SELECT <include refid="Base_Column_List"/> FROM competition
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM competition
         <where>
             AND del_flag = 'N'
             <!--generatedStart-->
@@ -433,9 +443,28 @@
         ORDER BY id DESC
     </select>
 
-    <select id="queryUserRank" resultType="integer">
-
+    <select id="queryUserCompetitions" parameterType="java.util.Map"
+            resultMap="queryUserCompetitionsResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>, #{userId} AS userId
+        FROM competition
+        <where>
+            AND del_flag = 'N'
+            <if test="record.status != null and !&quot;&quot;.equals(record.status)">
+                AND `status` IN (${record.status})
+            </if>
+            <if test="record.competitionName != null and !&quot;&quot;.equals(record.competitionName)">
+                AND competitionName LIKE concat('%',#{record.competitionName},'%')
+            </if>
+        </where>
+        ORDER BY id DESC
     </select>
 
+    <resultMap id="queryUserCompetitionsResultMap" type="Competition" extends="BaseResultMap">
+        <association property="participatingInfo"
+                     javaType="ParticipatingInfo"
+                     select="com.izouma.awesomeadmin.dao.ParticipatingInfoMapper.queryParticipatingInfo"
+                     column="{competitionId = id, userId = userId}"/>
+    </resultMap>
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/ParticipatingInfoMapper.java

@@ -1,16 +1,17 @@
 package com.izouma.awesomeadmin.dao;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.datasource.DataSource;
 import org.springframework.stereotype.Repository;
 import com.izouma.awesomeadmin.model.ParticipatingInfo;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.ParticipatingInfoMapper")
-public interface ParticipatingInfoMapper{
+public interface ParticipatingInfoMapper {
     /*generatedStart*/
     int deleteByPrimaryKey(Integer id);
 
@@ -31,5 +32,6 @@ public interface ParticipatingInfoMapper{
     List<ParticipatingInfo> query(ParticipatingInfo record);
     /*generatedEnd*/
 
+    int updateRank(Integer competitionId);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/ParticipatingInfoMapper.xml

@@ -14,12 +14,14 @@
         <result column="points" property="points" jdbcType="INTEGER"/>
         <result column="bonus" property="bonus" jdbcType="INTEGER"/>
         <result column="received" property="received" jdbcType="INTEGER"/>
+        <result column="rank" property="rank" jdbcType="INTEGER"/>
         <!--generatedEnd-->
     </resultMap>
 
     <sql id="Base_Column_List">
         <!--generatedStart-->
-        id, del_flag, update_time, update_user, create_time, create_user, user_id, competition_id, points, bonus, received        <!--generatedEnd-->
+        id, del_flag, update_time, update_user, create_time, create_user, user_id, competition_id, points, bonus,
+        received, rank        <!--generatedEnd-->
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -35,7 +37,8 @@
         WHERE id = #{id,jdbcType=INTEGER}
     </delete>
 
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ParticipatingInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ParticipatingInfo" useGeneratedKeys="true"
+            keyProperty="id">
         INSERT INTO participating_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <!--generatedStart-->
@@ -72,6 +75,9 @@
             <if test="received!= null">
                 received,
             </if>
+            <if test="rank!= null">
+                rank,
+            </if>
             <!--generatedEnd-->
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -109,6 +115,9 @@
             <if test="received != null">
                 #{received,jdbcType=INTEGER},
             </if>
+            <if test="rank != null">
+                #{rank,jdbcType=INTEGER},
+            </if>
             <!--generatedEnd-->
         </trim>
     </insert>
@@ -150,6 +159,9 @@
             <if test="received != null">
                 received= #{received,jdbcType=INTEGER},
             </if>
+            <if test="rank != null">
+                rank= #{rank,jdbcType=INTEGER},
+            </if>
             <!--generatedEnd-->
         </set>
         WHERE
@@ -161,8 +173,11 @@
         </if>
     </update>
 
-    <select id="queryParticipatingInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ParticipatingInfo">
-        SELECT <include refid="Base_Column_List"/> FROM participating_info
+    <select id="queryParticipatingInfoByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ParticipatingInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM participating_info
         <where>
             AND del_flag = 'N'
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
@@ -202,6 +217,9 @@
             <if test="record.received != null and !&quot;&quot;.equals(record.received)">
                 AND received = #{record.received}
             </if>
+            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                AND rank = #{record.rank}
+            </if>
             <!--generatedEnd-->
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
@@ -211,6 +229,7 @@
                     OR points LIKE concat('%',#{record.searchKey},'%')
                     OR bonus LIKE concat('%',#{record.searchKey},'%')
                     OR received LIKE concat('%',#{record.searchKey},'%')
+                    OR rank LIKE concat('%',#{record.searchKey},'%')
                     <!--generatedEnd-->
                 </trim>
             </if>
@@ -256,8 +275,11 @@
         id DESC
     </select>
 
-    <select id="queryAllParticipatingInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ParticipatingInfo">
-        SELECT <include refid="Base_Column_List"/> FROM participating_info
+    <select id="queryAllParticipatingInfo" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ParticipatingInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM participating_info
         <where>
             AND del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
@@ -297,6 +319,9 @@
             <if test="received != null and !&quot;&quot;.equals(received)">
                 AND received = #{received}
             </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                AND rank = #{rank}
+            </if>
             <!--generatedEnd-->
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
@@ -306,6 +331,7 @@
                     OR points LIKE concat('%',#{searchKey},'%')
                     OR bonus LIKE concat('%',#{searchKey},'%')
                     OR received LIKE concat('%',#{searchKey},'%')
+                    OR rank LIKE concat('%',#{searchKey},'%')
                     <!--generatedEnd-->
                 </trim>
             </if>
@@ -350,8 +376,11 @@
         id DESC
     </select>
 
-    <select id="queryParticipatingInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ParticipatingInfo">
-        SELECT <include refid="Base_Column_List"/> FROM participating_info
+    <select id="queryParticipatingInfo" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ParticipatingInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM participating_info
         <where>
             AND del_flag = 'N'
             <!--generatedStart-->
@@ -388,6 +417,9 @@
             <if test="received != null and !&quot;&quot;.equals(received)">
                 AND received = #{received}
             </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                AND rank = #{rank}
+            </if>
             <!--generatedEnd-->
         </where>
         LIMIT 1
@@ -404,6 +436,7 @@
         </if>
     </update>
 
+
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ParticipatingInfo">
         SELECT
         <include refid="Base_Column_List"/>
@@ -415,5 +448,25 @@
         </where>
         ORDER BY id DESC
     </select>
+
+    <update id="updateRank">
+        UPDATE participating_info t1
+            INNER JOIN
+            (SELECT *, (@curRank := @curRank + 1) AS currentRank
+             FROM (SELECT *,
+                          (SELECT sum(points)
+                           FROM player_info
+                           WHERE player_info.competition_id = #{competitionId}
+                             AND player_info.user_id = participating_info.user_id
+                             AND player_info.del_flag = 'N') AS p
+                   FROM participating_info
+                   WHERE participating_info.competition_id = #{competitionId}
+                     AND participating_info.del_flag = 'N'
+                   ORDER BY p DESC) a,
+                  (SELECT @curRank := 0) b) t2 ON t1.id = t2.id
+        SET t1.points = t2.p,
+            t1.`rank` = t2.currentRank
+        WHERE t1.del_flag = 'N'
+    </update>
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/PlayerInfoMapper.xml

@@ -30,6 +30,7 @@
         <result column="season_id" property="seasonId" jdbcType="INTEGER"/>
         <result column="house_rank" property="houseRank" jdbcType="INTEGER"/>
         <result column="score" property="score" jdbcType="FLOAT"/>
+        <result column="competition_id" property="competitionId" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -89,6 +90,8 @@
 
             score,
 
+            competition_id
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -190,6 +193,9 @@
             <if test="score!= null">
                 score,
             </if>
+            <if test="competition_id!= null">
+                competition_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -276,6 +282,9 @@
             <if test="score != null">
                 #{score,jdbcType=FLOAT},
             </if>
+            <if test="competition_id!= null">
+                #{competitionId,jdbcType=INTEGER},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.PlayerInfo">
@@ -365,6 +374,9 @@
             <if test="score != null">
                 score= #{score,jdbcType=INTEGER},
             </if>
+            <if test="competitionId != null">
+                competition_id = #{competitionId,jdbcType=INTEGER},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
@@ -464,6 +476,9 @@
             <if test="record.seasonId != null and !&quot;&quot;.equals(record.seasonId)">
                 and season_id = #{record.seasonId}
             </if>
+            <if test="record.competitionId != null and !&quot;&quot;.equals(record.competitionId)">
+                and competition_id = #{record.competitionId}
+            </if>
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR game_id LIKE concat('%',#{record.searchKey},'%')
@@ -497,11 +512,9 @@
                                 <if test="detailIndex == 3">
                                     concat('%',#{itemDetail},'%')
                                 </if>
-
                                 <if test="detailIndex &lt; 3">
                                     ${itemDetail}
                                 </if>
-
                             </foreach>
                         </when>
                         <otherwise>
@@ -509,35 +522,24 @@
                                 <if test="detailIndex == 3">
                                     #{itemDetail}
                                 </if>
-
                                 <if test="detailIndex &lt; 3">
                                     ${itemDetail}
                                 </if>
-
                             </foreach>
                         </otherwise>
                     </choose>
-
-
                 </foreach>
-
-
             </if>
-
         </where>
         order by
-
         <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
-
-
             <trim suffixOverrides=",">
                 <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
                     <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                         ${itemDetail}
                     </foreach>
                 </foreach>
-            </trim>
-            ,
+            </trim> ,
         </if>
         id desc
     </select>
@@ -629,6 +631,9 @@
             <if test="record.seasonId != null and !&quot;&quot;.equals(record.seasonId)">
                 and season_id = #{record.seasonId}
             </if>
+            <if test="record.competitionId != null and !&quot;&quot;.equals(record.competitionId)">
+                and competition_id = #{record.competitionId}
+            </if>
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR game_id LIKE concat('%',#{record.searchKey},'%')
@@ -682,16 +687,10 @@
                             </foreach>
                         </otherwise>
                     </choose>
-
-
                 </foreach>
-
-
             </if>
-
         </where>
         order by
-
         IFNULL(ranking,999) ,
         <if test="record.scoreType != null and !&quot;&quot;.equals(record.scoreType)">
             IFNULL(score,0) desc,
@@ -807,6 +806,9 @@
             <if test="record.seasonId != null and !&quot;&quot;.equals(record.seasonId)">
                 and season_id = #{record.seasonId}
             </if>
+            <if test="record.competitionId != null and !&quot;&quot;.equals(record.competitionId)">
+                and competition_id = #{record.competitionId}
+            </if>
 
         </where>
         GROUP BY
@@ -969,6 +971,9 @@
             <if test="seasonId != null and !&quot;&quot;.equals(seasonId)">
                 and season_id = #{seasonId}
             </if>
+            <if test="competitionId != null and !&quot;&quot;.equals(competitionId)">
+                and competition_id = #{competitionId}
+            </if>
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR game_id LIKE concat('%',#{searchKey},'%')
@@ -1021,18 +1026,12 @@
                             </foreach>
                         </otherwise>
                     </choose>
-
-
                 </foreach>
-
-
             </if>
         </where>
         order by
 
         <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
-
-
             <trim suffixOverrides=",">
                 <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
                     <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
@@ -1129,6 +1128,9 @@
             <if test="seasonId != null and !&quot;&quot;.equals(seasonId)">
                 and season_id = #{seasonId}
             </if>
+            <if test="competitionId != null and !&quot;&quot;.equals(competitionId)">
+                and competition_id = #{competitionId}
+            </if>
 
         </where>
         LIMIT 1
@@ -1256,6 +1258,9 @@
             <if test="seasonId != null and !&quot;&quot;.equals(seasonId)">
                 and user_rank.season_id = #{seasonId}
             </if>
+            <if test="competitionId != null and !&quot;&quot;.equals(competitionId)">
+                and user_rank.competition_id = #{competitionId}
+            </if>
 
         </where>
     </select>
@@ -1345,6 +1350,9 @@
             <if test="seasonId != null and !&quot;&quot;.equals(seasonId)">
                 and season_id = #{seasonId}
             </if>
+            <if test="competitionId != null and !&quot;&quot;.equals(competitionId)">
+                and competition_id = #{competitionId}
+            </if>
 
         </where>
     </select>

src/main/java/com/izouma/awesomeadmin/model/Competition.java

@@ -1,23 +1,24 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class Competition{
+public class Competition {
     /*generatedStart*/
     private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private String competitionName;
-    private Date startTime;
-    private Date endTime;
+    private String  delFlag;
+    private Date    updateTime;
+    private String  updateUser;
+    private Date    createTime;
+    private String  createUser;
+    private String  competitionName;
+    private Date    startTime;
+    private Date    endTime;
     private Integer type;
     private Integer bonus;
     private Integer status;
@@ -27,99 +28,112 @@ public class Competition{
     private String searchKey;
 
     /**
-    * and,test_name,like,value;or,remark,=,123
-    */
+     * and,test_name,like,value;or,remark,=,123
+     */
     private String advancedQuery;
 
     /**
-    * column_name_,desc_;column_name_,asc
-    */
+     * column_name_,desc_;column_name_,asc
+     */
     private String orderByStr;
     /*generatedEnd*/
 
+    private ParticipatingInfo participatingInfo;
+
     /*generatedStart*/
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getCompetitionName(){
+
+    public String getCompetitionName() {
         return this.competitionName;
     }
 
-    public void setCompetitionName(String competitionName){
+    public void setCompetitionName(String competitionName) {
         this.competitionName = competitionName;
     }
-    public Date getStartTime(){
+
+    public Date getStartTime() {
         return this.startTime;
     }
 
-    public void setStartTime(Date startTime){
+    public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
-    public Date getEndTime(){
+
+    public Date getEndTime() {
         return this.endTime;
     }
 
-    public void setEndTime(Date endTime){
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-    public Integer getType(){
+
+    public Integer getType() {
         return this.type;
     }
 
-    public void setType(Integer type){
+    public void setType(Integer type) {
         this.type = type;
     }
-    public Integer getBonus(){
+
+    public Integer getBonus() {
         return this.bonus;
     }
 
-    public void setBonus(Integer bonus){
+    public void setBonus(Integer bonus) {
         this.bonus = bonus;
     }
-    public Integer getStatus(){
+
+    public Integer getStatus() {
         return this.status;
     }
 
-    public void setStatus(Integer status){
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
@@ -156,5 +170,12 @@ public class Competition{
     }
     /*generatedEnd*/
 
+    public ParticipatingInfo getParticipatingInfo() {
+        return participatingInfo;
+    }
+
+    public void setParticipatingInfo(ParticipatingInfo participatingInfo) {
+        this.participatingInfo = participatingInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/ParticipatingInfo.java

@@ -1,120 +1,141 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class ParticipatingInfo{
+public class ParticipatingInfo {
     /*generatedStart*/
     private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
+    private String  delFlag;
+    private Date    updateTime;
+    private String  updateUser;
+    private Date    createTime;
+    private String  createUser;
     private Integer userId;
     private Integer competitionId;
     private Integer points;
     private Integer bonus;
     private Integer received;
+    private Integer rank;
 
     private String idStr;
 
     private String searchKey;
 
     /**
-    * and,test_name,like,value;or,remark,=,123
-    */
+     * and,test_name,like,value;or,remark,=,123
+     */
     private String advancedQuery;
 
     /**
-    * column_name_,desc_;column_name_,asc
-    */
+     * column_name_,desc_;column_name_,asc
+     */
     private String orderByStr;
     /*generatedEnd*/
 
+    private Integer currentRank;
+
     /*generatedStart*/
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public Integer getUserId(){
+
+    public Integer getUserId() {
         return this.userId;
     }
 
-    public void setUserId(Integer userId){
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
-    public Integer getCompetitionId(){
+
+    public Integer getCompetitionId() {
         return this.competitionId;
     }
 
-    public void setCompetitionId(Integer competitionId){
+    public void setCompetitionId(Integer competitionId) {
         this.competitionId = competitionId;
     }
-    public Integer getPoints(){
+
+    public Integer getPoints() {
         return this.points;
     }
 
-    public void setPoints(Integer points){
+    public void setPoints(Integer points) {
         this.points = points;
     }
-    public Integer getBonus(){
+
+    public Integer getBonus() {
         return this.bonus;
     }
 
-    public void setBonus(Integer bonus){
+    public void setBonus(Integer bonus) {
         this.bonus = bonus;
     }
-    public Integer getReceived(){
+
+    public Integer getReceived() {
         return this.received;
     }
 
-    public void setReceived(Integer received){
+    public void setReceived(Integer received) {
         this.received = received;
     }
 
+    public Integer getRank() {
+        return this.rank;
+    }
+
+    public void setRank(Integer rank) {
+        this.rank = rank;
+    }
+
     public String getSearchKey() {
         return searchKey;
     }
@@ -148,5 +169,12 @@ public class ParticipatingInfo{
     }
     /*generatedEnd*/
 
+    public Integer getCurrentRank() {
+        return currentRank;
+    }
+
+    public void setCurrentRank(Integer currentRank) {
+        this.currentRank = currentRank;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/PlayerInfo.java

@@ -10,50 +10,42 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class PlayerInfo {
-    private Integer id;
-    private String delFlag;
-    private Date updateTime;
-    private String updateUser;
-    private Date createTime;
-    private String createUser;
-    private Integer gameId;
-    private Integer houseId;
-    private Date joinTime;
+    private Integer    id;
+    private String     delFlag;
+    private Date       updateTime;
+    private String     updateUser;
+    private Date       createTime;
+    private String     createUser;
+    private Integer    gameId;
+    private Integer    houseId;
+    private Date       joinTime;
     private BigDecimal principal;
     private BigDecimal points;
-    private Integer userId;
-    private String remark;
-    private String image;
-    private Integer killNumber;
-    private Integer ranking;
-    private Date beginTime;
-    private Date endTime;
-    private Integer statusFlag;
-    private String examineUser;
-    private Date examineTime;
-    private Integer examineType;
-    private String video;
-    private String liveTime;
-    private String gameType;
-    private Integer seasonId;
-
-    private Integer houseRank;
-
-    private Integer rank;
-
-    private Float score;
-
-    private Integer scoreType;
-
-    private UserInfo userInfo;
-
-    private HouseInfo houseInfo;
-
-    private GameInfo gameInfo;
-
-    private String idStr;
-
-    private String searchKey;
+    private Integer    userId;
+    private String     remark;
+    private String     image;
+    private Integer    killNumber;
+    private Integer    ranking;
+    private Date       beginTime;
+    private Date       endTime;
+    private Integer    statusFlag;
+    private String     examineUser;
+    private Date       examineTime;
+    private Integer    examineType;
+    private String     video;
+    private String     liveTime;
+    private String     gameType;
+    private Integer    seasonId;
+    private Integer    houseRank;
+    private Integer    rank;
+    private Float      score;
+    private Integer    scoreType;
+    private UserInfo   userInfo;
+    private HouseInfo  houseInfo;
+    private GameInfo   gameInfo;
+    private String     idStr;
+    private String     searchKey;
+    private Integer    competitionId;
 
     /**
      * and,test_name,like,value;or,remark,=,123
@@ -361,5 +353,13 @@ public class PlayerInfo {
     public void setScoreType(Integer scoreType) {
         this.scoreType = scoreType;
     }
+
+    public Integer getCompetitionId() {
+        return competitionId;
+    }
+
+    public void setCompetitionId(Integer competitionId) {
+        this.competitionId = competitionId;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/CompetitionService.java

@@ -1,14 +1,15 @@
 package com.izouma.awesomeadmin.service;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.Competition;
 
 
 /**
-*  service接口类
-*/
-public interface CompetitionService{
+ * service接口类
+ */
+public interface CompetitionService {
     /*generatedStart*/
     List<Competition> getCompetitionList(Competition record);
 
@@ -25,6 +26,6 @@ public interface CompetitionService{
     boolean updateCompetition(Competition record);
     /*generatedEnd*/
 
-    int getUserRank(Integer competitionId,Integer userId);
+    List<Competition> queryUserCompetitions(Competition record, Integer userId);
 }
 

src/main/java/com/izouma/awesomeadmin/service/ParticipatingInfoService.java

@@ -1,14 +1,15 @@
 package com.izouma.awesomeadmin.service;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.ParticipatingInfo;
 
 
 /**
-*  service接口类
-*/
-public interface ParticipatingInfoService{
+ * service接口类
+ */
+public interface ParticipatingInfoService {
     /*generatedStart*/
     List<ParticipatingInfo> getParticipatingInfoList(ParticipatingInfo record);
 
@@ -24,5 +25,7 @@ public interface ParticipatingInfoService{
 
     boolean updateParticipatingInfo(ParticipatingInfo record);
     /*generatedEnd*/
+
+    ParticipatingInfo participate(Integer userId, Integer competitionId);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/CompetitionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,10 +12,10 @@ import com.izouma.awesomeadmin.service.CompetitionService;
 import com.izouma.awesomeadmin.dao.CompetitionMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class CompetitionServiceImpl implements CompetitionService{
+public class CompetitionServiceImpl implements CompetitionService {
     /*generatedStart*/
     private static Logger logger = Logger.getLogger(CompetitionServiceImpl.class);
 
@@ -77,7 +78,7 @@ public class CompetitionServiceImpl implements CompetitionService{
         try {
             int updates = competitionMapper.insertSelective(record);
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createCompetition", e);
@@ -91,10 +92,10 @@ public class CompetitionServiceImpl implements CompetitionService{
         try {
             int updates = competitionMapper.delete(record);
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteCompetition", e);
+            logger.error("deleteCompetition", e);
         }
         return false;
     }
@@ -105,13 +106,24 @@ public class CompetitionServiceImpl implements CompetitionService{
         try {
             int updates = competitionMapper.updateByPrimaryKeySelective(record);
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateCompetition", e);
+            logger.error("updateCompetition", e);
         }
         return false;
     }
     /*generatedEnd*/
+
+    @Override
+    public List<Competition> queryUserCompetitions(Competition record, Integer userId) {
+        logger.info("queryUserCompetitions");
+        try {
+            return competitionMapper.queryUserCompetitions(record, userId);
+        } catch (Exception e) {
+            logger.error("queryUserCompetitions", e);
+        }
+        return null;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/HouseInfoServiceImpl.java

@@ -3,7 +3,6 @@ package com.izouma.awesomeadmin.service.impl;
 import java.math.BigDecimal;
 import java.util.*;
 
-import com.izouma.awesomeadmin.dao.BonusRecordMapper;
 import com.izouma.awesomeadmin.dao.CompetitionSeasonMapper;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.*;
@@ -516,48 +515,39 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                 return new Result(false, "加入失败，不能重复加入");
             }
 
-            double entryCoin = 50;
+            //todo: 检查剩余次数
 
-            HouseLevel houseLevel = houseInfo.getHouseLevelInfo();
-            if (houseLevel != null) {
-                entryCoin = houseLevel.getEntryCoin().doubleValue();
-            }
+            //todo: 使用道具
 
-            /**
-             * 余额
-             */
+            double entryCoin = 0;
             double moneyCoin = userInfo.getMoneyCoin();
 
-            if (entryCoin > moneyCoin) {
-                return new Result(false, "加入失败，余额不足");
-            }
 
             record.setGameId(houseInfo.getGameId());
             record.setHouseId(houseInfo.getId());
             record.setJoinTime(new Date());
             record.setPrincipal(BigDecimal.valueOf(entryCoin));
             record.setSeasonId(houseInfo.getSeasonId());
+            record.setCompetitionId(houseInfo.getCompetitionId());
 
             playerInfoService.createPlayerInfo(record);
 
             // 只能用余额支付
-            if (entryCoin > 0) {
-
-                MemberCoin memberCoin = new MemberCoin();
-                memberCoin.setCreateUser("系统");
-                memberCoin.setHouseId(houseInfo.getId());
-                memberCoin.setUserId(userInfo.getId());
-                memberCoin.setGameId(houseInfo.getGameId());
-                memberCoin.setSeasonId(houseInfo.getSeasonId());
-                memberCoin.setPlayerId(record.getId());
-
-                memberCoin.setMoney(BigDecimal.valueOf(-entryCoin));
-                memberCoin.setBalance(BigDecimal.valueOf(moneyCoin - entryCoin));
-                memberCoin.setTypeFlag(AppConstant.CoinType.CONSUMPTION);
-                memberCoin.setRemark("加入房间：" + houseInfo.getHouseCode());
-                memberCoinService.createMemberCoin(memberCoin);
 
-            }
+            MemberCoin memberCoin = new MemberCoin();
+            memberCoin.setCreateUser("系统");
+            memberCoin.setHouseId(houseInfo.getId());
+            memberCoin.setUserId(userInfo.getId());
+            memberCoin.setGameId(houseInfo.getGameId());
+            memberCoin.setSeasonId(houseInfo.getSeasonId());
+            memberCoin.setPlayerId(record.getId());
+
+            memberCoin.setMoney(BigDecimal.valueOf(-entryCoin));
+            memberCoin.setBalance(BigDecimal.valueOf(moneyCoin - entryCoin));
+            memberCoin.setTypeFlag(AppConstant.CoinType.CONSUMPTION);
+            memberCoin.setRemark("加入房间：" + houseInfo.getHouseCode());
+            memberCoinService.createMemberCoin(memberCoin);
+
 
             UserInfo updateUser = new UserInfo();
             updateUser.setId(userInfo.getId());
@@ -572,6 +562,10 @@ public class HouseInfoServiceImpl implements HouseInfoService {
 
             houseInfoMapper.joinHouseInfo(joinHouseInfo);
 
+
+            // 创建联赛参赛信息
+            ParticipatingInfo participatingInfo = participatingInfoService.participate(record.getUserId(), houseInfo.getCompetitionId());
+
             return new Result(true, "加入成功");
 
 

src/main/java/com/izouma/awesomeadmin/service/impl/ParticipatingInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,10 +12,10 @@ import com.izouma.awesomeadmin.service.ParticipatingInfoService;
 import com.izouma.awesomeadmin.dao.ParticipatingInfoMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class ParticipatingInfoServiceImpl implements ParticipatingInfoService{
+public class ParticipatingInfoServiceImpl implements ParticipatingInfoService {
     /*generatedStart*/
     private static Logger logger = Logger.getLogger(ParticipatingInfoServiceImpl.class);
 
@@ -113,5 +114,26 @@ public class ParticipatingInfoServiceImpl implements ParticipatingInfoService{
         return false;
     }
     /*generatedEnd*/
+
+    @Override
+    public ParticipatingInfo participate(Integer userId, Integer competitionId) {
+        logger.info("updateParticipatingInfo");
+        try {
+            ParticipatingInfo participatingInfo = new ParticipatingInfo();
+            participatingInfo.setUserId(userId);
+            participatingInfo.setCompetitionId(competitionId);
+            participatingInfo = getParticipatingInfo(participatingInfo);
+            if (participatingInfo == null) {
+                participatingInfo = new ParticipatingInfo();
+                participatingInfo.setUserId(userId);
+                participatingInfo.setCompetitionId(competitionId);
+                createParticipatingInfo(participatingInfo);
+            }
+            return participatingInfo;
+        } catch (Exception e) {
+            logger.error("updateParticipatingInfo", e);
+        }
+        return null;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/web/CompetitionController.java

@@ -2,8 +2,10 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -53,7 +55,7 @@ public class CompetitionController {
     public Result page(Page page, Competition record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<Competition> pp =competitionService.getCompetitionByPage(page, record);
+        List<Competition> pp = competitionService.getCompetitionByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -65,7 +67,7 @@ public class CompetitionController {
     public Result save(Competition record) {
         boolean num = competitionService.createCompetition(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
@@ -75,7 +77,7 @@ public class CompetitionController {
     public Result updateCompetition(Competition record) {
         boolean num = competitionService.updateCompetition(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
@@ -86,7 +88,7 @@ public class CompetitionController {
 
         boolean num = competitionService.deleteCompetition(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
@@ -101,28 +103,43 @@ public class CompetitionController {
         String titleName = "赛事数据表";
         String fileName = "赛事表";
         int columnNumber = 12;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "赛事名称" ,   "开始时间" ,   "结束时间" ,   "赛事类型" ,   "奖金" ,   "状态"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "赛事名称", "开始时间", "结束时间", "赛事类型", "奖金", "状态"};
         String[][] dataList = new String[competitions.size()][12];
 
         for (int i = 0; i < competitions.size(); i++) {
-                        dataList[i][0] = String.valueOf(competitions.get(i).getId());
-                        dataList[i][1] = String.valueOf(competitions.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(competitions.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(competitions.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(competitions.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(competitions.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(competitions.get(i).getCompetitionName());
-                        dataList[i][7] = String.valueOf(competitions.get(i).getStartTime());
-                        dataList[i][8] = String.valueOf(competitions.get(i).getEndTime());
-                        dataList[i][9] = String.valueOf(competitions.get(i).getType());
-                        dataList[i][10] = String.valueOf(competitions.get(i).getBonus());
-                        dataList[i][11] = String.valueOf(competitions.get(i).getStatus());
-                    }
+            dataList[i][0] = String.valueOf(competitions.get(i).getId());
+            dataList[i][1] = String.valueOf(competitions.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(competitions.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(competitions.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(competitions.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(competitions.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(competitions.get(i).getCompetitionName());
+            dataList[i][7] = String.valueOf(competitions.get(i).getStartTime());
+            dataList[i][8] = String.valueOf(competitions.get(i).getEndTime());
+            dataList[i][9] = String.valueOf(competitions.get(i).getType());
+            dataList[i][10] = String.valueOf(competitions.get(i).getBonus());
+            dataList[i][11] = String.valueOf(competitions.get(i).getStatus());
+        }
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
                 columnNumber, columnWidth, columnName, dataList, response);
     }
     /*generatedEnd*/
+
+    @RequestMapping("getCompetitionList")
+    @ResponseBody
+    public Result getCompetitionList(Competition record) {
+        Integer userId = null;
+        try {
+            userId = ((UserInfo) (SecurityUtils.getSubject().getPrincipal())).getId();
+        } catch (Exception ignored) {
+        }
+        List<Competition> list = competitionService.queryUserCompetitions(record, userId);
+        if (list != null) {
+            return new Result(true, list);
+        }
+        return new Result(false, "失败");
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/web/ParticipatingInfoController.java

@@ -100,10 +100,10 @@ public class ParticipatingInfoController {
         String sheetName = "participating_info";
         String titleName = "参赛信息数据表";
         String fileName = "参赛信息表";
-        int columnNumber = 11;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "比赛" ,   "积分" ,   "奖金" ,   "已领取"  };
-        String[][] dataList = new String[participatingInfos.size()][11];
+        int columnNumber = 12;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "比赛" ,   "积分" ,   "奖金" ,   "已领取" ,   "排名"  };
+        String[][] dataList = new String[participatingInfos.size()][12];
 
         for (int i = 0; i < participatingInfos.size(); i++) {
                         dataList[i][0] = String.valueOf(participatingInfos.get(i).getId());
@@ -117,6 +117,7 @@ public class ParticipatingInfoController {
                         dataList[i][8] = String.valueOf(participatingInfos.get(i).getPoints());
                         dataList[i][9] = String.valueOf(participatingInfos.get(i).getBonus());
                         dataList[i][10] = String.valueOf(participatingInfos.get(i).getReceived());
+                        dataList[i][11] = String.valueOf(participatingInfos.get(i).getRank());
                     }
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,

src/main/vue/src/pages/ParticipatingInfo.vue

@@ -17,6 +17,9 @@
             <el-form-item prop="received" label="已领取">
                 <el-input v-model="formData.received" :disabled="'received'==subColumn"></el-input>
             </el-form-item>
+            <el-form-item prop="rank" label="排名">
+                <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
@@ -48,7 +51,7 @@
                     }
                 }).then(res => {
                     if (res.success) {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    this.formData = res.data;
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                this.formData = res.data;
                         if (this.$route.query.column) {
                             this.formData[this.subColumn] = this.subValue;
                         }
@@ -60,7 +63,7 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
         data() {
             return {
                 saving: false,
@@ -123,7 +126,7 @@
             submit() {
                 let data = {...this.formData};
 
-                                                                                                                                                                                                
+                                                                                                                                                                                                                
                 this.$http.post({
                     url: this.formData.id ? '/participatingInfo/update' : '/participatingInfo/save',
                     data: data

src/main/vue/src/pages/ParticipatingInfos.vue

@@ -78,6 +78,13 @@
                                 label="已领取"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('rank')"
+                                prop="rank"
+                                label="排名"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -245,6 +252,11 @@
                                 label: '已领取',
                                 value: 'received',
                                 show: true
+                            },
+                                                                                                {
+                                label: '排名',
+                                value: 'rank',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -273,6 +285,10 @@
                                                                                                 {
                                 label: '已领取',
                                 value: 'received'
+                            },
+                                                                                                {
+                                label: '排名',
+                                value: 'rank'
                             },
                                                             ],
                 advancedQuerySearchKey: '',