基础配置增加轮播图

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

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.sst.model.vo.SstBasicVo;
 /**
-* 基础配置实体对象
-*
-* @author zxfei
-* @date 2022-12-26
-*/
+ * 基础配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-02-27
+ */
 
 public class SstBasicEntity extends SstBasicVo {
     private static final long serialVersionUID = 1L;
@@ -64,6 +64,10 @@ public class SstBasicEntity extends SstBasicVo {
      * 启用长辈模式0不启用1启用
      */
     private Integer elderEnable;
+    /**
+     * 轮播图图片地址
+     */
+    private String carouselPic;
 
 
 
@@ -236,6 +240,20 @@ public class SstBasicEntity extends SstBasicVo {
     public void setElderEnable(Integer elderEnable){
         this.elderEnable = elderEnable;
     }
+    /**
+     * 获取 轮播图图片地址
+     * @return String
+     */
+    public String getCarouselPic(){
+        return carouselPic;
+    }
+    /**
+     * 设置 轮播图图片地址
+     * @param carouselPic
+     */
+    public void setCarouselPic(String carouselPic){
+        this.carouselPic = carouselPic;
+    }
 
 
 
@@ -270,6 +288,7 @@ public class SstBasicEntity extends SstBasicVo {
         sb.append(",organizer:").append(getOrganizer());
         sb.append(",record:").append(getRecord());
         sb.append(",elderEnable:").append(getElderEnable());
+        sb.append(",carouselPic:").append(getCarouselPic());
         return sb.toString();
     }
 
@@ -298,5 +317,7 @@ public class SstBasicEntity extends SstBasicVo {
         this.record = "";
 
         this.elderEnable = 1;
+
+        this.carouselPic = "";
     }
 }
\ No newline at end of file

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

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.sst.model;
 import java.util.List;
 import com.mortals.xhx.module.sst.model.SstBasicEntity;
 /**
-* 基础配置查询对象
-*
-* @author zxfei
-* @date 2022-12-26
-*/
+ * 基础配置查询对象
+ *
+ * @author zxfei
+ * @date 2023-02-27
+ */
 public class SstBasicQuery extends SstBasicEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -21,6 +21,9 @@ public class SstBasicQuery extends SstBasicEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 开始 站点id */
     private Long siteIdStart;
 
@@ -33,18 +36,29 @@ public class SstBasicQuery extends SstBasicEntity {
     /** 站点id列表 */
     private List <Long> siteIdList;
 
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 标题名称 */
     private List<String> titleNameList;
 
+    /** 标题名称排除列表 */
+    private List <String> titleNameNotList;
     /** Logo图片地址 */
     private List<String> logoUrlList;
 
+    /** Logo图片地址排除列表 */
+    private List <String> logoUrlNotList;
     /** 小程序二维码图片地址 */
     private List<String> appletCodeList;
 
+    /** 小程序二维码图片地址排除列表 */
+    private List <String> appletCodeNotList;
     /** 微信微博二维码图片地址 */
     private List<String> wechatCodeList;
 
+    /** 微信微博二维码图片地址排除列表 */
+    private List <String> wechatCodeNotList;
     /** 开始 屏保时间单位分 */
     private Integer saverTimeStart;
 
@@ -57,21 +71,34 @@ public class SstBasicQuery extends SstBasicEntity {
     /** 屏保时间单位分列表 */
     private List <Integer> saverTimeList;
 
+    /** 屏保时间单位分排除列表 */
+    private List <Integer> saverTimeNotList;
+
     /** 屏保图片地址 */
     private List<String> saverPicList;
 
+    /** 屏保图片地址排除列表 */
+    private List <String> saverPicNotList;
     /** 技术支持 */
     private List<String> supportList;
 
+    /** 技术支持排除列表 */
+    private List <String> supportNotList;
     /** 主办单位 */
     private List<String> sponsorList;
 
+    /** 主办单位排除列表 */
+    private List <String> sponsorNotList;
     /** 承办单位 */
     private List<String> organizerList;
 
+    /** 承办单位排除列表 */
+    private List <String> organizerNotList;
     /** 备案号 */
     private List<String> recordList;
 
+    /** 备案号排除列表 */
+    private List <String> recordNotList;
     /** 开始 启用长辈模式0不启用1启用 */
     private Integer elderEnableStart;
 
@@ -84,6 +111,9 @@ public class SstBasicQuery extends SstBasicEntity {
     /** 启用长辈模式0不启用1启用列表 */
     private List <Integer> elderEnableList;
 
+    /** 启用长辈模式0不启用1启用排除列表 */
+    private List <Integer> elderEnableNotList;
+
     /** 开始 创建用户 */
     private Long createUserIdStart;
 
@@ -96,6 +126,9 @@ public class SstBasicQuery extends SstBasicEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -114,12 +147,20 @@ public class SstBasicQuery extends SstBasicEntity {
     /** 更新用户列表 */
     private List <Long> updateUserIdList;
 
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
     /** 开始 更新时间 */
     private String updateTimeStart;
 
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 轮播图图片地址 */
+    private List<String> carouselPicList;
+
+    /** 轮播图图片地址排除列表 */
+    private List <String> carouselPicNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SstBasicQuery> orConditionList;
 
@@ -192,6 +233,23 @@ public class SstBasicQuery extends SstBasicEntity {
         this.idList = idList;
     }
 
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
     /**
      * 获取 开始 站点id
      * @return siteIdStart
@@ -256,6 +314,23 @@ public class SstBasicQuery extends SstBasicEntity {
         this.siteIdList = siteIdList;
     }
 
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 获取 标题名称
      * @return titleNameList
@@ -271,6 +346,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setTitleNameList(List<String> titleNameList){
         this.titleNameList = titleNameList;
     }
+
+    /**
+     * 获取 标题名称
+     * @return titleNameNotList
+     */
+    public List<String> getTitleNameNotList(){
+        return this.titleNameNotList;
+    }
+
+    /**
+     * 设置 标题名称
+     * @param titleNameNotList
+     */
+    public void setTitleNameNotList(List<String> titleNameNotList){
+        this.titleNameNotList = titleNameNotList;
+    }
+
     /**
      * 获取 Logo图片地址
      * @return logoUrlList
@@ -286,6 +378,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setLogoUrlList(List<String> logoUrlList){
         this.logoUrlList = logoUrlList;
     }
+
+    /**
+     * 获取 Logo图片地址
+     * @return logoUrlNotList
+     */
+    public List<String> getLogoUrlNotList(){
+        return this.logoUrlNotList;
+    }
+
+    /**
+     * 设置 Logo图片地址
+     * @param logoUrlNotList
+     */
+    public void setLogoUrlNotList(List<String> logoUrlNotList){
+        this.logoUrlNotList = logoUrlNotList;
+    }
+
     /**
      * 获取 小程序二维码图片地址
      * @return appletCodeList
@@ -301,6 +410,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setAppletCodeList(List<String> appletCodeList){
         this.appletCodeList = appletCodeList;
     }
+
+    /**
+     * 获取 小程序二维码图片地址
+     * @return appletCodeNotList
+     */
+    public List<String> getAppletCodeNotList(){
+        return this.appletCodeNotList;
+    }
+
+    /**
+     * 设置 小程序二维码图片地址
+     * @param appletCodeNotList
+     */
+    public void setAppletCodeNotList(List<String> appletCodeNotList){
+        this.appletCodeNotList = appletCodeNotList;
+    }
+
     /**
      * 获取 微信微博二维码图片地址
      * @return wechatCodeList
@@ -316,6 +442,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setWechatCodeList(List<String> wechatCodeList){
         this.wechatCodeList = wechatCodeList;
     }
+
+    /**
+     * 获取 微信微博二维码图片地址
+     * @return wechatCodeNotList
+     */
+    public List<String> getWechatCodeNotList(){
+        return this.wechatCodeNotList;
+    }
+
+    /**
+     * 设置 微信微博二维码图片地址
+     * @param wechatCodeNotList
+     */
+    public void setWechatCodeNotList(List<String> wechatCodeNotList){
+        this.wechatCodeNotList = wechatCodeNotList;
+    }
+
     /**
      * 获取 开始 屏保时间单位分
      * @return saverTimeStart
@@ -380,6 +523,23 @@ public class SstBasicQuery extends SstBasicEntity {
         this.saverTimeList = saverTimeList;
     }
 
+    /**
+     * 获取 屏保时间单位分
+     * @return saverTimeNotList
+     */
+    public List<Integer> getSaverTimeNotList(){
+        return this.saverTimeNotList;
+    }
+
+    /**
+     * 设置 屏保时间单位分
+     * @param saverTimeNotList
+     */
+    public void setSaverTimeNotList(List<Integer> saverTimeNotList){
+        this.saverTimeNotList = saverTimeNotList;
+    }
+
+
     /**
      * 获取 屏保图片地址
      * @return saverPicList
@@ -395,6 +555,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setSaverPicList(List<String> saverPicList){
         this.saverPicList = saverPicList;
     }
+
+    /**
+     * 获取 屏保图片地址
+     * @return saverPicNotList
+     */
+    public List<String> getSaverPicNotList(){
+        return this.saverPicNotList;
+    }
+
+    /**
+     * 设置 屏保图片地址
+     * @param saverPicNotList
+     */
+    public void setSaverPicNotList(List<String> saverPicNotList){
+        this.saverPicNotList = saverPicNotList;
+    }
+
     /**
      * 获取 技术支持
      * @return supportList
@@ -410,6 +587,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setSupportList(List<String> supportList){
         this.supportList = supportList;
     }
+
+    /**
+     * 获取 技术支持
+     * @return supportNotList
+     */
+    public List<String> getSupportNotList(){
+        return this.supportNotList;
+    }
+
+    /**
+     * 设置 技术支持
+     * @param supportNotList
+     */
+    public void setSupportNotList(List<String> supportNotList){
+        this.supportNotList = supportNotList;
+    }
+
     /**
      * 获取 主办单位
      * @return sponsorList
@@ -425,6 +619,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setSponsorList(List<String> sponsorList){
         this.sponsorList = sponsorList;
     }
+
+    /**
+     * 获取 主办单位
+     * @return sponsorNotList
+     */
+    public List<String> getSponsorNotList(){
+        return this.sponsorNotList;
+    }
+
+    /**
+     * 设置 主办单位
+     * @param sponsorNotList
+     */
+    public void setSponsorNotList(List<String> sponsorNotList){
+        this.sponsorNotList = sponsorNotList;
+    }
+
     /**
      * 获取 承办单位
      * @return organizerList
@@ -440,6 +651,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setOrganizerList(List<String> organizerList){
         this.organizerList = organizerList;
     }
+
+    /**
+     * 获取 承办单位
+     * @return organizerNotList
+     */
+    public List<String> getOrganizerNotList(){
+        return this.organizerNotList;
+    }
+
+    /**
+     * 设置 承办单位
+     * @param organizerNotList
+     */
+    public void setOrganizerNotList(List<String> organizerNotList){
+        this.organizerNotList = organizerNotList;
+    }
+
     /**
      * 获取 备案号
      * @return recordList
@@ -455,6 +683,23 @@ public class SstBasicQuery extends SstBasicEntity {
     public void setRecordList(List<String> recordList){
         this.recordList = recordList;
     }
+
+    /**
+     * 获取 备案号
+     * @return recordNotList
+     */
+    public List<String> getRecordNotList(){
+        return this.recordNotList;
+    }
+
+    /**
+     * 设置 备案号
+     * @param recordNotList
+     */
+    public void setRecordNotList(List<String> recordNotList){
+        this.recordNotList = recordNotList;
+    }
+
     /**
      * 获取 开始 启用长辈模式0不启用1启用
      * @return elderEnableStart
@@ -519,6 +764,23 @@ public class SstBasicQuery extends SstBasicEntity {
         this.elderEnableList = elderEnableList;
     }
 
+    /**
+     * 获取 启用长辈模式0不启用1启用
+     * @return elderEnableNotList
+     */
+    public List<Integer> getElderEnableNotList(){
+        return this.elderEnableNotList;
+    }
+
+    /**
+     * 设置 启用长辈模式0不启用1启用
+     * @param elderEnableNotList
+     */
+    public void setElderEnableNotList(List<Integer> elderEnableNotList){
+        this.elderEnableNotList = elderEnableNotList;
+    }
+
+
     /**
      * 获取 开始 创建用户
      * @return createUserIdStart
@@ -583,6 +845,23 @@ public class SstBasicQuery extends SstBasicEntity {
         this.createUserIdList = createUserIdList;
     }
 
+    /**
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -679,6 +958,23 @@ public class SstBasicQuery extends SstBasicEntity {
         this.updateUserIdList = updateUserIdList;
     }
 
+    /**
+     * 获取 更新用户
+     * @return updateUserIdNotList
+     */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 更新时间
      * @return updateTimeStart
@@ -711,6 +1007,38 @@ public class SstBasicQuery extends SstBasicEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 轮播图图片地址
+     * @return carouselPicList
+     */
+    public List<String> getCarouselPicList(){
+        return this.carouselPicList;
+    }
+
+    /**
+     * 设置 轮播图图片地址
+     * @param carouselPicList
+     */
+    public void setCarouselPicList(List<String> carouselPicList){
+        this.carouselPicList = carouselPicList;
+    }
+
+    /**
+     * 获取 轮播图图片地址
+     * @return carouselPicNotList
+     */
+    public List<String> getCarouselPicNotList(){
+        return this.carouselPicNotList;
+    }
+
+    /**
+     * 设置 轮播图图片地址
+     * @param carouselPicNotList
+     */
+    public void setCarouselPicNotList(List<String> carouselPicNotList){
+        this.carouselPicNotList = carouselPicNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -756,6 +1084,15 @@ public class SstBasicQuery extends SstBasicEntity {
         return this;
     }
 
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public SstBasicQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
     /**
      * 设置  站点id
      * @param siteId
@@ -801,6 +1138,15 @@ public class SstBasicQuery extends SstBasicEntity {
         return this;
     }
 
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public SstBasicQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 标题名称
@@ -922,6 +1268,15 @@ public class SstBasicQuery extends SstBasicEntity {
         return this;
     }
 
+    /**
+     * 设置 屏保时间单位分
+     * @param saverTimeNotList
+     */
+    public SstBasicQuery saverTimeNotList(List<Integer> saverTimeNotList){
+        this.saverTimeNotList = saverTimeNotList;
+        return this;
+    }
+
 
     /**
      * 设置 屏保图片地址
@@ -1062,6 +1417,15 @@ public class SstBasicQuery extends SstBasicEntity {
         return this;
     }
 
+    /**
+     * 设置 启用长辈模式0不启用1启用
+     * @param elderEnableNotList
+     */
+    public SstBasicQuery elderEnableNotList(List<Integer> elderEnableNotList){
+        this.elderEnableNotList = elderEnableNotList;
+        return this;
+    }
+
     /**
      * 设置  创建用户
      * @param createUserId
@@ -1107,6 +1471,15 @@ public class SstBasicQuery extends SstBasicEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public SstBasicQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置  更新用户
@@ -1153,6 +1526,34 @@ public class SstBasicQuery extends SstBasicEntity {
         return this;
     }
 
+    /**
+     * 设置 更新用户
+     * @param updateUserIdNotList
+     */
+    public SstBasicQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+    }
+
+
+
+    /**
+     * 设置 轮播图图片地址
+     * @param carouselPic
+     */
+    public SstBasicQuery carouselPic(String carouselPic){
+        setCarouselPic(carouselPic);
+        return this;
+    }
+
+    /**
+     * 设置 轮播图图片地址
+     * @param carouselPicList
+     */
+    public SstBasicQuery carouselPicList(List<String> carouselPicList){
+        this.carouselPicList = carouselPicList;
+        return this;
+    }
 
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.sst.dao.ibatis.SstBasicDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -22,6 +22,7 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="carouselPic" column="carouselPic" />
 
     </resultMap>
 
@@ -80,23 +81,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('carouselPic') or colPickMode == 1 and data.containsKey('carouselPic')))">
+                a.carouselPic,
+            </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)
+        (siteId,titleName,logoUrl,appletCode,wechatCode,saverTime,saverPic,support,sponsor,organizer,record,elderEnable,createUserId,createTime,updateUserId,updateTime,carouselPic)
         VALUES
-        (#{siteId},#{titleName},#{logoUrl},#{appletCode},#{wechatCode},#{saverTime},#{saverPic},#{support},#{sponsor},#{organizer},#{record},#{elderEnable},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{titleName},#{logoUrl},#{appletCode},#{wechatCode},#{saverTime},#{saverPic},#{support},#{sponsor},#{organizer},#{record},#{elderEnable},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{carouselPic})
     </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)
+        (siteId,titleName,logoUrl,appletCode,wechatCode,saverTime,saverPic,support,sponsor,organizer,record,elderEnable,createUserId,createTime,updateUserId,updateTime,carouselPic)
         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.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})
         </foreach>
     </insert>
 
@@ -169,6 +173,9 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('carouselPic')) or (colPickMode==1 and !data.containsKey('carouselPic'))">
+                a.carouselPic=#{data.carouselPic},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -318,6 +325,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="carouselPic=(case" suffix="ELSE carouselPic end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('carouselPic')) or (colPickMode==1 and !item.containsKey('carouselPic'))">
+                        when a.id=#{item.id} then #{item.carouselPic}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -448,6 +462,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('idNotList')">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
             ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
         </if>
@@ -469,6 +489,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList')">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
             ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
         </if>
@@ -491,6 +517,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('titleNameNotList')">
+            ${_conditionType_} a.titleName not in
+            <foreach collection="conditionParamRef.titleNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('logoUrl')">
             <if test="conditionParamRef.logoUrl != null and conditionParamRef.logoUrl != ''">
@@ -506,6 +538,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('logoUrlNotList')">
+            ${_conditionType_} a.logoUrl not in
+            <foreach collection="conditionParamRef.logoUrlNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('appletCode')">
             <if test="conditionParamRef.appletCode != null and conditionParamRef.appletCode != ''">
@@ -521,6 +559,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('appletCodeNotList')">
+            ${_conditionType_} a.appletCode not in
+            <foreach collection="conditionParamRef.appletCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('wechatCode')">
             <if test="conditionParamRef.wechatCode != null and conditionParamRef.wechatCode != ''">
@@ -536,6 +580,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('wechatCodeNotList')">
+            ${_conditionType_} a.wechatCode not in
+            <foreach collection="conditionParamRef.wechatCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('saverTime')">
             <if test="conditionParamRef.saverTime != null ">
                 ${_conditionType_} a.saverTime = #{${_conditionParam_}.saverTime}
@@ -550,6 +600,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('saverTimeNotList')">
+            ${_conditionType_} a.saverTime not in
+            <foreach collection="conditionParamRef.saverTimeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('saverTimeStart') and conditionParamRef.saverTimeStart != null">
             ${_conditionType_} a.saverTime <![CDATA[ >= ]]> #{${_conditionParam_}.saverTimeStart}
         </if>
@@ -572,6 +628,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('saverPicNotList')">
+            ${_conditionType_} a.saverPic not in
+            <foreach collection="conditionParamRef.saverPicNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('support')">
             <if test="conditionParamRef.support != null and conditionParamRef.support != ''">
@@ -587,6 +649,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('supportNotList')">
+            ${_conditionType_} a.support not in
+            <foreach collection="conditionParamRef.supportNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('sponsor')">
             <if test="conditionParamRef.sponsor != null and conditionParamRef.sponsor != ''">
@@ -602,6 +670,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('sponsorNotList')">
+            ${_conditionType_} a.sponsor not in
+            <foreach collection="conditionParamRef.sponsorNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('organizer')">
             <if test="conditionParamRef.organizer != null and conditionParamRef.organizer != ''">
@@ -617,6 +691,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('organizerNotList')">
+            ${_conditionType_} a.organizer not in
+            <foreach collection="conditionParamRef.organizerNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('record')">
             <if test="conditionParamRef.record != null and conditionParamRef.record != ''">
@@ -632,6 +712,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('recordNotList')">
+            ${_conditionType_} a.record not in
+            <foreach collection="conditionParamRef.recordNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('elderEnable')">
             <if test="conditionParamRef.elderEnable != null ">
                 ${_conditionType_} a.elderEnable = #{${_conditionParam_}.elderEnable}
@@ -646,6 +732,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('elderEnableNotList')">
+            ${_conditionType_} a.elderEnable not in
+            <foreach collection="conditionParamRef.elderEnableNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('elderEnableStart') and conditionParamRef.elderEnableStart != null">
             ${_conditionType_} a.elderEnable <![CDATA[ >= ]]> #{${_conditionParam_}.elderEnableStart}
         </if>
@@ -667,6 +759,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            ${_conditionType_} a.createUserId not in
+            <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
             ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
         </if>
@@ -703,6 +801,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+            ${_conditionType_} a.updateUserId not in
+            <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
             ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
         </if>
@@ -725,6 +829,27 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+
+        <if test="conditionParamRef.containsKey('carouselPic')">
+            <if test="conditionParamRef.carouselPic != null and conditionParamRef.carouselPic != ''">
+                ${_conditionType_} a.carouselPic like #{${_conditionParam_}.carouselPic}
+            </if>
+            <if test="conditionParamRef.carouselPic == null">
+                ${_conditionType_} a.carouselPic is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('carouselPicList')">
+            ${_conditionType_} a.carouselPic in
+            <foreach collection="conditionParamRef.carouselPicList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('carouselPicNotList')">
+            ${_conditionType_} a.carouselPic not in
+            <foreach collection="conditionParamRef.carouselPicNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -823,6 +948,11 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('carouselPic')">
+                    a.carouselPic
+                    <if test='orderCol.carouselPic != null and "DESC".equalsIgnoreCase(orderCol.carouselPic)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>