自助服务终端基础设置增加操作倒计时配置

sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstBasicEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.sst.model.vo.SstBasicVo;
  * 基础配置实体对象
  *
  * @author zxfei
- * @date 2023-02-27
+ * @date 2023-05-13
  */
 
 public class SstBasicEntity extends SstBasicVo {
@@ -68,6 +68,10 @@ public class SstBasicEntity extends SstBasicVo {
      * 轮播图图片地址
      */
     private String carouselPic;
+    /**
+     * 操作倒计时单位分
+     */
+    private Integer countdown;
 
 
 
@@ -254,6 +258,20 @@ public class SstBasicEntity extends SstBasicVo {
     public void setCarouselPic(String carouselPic){
         this.carouselPic = carouselPic;
     }
+    /**
+     * 获取 操作倒计时单位分
+     * @return Integer
+     */
+    public Integer getCountdown(){
+        return countdown;
+    }
+    /**
+     * 设置 操作倒计时单位分
+     * @param countdown
+     */
+    public void setCountdown(Integer countdown){
+        this.countdown = countdown;
+    }
 
 
 
@@ -289,6 +307,7 @@ public class SstBasicEntity extends SstBasicVo {
         sb.append(",record:").append(getRecord());
         sb.append(",elderEnable:").append(getElderEnable());
         sb.append(",carouselPic:").append(getCarouselPic());
+        sb.append(",countdown:").append(getCountdown());
         return sb.toString();
     }
 
@@ -319,5 +338,7 @@ public class SstBasicEntity extends SstBasicVo {
         this.elderEnable = 1;
 
         this.carouselPic = "";
+
+        this.countdown = 0;
     }
 }
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstBasicQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.sst.model.SstBasicEntity;
  * 基础配置查询对象
  *
  * @author zxfei
- * @date 2023-02-27
+ * @date 2023-05-13
  */
 public class SstBasicQuery extends SstBasicEntity {
     /** 开始 序号，主键，自增长 */
@@ -161,6 +161,21 @@ public class SstBasicQuery extends SstBasicEntity {
 
     /** 轮播图图片地址排除列表 */
     private List <String> carouselPicNotList;
+    /** 开始 操作倒计时单位分 */
+    private Integer countdownStart;
+
+    /** 结束 操作倒计时单位分 */
+    private Integer countdownEnd;
+
+    /** 增加 操作倒计时单位分 */
+    private Integer countdownIncrement;
+
+    /** 操作倒计时单位分列表 */
+    private List <Integer> countdownList;
+
+    /** 操作倒计时单位分排除列表 */
+    private List <Integer> countdownNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SstBasicQuery> orConditionList;
 
@@ -1039,6 +1054,87 @@ public class SstBasicQuery extends SstBasicEntity {
         this.carouselPicNotList = carouselPicNotList;
     }
 
+    /**
+     * 获取 开始 操作倒计时单位分
+     * @return countdownStart
+     */
+    public Integer getCountdownStart(){
+        return this.countdownStart;
+    }
+
+    /**
+     * 设置 开始 操作倒计时单位分
+     * @param countdownStart
+     */
+    public void setCountdownStart(Integer countdownStart){
+        this.countdownStart = countdownStart;
+    }
+
+    /**
+     * 获取 结束 操作倒计时单位分
+     * @return $countdownEnd
+     */
+    public Integer getCountdownEnd(){
+        return this.countdownEnd;
+    }
+
+    /**
+     * 设置 结束 操作倒计时单位分
+     * @param countdownEnd
+     */
+    public void setCountdownEnd(Integer countdownEnd){
+        this.countdownEnd = countdownEnd;
+    }
+
+    /**
+     * 获取 增加 操作倒计时单位分
+     * @return countdownIncrement
+     */
+    public Integer getCountdownIncrement(){
+        return this.countdownIncrement;
+    }
+
+    /**
+     * 设置 增加 操作倒计时单位分
+     * @param countdownIncrement
+     */
+    public void setCountdownIncrement(Integer countdownIncrement){
+        this.countdownIncrement = countdownIncrement;
+    }
+
+    /**
+     * 获取 操作倒计时单位分
+     * @return countdownList
+     */
+    public List<Integer> getCountdownList(){
+        return this.countdownList;
+    }
+
+    /**
+     * 设置 操作倒计时单位分
+     * @param countdownList
+     */
+    public void setCountdownList(List<Integer> countdownList){
+        this.countdownList = countdownList;
+    }
+
+    /**
+     * 获取 操作倒计时单位分
+     * @return countdownNotList
+     */
+    public List<Integer> getCountdownNotList(){
+        return this.countdownNotList;
+    }
+
+    /**
+     * 设置 操作倒计时单位分
+     * @param countdownNotList
+     */
+    public void setCountdownNotList(List<Integer> countdownNotList){
+        this.countdownNotList = countdownNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1555,6 +1651,60 @@ public class SstBasicQuery extends SstBasicEntity {
         return this;
     }
 
+    /**
+     * 设置  操作倒计时单位分
+     * @param countdown
+     */
+    public SstBasicQuery countdown(Integer countdown){
+        setCountdown(countdown);
+        return this;
+    }
+
+    /**
+     * 设置 开始 操作倒计时单位分
+     * @param countdownStart
+     */
+    public SstBasicQuery countdownStart(Integer countdownStart){
+        this.countdownStart = countdownStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 操作倒计时单位分
+     * @param countdownEnd
+     */
+    public SstBasicQuery countdownEnd(Integer countdownEnd){
+        this.countdownEnd = countdownEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 操作倒计时单位分
+     * @param countdownIncrement
+     */
+    public SstBasicQuery countdownIncrement(Integer countdownIncrement){
+        this.countdownIncrement = countdownIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 操作倒计时单位分
+     * @param countdownList
+     */
+    public SstBasicQuery countdownList(List<Integer> countdownList){
+        this.countdownList = countdownList;
+        return this;
+    }
+
+    /**
+     * 设置 操作倒计时单位分
+     * @param countdownNotList
+     */
+    public SstBasicQuery countdownNotList(List<Integer> countdownNotList){
+        this.countdownNotList = countdownNotList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

sst-manager/src/main/resources/sqlmap/module/sst/SstBasicMapper.xml

@@ -23,6 +23,7 @@
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="carouselPic" column="carouselPic" />
+        <result property="countdown" column="countdown" />
 
     </resultMap>
 
@@ -84,23 +85,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('carouselPic') or colPickMode == 1 and data.containsKey('carouselPic')))">
                 a.carouselPic,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('countdown') or colPickMode == 1 and data.containsKey('countdown')))">
+                a.countdown,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SstBasicEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_sst_basic
-        (siteId,titleName,logoUrl,appletCode,wechatCode,saverTime,saverPic,support,sponsor,organizer,record,elderEnable,createUserId,createTime,updateUserId,updateTime,carouselPic)
+        (siteId,titleName,logoUrl,appletCode,wechatCode,saverTime,saverPic,support,sponsor,organizer,record,elderEnable,createUserId,createTime,updateUserId,updateTime,carouselPic,countdown)
         VALUES
-        (#{siteId},#{titleName},#{logoUrl},#{appletCode},#{wechatCode},#{saverTime},#{saverPic},#{support},#{sponsor},#{organizer},#{record},#{elderEnable},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{carouselPic})
+        (#{siteId},#{titleName},#{logoUrl},#{appletCode},#{wechatCode},#{saverTime},#{saverPic},#{support},#{sponsor},#{organizer},#{record},#{elderEnable},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{carouselPic},#{countdown})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_sst_basic
-        (siteId,titleName,logoUrl,appletCode,wechatCode,saverTime,saverPic,support,sponsor,organizer,record,elderEnable,createUserId,createTime,updateUserId,updateTime,carouselPic)
+        (siteId,titleName,logoUrl,appletCode,wechatCode,saverTime,saverPic,support,sponsor,organizer,record,elderEnable,createUserId,createTime,updateUserId,updateTime,carouselPic,countdown)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.titleName},#{item.logoUrl},#{item.appletCode},#{item.wechatCode},#{item.saverTime},#{item.saverPic},#{item.support},#{item.sponsor},#{item.organizer},#{item.record},#{item.elderEnable},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.carouselPic})
+            (#{item.siteId},#{item.titleName},#{item.logoUrl},#{item.appletCode},#{item.wechatCode},#{item.saverTime},#{item.saverPic},#{item.support},#{item.sponsor},#{item.organizer},#{item.record},#{item.elderEnable},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.carouselPic},#{item.countdown})
         </foreach>
     </insert>
 
@@ -176,6 +180,12 @@
             <if test="(colPickMode==0 and data.containsKey('carouselPic')) or (colPickMode==1 and !data.containsKey('carouselPic'))">
                 a.carouselPic=#{data.carouselPic},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('countdown')) or (colPickMode==1 and !data.containsKey('countdown'))">
+                a.countdown=#{data.countdown},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('countdownIncrement')) or (colPickMode==1 and !data.containsKey('countdownIncrement'))">
+                a.countdown=ifnull(a.countdown,0) + #{data.countdownIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -332,6 +342,18 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="countdown=(case" suffix="ELSE countdown end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('countdown')) or (colPickMode==1 and !item.containsKey('countdown'))">
+                            when a.id=#{item.id} then #{item.countdown}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('countdownIncrement')) or (colPickMode==1 and !item.containsKey('countdownIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.countdown,0) + #{item.countdownIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -456,13 +478,13 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('idList')">
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
             ${_conditionType_} a.id in
             <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('idNotList')">
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
             ${_conditionType_} a.id not in
             <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -483,13 +505,13 @@
                 ${_conditionType_} a.siteId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdList')">
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
             ${_conditionType_} a.siteId in
             <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdNotList')">
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
             ${_conditionType_} a.siteId not in
             <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -511,13 +533,13 @@
                 ${_conditionType_} a.titleName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('titleNameList')">
+        <if test="conditionParamRef.containsKey('titleNameList') and conditionParamRef.titleNameList.size() > 0">
             ${_conditionType_} a.titleName in
             <foreach collection="conditionParamRef.titleNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('titleNameNotList')">
+        <if test="conditionParamRef.containsKey('titleNameNotList') and conditionParamRef.titleNameNotList.size() > 0">
             ${_conditionType_} a.titleName not in
             <foreach collection="conditionParamRef.titleNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -532,13 +554,13 @@
                 ${_conditionType_} a.logoUrl is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('logoUrlList')">
+        <if test="conditionParamRef.containsKey('logoUrlList') and conditionParamRef.logoUrlList.size() > 0">
             ${_conditionType_} a.logoUrl in
             <foreach collection="conditionParamRef.logoUrlList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('logoUrlNotList')">
+        <if test="conditionParamRef.containsKey('logoUrlNotList') and conditionParamRef.logoUrlNotList.size() > 0">
             ${_conditionType_} a.logoUrl not in
             <foreach collection="conditionParamRef.logoUrlNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -553,13 +575,13 @@
                 ${_conditionType_} a.appletCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('appletCodeList')">
+        <if test="conditionParamRef.containsKey('appletCodeList') and conditionParamRef.appletCodeList.size() > 0">
             ${_conditionType_} a.appletCode in
             <foreach collection="conditionParamRef.appletCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('appletCodeNotList')">
+        <if test="conditionParamRef.containsKey('appletCodeNotList') and conditionParamRef.appletCodeNotList.size() > 0">
             ${_conditionType_} a.appletCode not in
             <foreach collection="conditionParamRef.appletCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -574,13 +596,13 @@
                 ${_conditionType_} a.wechatCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('wechatCodeList')">
+        <if test="conditionParamRef.containsKey('wechatCodeList') and conditionParamRef.wechatCodeList.size() > 0">
             ${_conditionType_} a.wechatCode in
             <foreach collection="conditionParamRef.wechatCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('wechatCodeNotList')">
+        <if test="conditionParamRef.containsKey('wechatCodeNotList') and conditionParamRef.wechatCodeNotList.size() > 0">
             ${_conditionType_} a.wechatCode not in
             <foreach collection="conditionParamRef.wechatCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -594,13 +616,13 @@
                 ${_conditionType_} a.saverTime is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('saverTimeList')">
+        <if test="conditionParamRef.containsKey('saverTimeList') and conditionParamRef.saverTimeList.size() > 0">
             ${_conditionType_} a.saverTime in
             <foreach collection="conditionParamRef.saverTimeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('saverTimeNotList')">
+        <if test="conditionParamRef.containsKey('saverTimeNotList') and conditionParamRef.saverTimeNotList.size() > 0">
             ${_conditionType_} a.saverTime not in
             <foreach collection="conditionParamRef.saverTimeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -622,13 +644,13 @@
                 ${_conditionType_} a.saverPic is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('saverPicList')">
+        <if test="conditionParamRef.containsKey('saverPicList') and conditionParamRef.saverPicList.size() > 0">
             ${_conditionType_} a.saverPic in
             <foreach collection="conditionParamRef.saverPicList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('saverPicNotList')">
+        <if test="conditionParamRef.containsKey('saverPicNotList') and conditionParamRef.saverPicNotList.size() > 0">
             ${_conditionType_} a.saverPic not in
             <foreach collection="conditionParamRef.saverPicNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -643,13 +665,13 @@
                 ${_conditionType_} a.support is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('supportList')">
+        <if test="conditionParamRef.containsKey('supportList') and conditionParamRef.supportList.size() > 0">
             ${_conditionType_} a.support in
             <foreach collection="conditionParamRef.supportList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('supportNotList')">
+        <if test="conditionParamRef.containsKey('supportNotList') and conditionParamRef.supportNotList.size() > 0">
             ${_conditionType_} a.support not in
             <foreach collection="conditionParamRef.supportNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -664,13 +686,13 @@
                 ${_conditionType_} a.sponsor is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('sponsorList')">
+        <if test="conditionParamRef.containsKey('sponsorList') and conditionParamRef.sponsorList.size() > 0">
             ${_conditionType_} a.sponsor in
             <foreach collection="conditionParamRef.sponsorList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('sponsorNotList')">
+        <if test="conditionParamRef.containsKey('sponsorNotList') and conditionParamRef.sponsorNotList.size() > 0">
             ${_conditionType_} a.sponsor not in
             <foreach collection="conditionParamRef.sponsorNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -685,13 +707,13 @@
                 ${_conditionType_} a.organizer is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('organizerList')">
+        <if test="conditionParamRef.containsKey('organizerList') and conditionParamRef.organizerList.size() > 0">
             ${_conditionType_} a.organizer in
             <foreach collection="conditionParamRef.organizerList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('organizerNotList')">
+        <if test="conditionParamRef.containsKey('organizerNotList') and conditionParamRef.organizerNotList.size() > 0">
             ${_conditionType_} a.organizer not in
             <foreach collection="conditionParamRef.organizerNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -706,13 +728,13 @@
                 ${_conditionType_} a.record is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('recordList')">
+        <if test="conditionParamRef.containsKey('recordList') and conditionParamRef.recordList.size() > 0">
             ${_conditionType_} a.record in
             <foreach collection="conditionParamRef.recordList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('recordNotList')">
+        <if test="conditionParamRef.containsKey('recordNotList') and conditionParamRef.recordNotList.size() > 0">
             ${_conditionType_} a.record not in
             <foreach collection="conditionParamRef.recordNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -726,13 +748,13 @@
                 ${_conditionType_} a.elderEnable is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('elderEnableList')">
+        <if test="conditionParamRef.containsKey('elderEnableList') and conditionParamRef.elderEnableList.size() > 0">
             ${_conditionType_} a.elderEnable in
             <foreach collection="conditionParamRef.elderEnableList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('elderEnableNotList')">
+        <if test="conditionParamRef.containsKey('elderEnableNotList') and conditionParamRef.elderEnableNotList.size() > 0">
             ${_conditionType_} a.elderEnable not in
             <foreach collection="conditionParamRef.elderEnableNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -753,13 +775,13 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdList')">
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
             ${_conditionType_} a.createUserId in
             <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdNotList')">
+        <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
             ${_conditionType_} a.createUserId not in
             <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -795,13 +817,13 @@
                 ${_conditionType_} a.updateUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdList')">
+        <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
             ${_conditionType_} a.updateUserId in
             <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+        <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
             ${_conditionType_} a.updateUserId not in
             <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -838,18 +860,45 @@
                 ${_conditionType_} a.carouselPic is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('carouselPicList')">
+        <if test="conditionParamRef.containsKey('carouselPicList') and conditionParamRef.carouselPicList.size() > 0">
             ${_conditionType_} a.carouselPic in
             <foreach collection="conditionParamRef.carouselPicList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('carouselPicNotList')">
+        <if test="conditionParamRef.containsKey('carouselPicNotList') and conditionParamRef.carouselPicNotList.size() > 0">
             ${_conditionType_} a.carouselPic not in
             <foreach collection="conditionParamRef.carouselPicNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('countdown')">
+            <if test="conditionParamRef.countdown != null ">
+                ${_conditionType_} a.countdown = #{${_conditionParam_}.countdown}
+            </if>
+            <if test="conditionParamRef.countdown == null">
+                ${_conditionType_} a.countdown is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('countdownList') and conditionParamRef.countdownList.size() > 0">
+            ${_conditionType_} a.countdown in
+            <foreach collection="conditionParamRef.countdownList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('countdownNotList') and conditionParamRef.countdownNotList.size() > 0">
+            ${_conditionType_} a.countdown not in
+            <foreach collection="conditionParamRef.countdownNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('countdownStart') and conditionParamRef.countdownStart != null">
+            ${_conditionType_} a.countdown <![CDATA[ >= ]]> #{${_conditionParam_}.countdownStart}
+        </if>
+        <if test="conditionParamRef.containsKey('countdownEnd') and conditionParamRef.countdownEnd != null">
+            ${_conditionType_} a.countdown <![CDATA[ <= ]]> #{${_conditionParam_}.countdownEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -953,6 +1002,11 @@
                     <if test='orderCol.carouselPic != null and "DESC".equalsIgnoreCase(orderCol.carouselPic)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('countdown')">
+                    a.countdown
+                    <if test='orderCol.countdown != null and "DESC".equalsIgnoreCase(orderCol.countdown)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>