20190225

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

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.izouma.awesomeadmin.dao.CompetitionSeasonMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CompetitionSeason" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="season" property="season" jdbcType="VARCHAR" />
-                                <result column="short_name" property="shortName" jdbcType="VARCHAR" />
-                                <result column="begin_time" property="beginTime" jdbcType="TIMESTAMP" />
-                                <result column="end_time" property="endTime" jdbcType="TIMESTAMP" />
-                                <result column="bonus" property="bonus" jdbcType="DECIMAL" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
-                                <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
+<mapper namespace="com.izouma.awesomeadmin.dao.CompetitionSeasonMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CompetitionSeason">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="season" property="season" jdbcType="VARCHAR"/>
+        <result column="short_name" property="shortName" jdbcType="VARCHAR"/>
+        <result column="begin_time" property="beginTime" jdbcType="TIMESTAMP"/>
+        <result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
+        <result column="bonus" property="bonus" jdbcType="DECIMAL"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="rank" property="rank" jdbcType="INTEGER"/>
+        <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
+        <result column="game_id" property="gameId" jdbcType="INTEGER"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
             id,
 
             del_flag,
@@ -47,155 +48,167 @@
 
             status_flag,
 
-            </trim>
+            game_id,
+
+        </trim>
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from competition_season
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from competition_season
         where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CompetitionSeason" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CompetitionSeason" useGeneratedKeys="true"
+            keyProperty="id">
         insert into competition_season
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
                 id,
             </if>
-                <if test="delFlag!= null" >
+            <if test="delFlag!= null">
                 del_flag,
             </if>
-                <if test="updateTime!= null" >
+            <if test="updateTime!= null">
                 update_time,
             </if>
-                <if test="updateUser!= null" >
+            <if test="updateUser!= null">
                 update_user,
             </if>
-                <if test="createTime!= null" >
+            <if test="createTime!= null">
                 create_time,
             </if>
-                <if test="createUser!= null" >
+            <if test="createUser!= null">
                 create_user,
             </if>
-                <if test="season!= null" >
+            <if test="season!= null">
                 season,
             </if>
-                <if test="shortName!= null" >
+            <if test="shortName!= null">
                 short_name,
             </if>
-                <if test="beginTime!= null" >
+            <if test="beginTime!= null">
                 begin_time,
             </if>
-                <if test="endTime!= null" >
+            <if test="endTime!= null">
                 end_time,
             </if>
-                <if test="bonus!= null" >
+            <if test="bonus!= null">
                 bonus,
             </if>
-                <if test="remark!= null" >
+            <if test="remark!= null">
                 remark,
             </if>
-                <if test="rank!= null" >
+            <if test="rank!= null">
                 rank,
             </if>
-                <if test="statusFlag!= null" >
+            <if test="statusFlag!= null">
                 status_flag,
             </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
+            <if test="gameId!= null">
+                game_id,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
                 #{id,jdbcType=INTEGER},
             </if>
-                    <if test="delFlag != null" >
+            <if test="delFlag != null">
                 #{delFlag,jdbcType=CHAR},
             </if>
-                    <if test="updateTime != null" >
+            <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="updateUser != null" >
+            <if test="updateUser != null">
                 #{updateUser,jdbcType=VARCHAR},
             </if>
-                    <if test="createTime != null" >
+            <if test="createTime != null">
                 #{createTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="createUser != null" >
+            <if test="createUser != null">
                 #{createUser,jdbcType=VARCHAR},
             </if>
-                    <if test="season != null" >
+            <if test="season != null">
                 #{season,jdbcType=VARCHAR},
             </if>
-                    <if test="shortName != null" >
+            <if test="shortName != null">
                 #{shortName,jdbcType=VARCHAR},
             </if>
-                    <if test="beginTime != null" >
+            <if test="beginTime != null">
                 #{beginTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="endTime != null" >
+            <if test="endTime != null">
                 #{endTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="bonus != null" >
+            <if test="bonus != null">
                 #{bonus,jdbcType=DECIMAL},
             </if>
-                    <if test="remark != null" >
+            <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
-                    <if test="rank != null" >
+            <if test="rank != null">
                 #{rank,jdbcType=INTEGER},
             </if>
-                    <if test="statusFlag != null" >
+            <if test="statusFlag != null">
                 #{statusFlag,jdbcType=INTEGER},
             </if>
-                </trim>
+            <if test="gameId != null">
+                #{gameId,jdbcType=INTEGER},
+            </if>
+        </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CompetitionSeason" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CompetitionSeason">
         update competition_season
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
+            </if>
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
             </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
             </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
             </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
+            <if test="season != null">
+                season= #{season,jdbcType=VARCHAR},
             </if>
-                     <if test="season != null" >
-               season= #{season,jdbcType=VARCHAR},
+            <if test="shortName != null">
+                short_name= #{shortName,jdbcType=VARCHAR},
             </if>
-                     <if test="shortName != null" >
-               short_name= #{shortName,jdbcType=VARCHAR},
+            <if test="beginTime != null">
+                begin_time= #{beginTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="beginTime != null" >
-               begin_time= #{beginTime,jdbcType=TIMESTAMP},
+            <if test="endTime != null">
+                end_time= #{endTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="endTime != null" >
-               end_time= #{endTime,jdbcType=TIMESTAMP},
+            <if test="bonus != null">
+                bonus= #{bonus,jdbcType=DECIMAL},
             </if>
-                     <if test="bonus != null" >
-               bonus= #{bonus,jdbcType=DECIMAL},
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
             </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
+            <if test="rank != null">
+                rank= #{rank,jdbcType=INTEGER},
             </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
+            <if test="statusFlag != null">
+                status_flag= #{statusFlag,jdbcType=INTEGER},
             </if>
-                     <if test="statusFlag != null" >
-               status_flag= #{statusFlag,jdbcType=INTEGER},
+            <if test="gameId != null">
+                game_id= #{gameId,jdbcType=INTEGER},
             </if>
-                 </set>
+        </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
             id = #{id,jdbcType=INTEGER}
@@ -206,67 +219,70 @@
         </if>
 
     </update>
-    <select id="queryCompetitionSeasonByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompetitionSeason">
-        select <include refid="Base_Column_List"/> from competition_season
+    <select id="queryCompetitionSeasonByPage" parameterType="java.util.Map"
+            resultMap="PageCompetitionSeasonResult">
+        select
+        <include refid="Base_Column_List"/>
+        from competition_season
         <where>
             and del_flag = 'N'
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
                 and id in (${record.idStr})
             </if>
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
             </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
             </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
             </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
             </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
             </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
             </if>
-                     <if test="record.season != null and !&quot;&quot;.equals(record.season)">
-                and  season = #{record.season}
+            <if test="record.season != null and !&quot;&quot;.equals(record.season)">
+                and season = #{record.season}
             </if>
-                     <if test="record.shortName != null and !&quot;&quot;.equals(record.shortName)">
-                and  short_name = #{record.shortName}
+            <if test="record.shortName != null and !&quot;&quot;.equals(record.shortName)">
+                and short_name = #{record.shortName}
             </if>
-                     <if test="record.beginTime != null and !&quot;&quot;.equals(record.beginTime)">
-                and  begin_time = #{record.beginTime}
+            <if test="record.beginTime != null and !&quot;&quot;.equals(record.beginTime)">
+                and begin_time = #{record.beginTime}
             </if>
-                     <if test="record.endTime != null and !&quot;&quot;.equals(record.endTime)">
-                and  end_time = #{record.endTime}
+            <if test="record.endTime != null and !&quot;&quot;.equals(record.endTime)">
+                and end_time = #{record.endTime}
             </if>
-                     <if test="record.bonus != null and !&quot;&quot;.equals(record.bonus)">
-                and  bonus = #{record.bonus}
+            <if test="record.bonus != null and !&quot;&quot;.equals(record.bonus)">
+                and bonus = #{record.bonus}
             </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
             </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
+            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                and rank = #{record.rank}
             </if>
-                     <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
-                and  status_flag = #{record.statusFlag}
+            <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
+                and status_flag = #{record.statusFlag}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR season LIKE concat('%',#{record.searchKey},'%')
+                    OR short_name LIKE concat('%',#{record.searchKey},'%')
+                    OR begin_time LIKE concat('%',#{record.searchKey},'%')
+                    OR end_time LIKE concat('%',#{record.searchKey},'%')
+                    OR bonus LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR rank LIKE concat('%',#{record.searchKey},'%')
+                    OR status_flag LIKE concat('%',#{record.searchKey},'%')
+                </trim>
             </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  season LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  short_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  begin_time LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  end_time LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  bonus LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  status_flag LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
                 <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
@@ -320,101 +336,104 @@
         </if>
         id desc
     </select>
-    <select id="queryAllCompetitionSeason" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompetitionSeason">
-        select <include refid="Base_Column_List"/> from competition_season
+    <select id="queryAllCompetitionSeason" parameterType="java.util.Map"
+            resultMap="PageCompetitionSeasonResult">
+        select
+        <include refid="Base_Column_List"/>
+        from competition_season
         <where>
             and del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
                 and id in (${idStr})
             </if>
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
             </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
             </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
             </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
             </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
             </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
             </if>
-                    <if test="season != null and !&quot;&quot;.equals(season)">
-                and  season = #{season}
+            <if test="season != null and !&quot;&quot;.equals(season)">
+                and season = #{season}
             </if>
-                    <if test="shortName != null and !&quot;&quot;.equals(shortName)">
-                and  short_name = #{shortName}
+            <if test="shortName != null and !&quot;&quot;.equals(shortName)">
+                and short_name = #{shortName}
             </if>
-                    <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
-                and  begin_time = #{beginTime}
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+                and begin_time = #{beginTime}
             </if>
-                    <if test="endTime != null and !&quot;&quot;.equals(endTime)">
-                and  end_time = #{endTime}
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+                and end_time = #{endTime}
             </if>
-                    <if test="bonus != null and !&quot;&quot;.equals(bonus)">
-                and  bonus = #{bonus}
+            <if test="bonus != null and !&quot;&quot;.equals(bonus)">
+                and bonus = #{bonus}
             </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
             </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
             </if>
-                    <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
-                and  status_flag = #{statusFlag}
+            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
+                and status_flag = #{statusFlag}
             </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  season LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  short_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  begin_time LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  end_time LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  bonus LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  status_flag LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR season LIKE concat('%',#{searchKey},'%')
+                    OR short_name LIKE concat('%',#{searchKey},'%')
+                    OR begin_time LIKE concat('%',#{searchKey},'%')
+                    OR end_time LIKE concat('%',#{searchKey},'%')
+                    OR bonus LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR rank LIKE concat('%',#{searchKey},'%')
+                    OR status_flag LIKE concat('%',#{searchKey},'%')
+                </trim>
             </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
 
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
 
-                </foreach>
-            </otherwise>
-        </choose>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
+                            </foreach>
+                        </otherwise>
+                    </choose>
 
-    </foreach>
+
+                </foreach>
 
 
-</if>
+            </if>
         </where>
         order by
 
@@ -433,53 +452,56 @@
 
         id desc
     </select>
-    <select id="queryCompetitionSeason" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompetitionSeason">
-        select <include refid="Base_Column_List"/> from competition_season
+    <select id="queryCompetitionSeason" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.CompetitionSeason">
+        select
+        <include refid="Base_Column_List"/>
+        from competition_season
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
+            <if test="id != null and !&quot;&quot;.equals(id)">
                 and id = #{id}
             </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
                 and update_time = #{updateTime}
             </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
                 and update_user = #{updateUser}
             </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
                 and create_time = #{createTime}
             </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and create_user = #{createUser}
             </if>
-                     <if test="season != null and !&quot;&quot;.equals(season)">
+            <if test="season != null and !&quot;&quot;.equals(season)">
                 and season = #{season}
             </if>
-                     <if test="shortName != null and !&quot;&quot;.equals(shortName)">
+            <if test="shortName != null and !&quot;&quot;.equals(shortName)">
                 and short_name = #{shortName}
             </if>
-                     <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
+            <if test="beginTime != null and !&quot;&quot;.equals(beginTime)">
                 and begin_time = #{beginTime}
             </if>
-                     <if test="endTime != null and !&quot;&quot;.equals(endTime)">
+            <if test="endTime != null and !&quot;&quot;.equals(endTime)">
                 and end_time = #{endTime}
             </if>
-                     <if test="bonus != null and !&quot;&quot;.equals(bonus)">
+            <if test="bonus != null and !&quot;&quot;.equals(bonus)">
                 and bonus = #{bonus}
             </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
                 and rank = #{rank}
             </if>
-                     <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
+            <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
                 and status_flag = #{statusFlag}
             </if>
-         
+
         </where>
         LIMIT 1
     </select>
@@ -495,11 +517,25 @@
         </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CompetitionSeason">
-        select <include refid="Base_Column_List"/> from competition_season
+        select
+        <include refid="Base_Column_List"/>
+        from competition_season
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        </where>
         order by id desc
     </select>
+
+
+    <resultMap id="PageCompetitionSeasonResult" type="com.izouma.awesomeadmin.model.CompetitionSeason"
+               extends="BaseResultMap">
+
+        <association property="gameInfo"
+                     javaType="com.izouma.awesomeadmin.model.GameInfo"
+                     select="com.izouma.awesomeadmin.dao.GameInfoMapper.queryGameInfo"
+                     column="{ id = game_id }"/>
+
+    </resultMap>
+
 </mapper>
 

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

@@ -35,5 +35,7 @@ public interface HouseInfoMapper{
     HouseInfo getHouseInfoPlayerNum(Integer valueOf);
 
     List<HouseInfo> autoBeginHouseInfo(HouseInfo record);
+
+    List<HouseInfo> autoEndHouseInfo(HouseInfo record);
 }
 

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

@@ -857,6 +857,24 @@
         )
     </select>
 
+    <select id="autoEndHouseInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.HouseInfo">
+        SELECT
+            *
+        FROM
+            `house_info`
+        WHERE
+            del_flag = 'N'
+        AND use_flag = 'Y'
+        AND status_flag = 0
+        AND (
+            player_number = max_number
+            OR DATE_SUB(
+                CURRENT_TIMESTAMP(),
+                INTERVAL 10 MINUTE
+            )  <![CDATA[>=]]> create_time
+        )
+    </select>
+
     <resultMap id="OneHouseInfoResult" type="com.izouma.awesomeadmin.model.HouseInfo" extends="BaseResultMap">
 
         <association property="houseLevelInfo"

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

@@ -2,13 +2,14 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class CompetitionSeason{
+public class CompetitionSeason {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -24,150 +25,182 @@ public class CompetitionSeason{
     private Integer rank;
     private Integer statusFlag;
 
-private String idStr;
+    private Integer gameId;
+
+    private String idStr;
+
+    private String searchKey;
 
-private String searchKey;
+    private GameInfo gameInfo;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-    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 getSeason(){
+
+    public String getSeason() {
         return this.season;
     }
 
-    public void setSeason(String season){
+    public void setSeason(String season) {
         this.season = season;
     }
-    public String getShortName(){
+
+    public String getShortName() {
         return this.shortName;
     }
 
-    public void setShortName(String shortName){
+    public void setShortName(String shortName) {
         this.shortName = shortName;
     }
-    public Date getBeginTime(){
+
+    public Date getBeginTime() {
         return this.beginTime;
     }
 
-    public void setBeginTime(Date beginTime){
+    public void setBeginTime(Date beginTime) {
         this.beginTime = beginTime;
     }
-    public Date getEndTime(){
+
+    public Date getEndTime() {
         return this.endTime;
     }
 
-    public void setEndTime(Date endTime){
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-    public BigDecimal getBonus(){
+
+    public BigDecimal getBonus() {
         return this.bonus;
     }
 
-    public void setBonus(BigDecimal bonus){
+    public void setBonus(BigDecimal bonus) {
         this.bonus = bonus;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public Integer getRank(){
+
+    public Integer getRank() {
         return this.rank;
     }
 
-    public void setRank(Integer rank){
+    public void setRank(Integer rank) {
         this.rank = rank;
     }
-    public Integer getStatusFlag(){
+
+    public Integer getStatusFlag() {
         return this.statusFlag;
     }
 
-    public void setStatusFlag(Integer statusFlag){
+    public void setStatusFlag(Integer statusFlag) {
         this.statusFlag = statusFlag;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
+    public Integer getGameId() {
+        return gameId;
+    }
+
+    public void setGameId(Integer gameId) {
+        this.gameId = gameId;
+    }
+
+    public GameInfo getGameInfo() {
+        return gameInfo;
+    }
+
+    public void setGameInfo(GameInfo gameInfo) {
+        this.gameInfo = gameInfo;
+    }
 }
 

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

@@ -33,6 +33,8 @@ public interface HouseInfoService {
 
     Result autoBegin(HouseInfo record);
 
+    Result autoEnd(HouseInfo record);
+
     Result autoNoStartPlay(HouseInfo record);
 }
 

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

@@ -299,6 +299,31 @@ public class HouseInfoServiceImpl implements HouseInfoService {
         return new Result(false, "开始失败");
     }
 
+    @Override
+    public Result autoEnd(HouseInfo record) {
+
+        logger.info("autoEnd");
+        try {
+
+            List<HouseInfo> houseInfoList = houseInfoMapper.autoEndHouseInfo(record);
+
+            for (HouseInfo houseInfo : houseInfoList) {
+
+                houseInfo.setStatusFlag(AppConstant.HouseStatus.START);
+                houseInfo.setBeginTime(new Date());
+                houseInfoMapper.updateByPrimaryKeySelective(houseInfo);
+            }
+
+            return new Result(true, "结束成功");
+
+
+        } catch (Exception e) {
+            logger.error("autoEnd", e);
+        }
+
+        return new Result(false, "开始失败");
+    }
+
     @Override
     public Result autoNoStartPlay(HouseInfo record) {
 

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

@@ -208,11 +208,23 @@ public class HouseInfoController {
         return houseInfoService.autoBegin(null);
     }
 
+    /**
+     * 自动处理未按时加入比赛的玩家。
+     * @return
+     */
     @RequestMapping(value = "/autoNoStartPlay", method = RequestMethod.POST)
     @ResponseBody
     public Result autoNoStartPlay() {
         return houseInfoService.autoNoStartPlay(null);
     }
 
+
+    @RequestMapping(value = "/autoEnd", method = RequestMethod.POST)
+    @ResponseBody
+    public Result autoEnd() {
+        return houseInfoService.autoEnd(null);
+    }
+
+
 }
 

src/main/resources/properties/log4j.properties

@@ -16,7 +16,7 @@ log4j.logger.test.com.izouma=DEBUG
 
 #spring
 log4j.logger.org.springframework=ERROR
-log4j.logger.org.springframework.jdbc.core=DEBUG
+log4j.logger.org.springframework.jdbc.core=ERROR
 
 #mybatis
 log4j.logger.org.mybatis=ERROR

src/main/resources/spring/appWebService.xml

@@ -26,4 +26,13 @@
 
 	<task:annotation-driven/> <!-- 定时器开关-->
 
+	<!--自动开始房间定时任务-->
+	<bean id="houseInfoTask" class="com.izouma.awesomeadmin.web.HouseInfoController"></bean>
+
+	<task:scheduled-tasks>
+		<task:scheduled ref="houseInfoTask" method="autoBegin" cron="0 0/5 * * * ? "/>
+		<task:scheduled ref="houseInfoTask" method="autoNoStartPlay" cron="0 0/1 * * * ? "/>
+	</task:scheduled-tasks>
+
+
 </beans>