添加首页统计模块

bill-manager/db/add.sql

@@ -50,59 +50,7 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='排号汇总';
 
 
--- ----------------------------
--- 排号汇总统计表
--- ----------------------------
-DROP TABLE IF EXISTS `mortals_xhx_ph_queue_stat`;
-CREATE TABLE `mortals_xhx_ph_queue_stat` (
-    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-    `site_id` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
-    `site_code` varchar(128)      COMMENT '站点编码',
-    `site_name` varchar(128)      COMMENT '站点名称',
-    `business` varchar(128) NOT NULL     COMMENT '业务名',
-    `section_name` varchar(128) NOT NULL     COMMENT '部门',
-    `hall_name` varchar(128) DEFAULT NULL COMMENT '大厅名称',
-    `wait_time` int(9) DEFAULT '0' COMMENT '平均等待时间,单位s',
-    `window_fromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
-    `ph_count` int(9) NOT NULL COMMENT '取号数量',
-    `year` int(9) NOT NULL COMMENT '年',
-    `month` int(9) NOT NULL COMMENT '月',
-    `day` int(9) NOT NULL COMMENT '日',
-    `createTime` datetime NOT NULL COMMENT '创建时间',
-    `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
-    `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`) USING BTREE
-,KEY `year` (`year`) USING BTREE
-,KEY `month` (`month`) USING BTREE
-,KEY `day` (`day`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='排队叫号汇总统计';
-
 
--- ----------------------------
--- 评价汇总表
--- ----------------------------
-DROP TABLE IF EXISTS `mortals_xhx_pj_evaluate_stat`;
-CREATE TABLE `mortals_xhx_pj_evaluate_stat` (
-`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-`site_id` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
-`site_code` varchar(128)      COMMENT '站点编码',
-`site_name` varchar(128)      COMMENT '站点名称',
-`section_name` varchar(128) NOT NULL     COMMENT '部门',
-`pj_option` varchar(32) NOT NULL     COMMENT '评价选项(非常满意,满意,基本满意,不满意,非常不满意)',
-`window_fromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
-`hall_name` varchar(128) DEFAULT NULL COMMENT '大厅名称',
-`pj_count` int(9) NOT NULL COMMENT '评价数量',
-`year` int(9) NOT NULL COMMENT '年',
-`month` int(9) NOT NULL COMMENT '月',
-`day` int(9) NOT NULL COMMENT '日',
-`createTime` datetime NOT NULL COMMENT '创建时间',
-`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
-`updateTime` datetime DEFAULT NULL COMMENT '更新时间',
-PRIMARY KEY (`id`) USING BTREE
-    ,KEY `year` (`year`) USING BTREE
-    ,KEY `month` (`month`) USING BTREE
-    ,KEY `day` (`day`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='评价汇总统计';
 
 
 -- ----------------------------
@@ -202,6 +150,59 @@ CREATE TABLE mortals_xhx_access_system(
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='区域接入系统';
 
 
+-- ----------------------------
+-- 排号汇总统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_ph_queue_stat`;
+CREATE TABLE `mortals_xhx_ph_queue_stat` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `siteId` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
+    `siteCode` varchar(128)      COMMENT '站点编码',
+    `siteName` varchar(128)      COMMENT '站点名称',
+    `business` varchar(128) NOT NULL     COMMENT '业务名',
+    `sectionName` varchar(128) NOT NULL     COMMENT '部门',
+    `hallName` varchar(128) DEFAULT NULL COMMENT '大厅名称',
+    `windowFromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
+    `waitTime` int(9) DEFAULT '0' COMMENT '平均等待时间,单位s',
+    `phCount` int(9) NOT NULL COMMENT '取号数量',
+    `year` int(9) NOT NULL COMMENT '年',
+    `month` int(9) NOT NULL COMMENT '月',
+    `day` int(9) NOT NULL COMMENT '日',
+    `createTime` datetime NOT NULL COMMENT '创建时间',
+    `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+    `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+,KEY `year` (`year`) USING BTREE
+,KEY `month` (`month`) USING BTREE
+,KEY `day` (`day`) USING BTREE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='排队叫号汇总统计';
+
+
+-- ----------------------------
+-- 评价汇总表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_pj_evaluate_stat`;
+CREATE TABLE `mortals_xhx_pj_evaluate_stat` (
+`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+`siteId` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
+`siteCode` varchar(128)      COMMENT '站点编码',
+`siteName` varchar(128)      COMMENT '站点名称',
+`sectionName` varchar(128) NOT NULL     COMMENT '部门',
+`pjOption` varchar(32) NOT NULL     COMMENT '评价选项(非常满意,满意,基本满意,不满意,非常不满意)',
+`windowFromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
+`hallName` varchar(128) DEFAULT NULL COMMENT '大厅名称',
+`pjCount` int(9) NOT NULL COMMENT '评价数量',
+`year` int(9) NOT NULL COMMENT '年',
+`month` int(9) NOT NULL COMMENT '月',
+`day` int(9) NOT NULL COMMENT '日',
+`createTime` datetime NOT NULL COMMENT '创建时间',
+`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+`updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+PRIMARY KEY (`id`) USING BTREE
+    ,KEY `year` (`year`) USING BTREE
+    ,KEY `month` (`month`) USING BTREE
+    ,KEY `day` (`day`) USING BTREE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='评价汇总统计';
 
 -- ----------------------------
 -- 汇总统计表
@@ -209,16 +210,16 @@ CREATE TABLE mortals_xhx_access_system(
 DROP TABLE IF EXISTS `mortals_xhx_stat`;
 CREATE TABLE `mortals_xhx_stat` (
     `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-    `site_id` bigint(20)      COMMENT '站点Id',
-    `site_code` varchar(128)  DEFAULT ''     COMMENT '站点编码',
-    `site_name` varchar(128)  DEFAULT ''    COMMENT '站点名称',
+    `siteId` bigint(20)      COMMENT '站点Id',
+    `siteCode` varchar(128)  DEFAULT ''     COMMENT '站点编码',
+    `siteName` varchar(128)  DEFAULT ''    COMMENT '站点名称',
     `count` int(9) NOT NULL COMMENT '数量',
     `year` int(9) NOT NULL COMMENT '年',
     `month` int(9) NOT NULL COMMENT '月',
     `day` int(9) NOT NULL COMMENT '日',
-    `create_user_id` bigint(20)      COMMENT '创建用户',
-    `create_time` datetime NOT NULL     COMMENT '创建时间',
-    `update_time` datetime      COMMENT '更新时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateTime` datetime      COMMENT '更新时间',
     PRIMARY KEY (`id`) USING BTREE
     ,KEY `year` (`year`) USING BTREE
     ,KEY `month` (`month`) USING BTREE

bill-manager/src/main/resources/sqlmap/module/ph/PhQueueStatMapper.xml

@@ -6,21 +6,21 @@
     <!-- 字段和属性映射 -->
     <resultMap type="PhQueueStatEntity" id="PhQueueStatEntity-Map">
         <id  property="id" column="id" />
-        <result property="siteId" column="site_id" />
-        <result property="siteCode" column="site_code" />
-        <result property="siteName" column="site_name" />
         <result property="business" column="business" />
-        <result property="sectionName" column="section_name" />
-        <result property="hallName" column="hall_name" />
-        <result property="waitTime" column="wait_time" />
-        <result property="windowFromnum" column="window_fromnum" />
-        <result property="phCount" column="ph_count" />
         <result property="year" column="year" />
         <result property="month" column="month" />
         <result property="day" column="day" />
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="siteId" column="siteId" />
+        <result property="siteCode" column="siteCode" />
+        <result property="siteName" column="siteName" />
+        <result property="sectionName" column="sectionName" />
+        <result property="hallName" column="hallName" />
+        <result property="windowFromnum" column="windowFromnum" />
+        <result property="waitTime" column="waitTime" />
+        <result property="phCount" column="phCount" />
 
     </resultMap>
 
@@ -31,33 +31,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                 a.id,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
-                a.site_id,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
-                a.site_code,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
-                a.site_name,
-            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('business') or colPickMode == 1 and data.containsKey('business')))">
                 a.business,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sectionName') or colPickMode == 1 and data.containsKey('sectionName')))">
-                a.section_name,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
-                a.hall_name,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('waitTime') or colPickMode == 1 and data.containsKey('waitTime')))">
-                a.wait_time,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowFromnum') or colPickMode == 1 and data.containsKey('windowFromnum')))">
-                a.window_fromnum,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phCount') or colPickMode == 1 and data.containsKey('phCount')))">
-                a.ph_count,
-            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
                 a.year,
             </if>
@@ -76,23 +52,47 @@
             <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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                a.siteCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                a.siteName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sectionName') or colPickMode == 1 and data.containsKey('sectionName')))">
+                a.sectionName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                a.hallName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowFromnum') or colPickMode == 1 and data.containsKey('windowFromnum')))">
+                a.windowFromnum,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('waitTime') or colPickMode == 1 and data.containsKey('waitTime')))">
+                a.waitTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phCount') or colPickMode == 1 and data.containsKey('phCount')))">
+                a.phCount,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PhQueueStatEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_ph_queue_stat
-        (site_id,site_code,site_name,business,section_name,hall_name,wait_time,window_fromnum,ph_count,year,month,day,createTime,updateUserId,updateTime)
+        (business,year,month,day,createTime,updateUserId,updateTime,siteId,siteCode,siteName,sectionName,hallName,windowFromnum,waitTime,phCount)
         VALUES
-        (#{siteId},#{siteCode},#{siteName},#{business},#{sectionName},#{hallName},#{waitTime},#{windowFromnum},#{phCount},#{year},#{month},#{day},#{createTime},#{updateUserId},#{updateTime})
+        (#{business},#{year},#{month},#{day},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{siteCode},#{siteName},#{sectionName},#{hallName},#{windowFromnum},#{waitTime},#{phCount})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_ph_queue_stat
-        (site_id,site_code,site_name,business,section_name,hall_name,wait_time,window_fromnum,ph_count,year,month,day,createTime,updateUserId,updateTime)
+        (business,year,month,day,createTime,updateUserId,updateTime,siteId,siteCode,siteName,sectionName,hallName,windowFromnum,waitTime,phCount)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteCode},#{item.siteName},#{item.business},#{item.sectionName},#{item.hallName},#{item.waitTime},#{item.windowFromnum},#{item.phCount},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.business},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.sectionName},#{item.hallName},#{item.windowFromnum},#{item.waitTime},#{item.phCount})
         </foreach>
     </insert>
 
@@ -102,42 +102,9 @@
         update mortals_xhx_ph_queue_stat as a
         set
         <trim suffixOverrides="," suffix="">
-            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
-                a.site_id=#{data.siteId},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
-                a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
-                a.site_code=#{data.siteCode},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
-                a.site_name=#{data.siteName},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('business')) or (colPickMode==1 and !data.containsKey('business'))">
                 a.business=#{data.business},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('sectionName')) or (colPickMode==1 and !data.containsKey('sectionName'))">
-                a.section_name=#{data.sectionName},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
-                a.hall_name=#{data.hallName},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('waitTime')) or (colPickMode==1 and !data.containsKey('waitTime'))">
-                a.wait_time=#{data.waitTime},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('waitTimeIncrement')) or (colPickMode==1 and !data.containsKey('waitTimeIncrement'))">
-                a.wait_time=ifnull(a.wait_time,0) + #{data.waitTimeIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('windowFromnum')) or (colPickMode==1 and !data.containsKey('windowFromnum'))">
-                a.window_fromnum=#{data.windowFromnum},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('phCount')) or (colPickMode==1 and !data.containsKey('phCount'))">
-                a.ph_count=#{data.phCount},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('phCountIncrement')) or (colPickMode==1 and !data.containsKey('phCountIncrement'))">
-                a.ph_count=ifnull(a.ph_count,0) + #{data.phCountIncrement},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('year')) or (colPickMode==1 and !data.containsKey('year'))">
                 a.year=#{data.year},
             </if>
@@ -168,6 +135,39 @@
             <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('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.siteCode=#{data.siteCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sectionName')) or (colPickMode==1 and !data.containsKey('sectionName'))">
+                a.sectionName=#{data.sectionName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hallName=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowFromnum')) or (colPickMode==1 and !data.containsKey('windowFromnum'))">
+                a.windowFromnum=#{data.windowFromnum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('waitTime')) or (colPickMode==1 and !data.containsKey('waitTime'))">
+                a.waitTime=#{data.waitTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('waitTimeIncrement')) or (colPickMode==1 and !data.containsKey('waitTimeIncrement'))">
+                a.waitTime=ifnull(a.waitTime,0) + #{data.waitTimeIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('phCount')) or (colPickMode==1 and !data.containsKey('phCount'))">
+                a.phCount=#{data.phCount},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('phCountIncrement')) or (colPickMode==1 and !data.containsKey('phCountIncrement'))">
+                a.phCount=ifnull(a.phCount,0) + #{data.phCountIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -180,32 +180,6 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_ph_queue_stat as a
         <trim prefix="set" suffixOverrides=",">
-            <trim prefix="site_id=(case" suffix="ELSE site_id end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
-                            when a.id=#{item.id} then #{item.siteId}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.site_id,0) + #{item.siteIdIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <trim prefix="site_code=(case" suffix="ELSE site_code end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
-                        when a.id=#{item.id} then #{item.siteCode}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="site_name=(case" suffix="ELSE site_name end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
-                        when a.id=#{item.id} then #{item.siteName}
-                    </if>
-                </foreach>
-            </trim>
             <trim prefix="business=(case" suffix="ELSE business end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('business')) or (colPickMode==1 and !item.containsKey('business'))">
@@ -213,51 +187,6 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="section_name=(case" suffix="ELSE section_name end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('sectionName')) or (colPickMode==1 and !item.containsKey('sectionName'))">
-                        when a.id=#{item.id} then #{item.sectionName}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="hall_name=(case" suffix="ELSE hall_name end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
-                        when a.id=#{item.id} then #{item.hallName}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="wait_time=(case" suffix="ELSE wait_time end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('waitTime')) or (colPickMode==1 and !item.containsKey('waitTime'))">
-                            when a.id=#{item.id} then #{item.waitTime}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('waitTimeIncrement')) or (colPickMode==1 and !item.containsKey('waitTimeIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.wait_time,0) + #{item.waitTimeIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <trim prefix="window_fromnum=(case" suffix="ELSE window_fromnum end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('windowFromnum')) or (colPickMode==1 and !item.containsKey('windowFromnum'))">
-                        when a.id=#{item.id} then #{item.windowFromnum}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="ph_count=(case" suffix="ELSE ph_count end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('phCount')) or (colPickMode==1 and !item.containsKey('phCount'))">
-                            when a.id=#{item.id} then #{item.phCount}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('phCountIncrement')) or (colPickMode==1 and !item.containsKey('phCountIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.ph_count,0) + #{item.phCountIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
             <trim prefix="year=(case" suffix="ELSE year end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -320,6 +249,77 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                        when a.id=#{item.id} then #{item.siteCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                        when a.id=#{item.id} then #{item.siteName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="sectionName=(case" suffix="ELSE sectionName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('sectionName')) or (colPickMode==1 and !item.containsKey('sectionName'))">
+                        when a.id=#{item.id} then #{item.sectionName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="hallName=(case" suffix="ELSE hallName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                        when a.id=#{item.id} then #{item.hallName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="windowFromnum=(case" suffix="ELSE windowFromnum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('windowFromnum')) or (colPickMode==1 and !item.containsKey('windowFromnum'))">
+                        when a.id=#{item.id} then #{item.windowFromnum}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="waitTime=(case" suffix="ELSE waitTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('waitTime')) or (colPickMode==1 and !item.containsKey('waitTime'))">
+                            when a.id=#{item.id} then #{item.waitTime}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('waitTimeIncrement')) or (colPickMode==1 and !item.containsKey('waitTimeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.waitTime,0) + #{item.waitTimeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="phCount=(case" suffix="ELSE phCount end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('phCount')) or (colPickMode==1 and !item.containsKey('phCount'))">
+                            when a.id=#{item.id} then #{item.phCount}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('phCountIncrement')) or (colPickMode==1 and !item.containsKey('phCountIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.phCount,0) + #{item.phCountIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -467,351 +467,351 @@
             ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
         </if>
 
-        <if test="conditionParamRef.containsKey('siteId')">
-            <if test="conditionParamRef.siteId != null ">
-                ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
+
+        <if test="conditionParamRef.containsKey('business')">
+            <if test="conditionParamRef.business != null and conditionParamRef.business != ''">
+                ${_conditionType_} a.business like #{${_conditionParam_}.business}
             </if>
-            <if test="conditionParamRef.siteId == null">
-                ${_conditionType_} a.site_id is null
+            <if test="conditionParamRef.business == null">
+                ${_conditionType_} a.business is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-            ${_conditionType_} a.site_id in
-            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('businessList') and conditionParamRef.businessList.size() > 0">
+            ${_conditionType_} a.business in
+            <foreach collection="conditionParamRef.businessList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
-            ${_conditionType_} a.site_id not in
-            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('businessNotList') and conditionParamRef.businessNotList.size() > 0">
+            ${_conditionType_} a.business not in
+            <foreach collection="conditionParamRef.businessNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
-            ${_conditionType_} a.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
-        </if>
-        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
-            ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
-        </if>
-
-
-        <if test="conditionParamRef.containsKey('siteCode')">
-            <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
-                ${_conditionType_} a.site_code like #{${_conditionParam_}.siteCode}
+        <if test="conditionParamRef.containsKey('year')">
+            <if test="conditionParamRef.year != null ">
+                ${_conditionType_} a.year = #{${_conditionParam_}.year}
             </if>
-            <if test="conditionParamRef.siteCode == null">
-                ${_conditionType_} a.site_code is null
+            <if test="conditionParamRef.year == null">
+                ${_conditionType_} a.year is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
-            ${_conditionType_} a.site_code in
-            <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
+            ${_conditionType_} a.year in
+            <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
-            ${_conditionType_} a.site_code not in
-            <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
+            ${_conditionType_} a.year not in
+            <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
+            ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
+        </if>
+        <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
+            ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('siteName')">
-            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
-                ${_conditionType_} a.site_name like #{${_conditionParam_}.siteName}
+        <if test="conditionParamRef.containsKey('month')">
+            <if test="conditionParamRef.month != null ">
+                ${_conditionType_} a.month = #{${_conditionParam_}.month}
             </if>
-            <if test="conditionParamRef.siteName == null">
-                ${_conditionType_} a.site_name is null
+            <if test="conditionParamRef.month == null">
+                ${_conditionType_} a.month is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
-            ${_conditionType_} a.site_name in
-            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
+        <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
+            ${_conditionType_} a.month in
+            <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
-            ${_conditionType_} a.site_name not in
-            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
+            ${_conditionType_} a.month not in
+            <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
+            ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
+        </if>
+        <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
+            ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('business')">
-            <if test="conditionParamRef.business != null and conditionParamRef.business != ''">
-                ${_conditionType_} a.business like #{${_conditionParam_}.business}
+        <if test="conditionParamRef.containsKey('day')">
+            <if test="conditionParamRef.day != null ">
+                ${_conditionType_} a.day = #{${_conditionParam_}.day}
             </if>
-            <if test="conditionParamRef.business == null">
-                ${_conditionType_} a.business is null
+            <if test="conditionParamRef.day == null">
+                ${_conditionType_} a.day is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('businessList') and conditionParamRef.businessList.size() > 0">
-            ${_conditionType_} a.business in
-            <foreach collection="conditionParamRef.businessList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
+            ${_conditionType_} a.day in
+            <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('businessNotList') and conditionParamRef.businessNotList.size() > 0">
-            ${_conditionType_} a.business not in
-            <foreach collection="conditionParamRef.businessNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
+            ${_conditionType_} a.day not in
+            <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
+            ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
+        </if>
+        <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
+            ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('sectionName')">
-            <if test="conditionParamRef.sectionName != null and conditionParamRef.sectionName != ''">
-                ${_conditionType_} a.section_name like #{${_conditionParam_}.sectionName}
+
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.sectionName == null">
-                ${_conditionType_} a.section_name is null
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('sectionNameList') and conditionParamRef.sectionNameList.size() > 0">
-            ${_conditionType_} a.section_name in
-            <foreach collection="conditionParamRef.sectionNameList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserId')">
+            <if test="conditionParamRef.updateUserId != null ">
+                ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+            </if>
+            <if test="conditionParamRef.updateUserId == null">
+                ${_conditionType_} a.updateUserId is null
+            </if>
+        </if>
+        <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('sectionNameNotList') and conditionParamRef.sectionNameNotList.size() > 0">
-            ${_conditionType_} a.section_name not in
-            <foreach collection="conditionParamRef.sectionNameNotList" open="(" close=")" index="index" item="item" separator=",">
+        <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}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('hallName')">
-            <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
-                ${_conditionType_} a.hall_name like #{${_conditionParam_}.hallName}
+
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.hallName == null">
-                ${_conditionType_} a.hall_name is null
+            <if test="conditionParamRef.updateTime == null">
+                ${_conditionType_} a.updateTime is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
-            ${_conditionType_} a.hall_name in
-            <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
+        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
         </if>
-        <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
-            ${_conditionType_} a.hall_name not in
-            <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
+        <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('waitTime')">
-            <if test="conditionParamRef.waitTime != null ">
-                ${_conditionType_} a.wait_time = #{${_conditionParam_}.waitTime}
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
             </if>
-            <if test="conditionParamRef.waitTime == null">
-                ${_conditionType_} a.wait_time is null
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('waitTimeList') and conditionParamRef.waitTimeList.size() > 0">
-            ${_conditionType_} a.wait_time in
-            <foreach collection="conditionParamRef.waitTimeList" open="(" close=")" index="index" item="item" separator=",">
+        <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('waitTimeNotList') and conditionParamRef.waitTimeNotList.size() > 0">
-            ${_conditionType_} a.wait_time not in
-            <foreach collection="conditionParamRef.waitTimeNotList" open="(" close=")" index="index" item="item" separator=",">
+        <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}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('waitTimeStart') and conditionParamRef.waitTimeStart != null">
-            ${_conditionType_} a.wait_time <![CDATA[ >= ]]> #{${_conditionParam_}.waitTimeStart}
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
         </if>
-        <if test="conditionParamRef.containsKey('waitTimeEnd') and conditionParamRef.waitTimeEnd != null">
-            ${_conditionType_} a.wait_time <![CDATA[ <= ]]> #{${_conditionParam_}.waitTimeEnd}
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
         </if>
 
 
-        <if test="conditionParamRef.containsKey('windowFromnum')">
-            <if test="conditionParamRef.windowFromnum != null and conditionParamRef.windowFromnum != ''">
-                ${_conditionType_} a.window_fromnum like #{${_conditionParam_}.windowFromnum}
+        <if test="conditionParamRef.containsKey('siteCode')">
+            <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
             </if>
-            <if test="conditionParamRef.windowFromnum == null">
-                ${_conditionType_} a.window_fromnum is null
+            <if test="conditionParamRef.siteCode == null">
+                ${_conditionType_} a.siteCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('windowFromnumList') and conditionParamRef.windowFromnumList.size() > 0">
-            ${_conditionType_} a.window_fromnum in
-            <foreach collection="conditionParamRef.windowFromnumList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+            ${_conditionType_} a.siteCode in
+            <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('windowFromnumNotList') and conditionParamRef.windowFromnumNotList.size() > 0">
-            ${_conditionType_} a.window_fromnum not in
-            <foreach collection="conditionParamRef.windowFromnumNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+            ${_conditionType_} a.siteCode not in
+            <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('phCount')">
-            <if test="conditionParamRef.phCount != null ">
-                ${_conditionType_} a.ph_count = #{${_conditionParam_}.phCount}
+
+        <if test="conditionParamRef.containsKey('siteName')">
+            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
             </if>
-            <if test="conditionParamRef.phCount == null">
-                ${_conditionType_} a.ph_count is null
+            <if test="conditionParamRef.siteName == null">
+                ${_conditionType_} a.siteName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('phCountList') and conditionParamRef.phCountList.size() > 0">
-            ${_conditionType_} a.ph_count in
-            <foreach collection="conditionParamRef.phCountList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('phCountNotList') and conditionParamRef.phCountNotList.size() > 0">
-            ${_conditionType_} a.ph_count not in
-            <foreach collection="conditionParamRef.phCountNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('phCountStart') and conditionParamRef.phCountStart != null">
-            ${_conditionType_} a.ph_count <![CDATA[ >= ]]> #{${_conditionParam_}.phCountStart}
-        </if>
-        <if test="conditionParamRef.containsKey('phCountEnd') and conditionParamRef.phCountEnd != null">
-            ${_conditionType_} a.ph_count <![CDATA[ <= ]]> #{${_conditionParam_}.phCountEnd}
-        </if>
 
-        <if test="conditionParamRef.containsKey('year')">
-            <if test="conditionParamRef.year != null ">
-                ${_conditionType_} a.year = #{${_conditionParam_}.year}
+        <if test="conditionParamRef.containsKey('sectionName')">
+            <if test="conditionParamRef.sectionName != null and conditionParamRef.sectionName != ''">
+                ${_conditionType_} a.sectionName like #{${_conditionParam_}.sectionName}
             </if>
-            <if test="conditionParamRef.year == null">
-                ${_conditionType_} a.year is null
+            <if test="conditionParamRef.sectionName == null">
+                ${_conditionType_} a.sectionName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
-            ${_conditionType_} a.year in
-            <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('sectionNameList') and conditionParamRef.sectionNameList.size() > 0">
+            ${_conditionType_} a.sectionName in
+            <foreach collection="conditionParamRef.sectionNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
-            ${_conditionType_} a.year not in
-            <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('sectionNameNotList') and conditionParamRef.sectionNameNotList.size() > 0">
+            ${_conditionType_} a.sectionName not in
+            <foreach collection="conditionParamRef.sectionNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
-            ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
-        </if>
-        <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
-            ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
-        </if>
 
-        <if test="conditionParamRef.containsKey('month')">
-            <if test="conditionParamRef.month != null ">
-                ${_conditionType_} a.month = #{${_conditionParam_}.month}
+        <if test="conditionParamRef.containsKey('hallName')">
+            <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                ${_conditionType_} a.hallName like #{${_conditionParam_}.hallName}
             </if>
-            <if test="conditionParamRef.month == null">
-                ${_conditionType_} a.month is null
+            <if test="conditionParamRef.hallName == null">
+                ${_conditionType_} a.hallName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
-            ${_conditionType_} a.month in
-            <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+            ${_conditionType_} a.hallName in
+            <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
-            ${_conditionType_} a.month not in
-            <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+            ${_conditionType_} a.hallName not in
+            <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
-            ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
-        </if>
-        <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
-            ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
-        </if>
 
-        <if test="conditionParamRef.containsKey('day')">
-            <if test="conditionParamRef.day != null ">
-                ${_conditionType_} a.day = #{${_conditionParam_}.day}
+        <if test="conditionParamRef.containsKey('windowFromnum')">
+            <if test="conditionParamRef.windowFromnum != null and conditionParamRef.windowFromnum != ''">
+                ${_conditionType_} a.windowFromnum like #{${_conditionParam_}.windowFromnum}
             </if>
-            <if test="conditionParamRef.day == null">
-                ${_conditionType_} a.day is null
+            <if test="conditionParamRef.windowFromnum == null">
+                ${_conditionType_} a.windowFromnum is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
-            ${_conditionType_} a.day in
-            <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('windowFromnumList') and conditionParamRef.windowFromnumList.size() > 0">
+            ${_conditionType_} a.windowFromnum in
+            <foreach collection="conditionParamRef.windowFromnumList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
-            ${_conditionType_} a.day not in
-            <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('windowFromnumNotList') and conditionParamRef.windowFromnumNotList.size() > 0">
+            ${_conditionType_} a.windowFromnum not in
+            <foreach collection="conditionParamRef.windowFromnumNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
-            ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
-        </if>
-        <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
-            ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
-        </if>
-
-
-        <if test="conditionParamRef.containsKey('createTime')">
-            <if test="conditionParamRef.createTime != null ">
-                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
-            </if>
-            <if test="conditionParamRef.createTime == null">
-                ${_conditionType_} a.createTime is null
-            </if>
-        </if>
-        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('updateUserId')">
-            <if test="conditionParamRef.updateUserId != null ">
-                ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+        <if test="conditionParamRef.containsKey('waitTime')">
+            <if test="conditionParamRef.waitTime != null ">
+                ${_conditionType_} a.waitTime = #{${_conditionParam_}.waitTime}
             </if>
-            <if test="conditionParamRef.updateUserId == null">
-                ${_conditionType_} a.updateUserId is null
+            <if test="conditionParamRef.waitTime == null">
+                ${_conditionType_} a.waitTime is null
             </if>
         </if>
-        <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=",">
+        <if test="conditionParamRef.containsKey('waitTimeList') and conditionParamRef.waitTimeList.size() > 0">
+            ${_conditionType_} a.waitTime in
+            <foreach collection="conditionParamRef.waitTimeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <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=",">
+        <if test="conditionParamRef.containsKey('waitTimeNotList') and conditionParamRef.waitTimeNotList.size() > 0">
+            ${_conditionType_} a.waitTime not in
+            <foreach collection="conditionParamRef.waitTimeNotList" 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 test="conditionParamRef.containsKey('waitTimeStart') and conditionParamRef.waitTimeStart != null">
+            ${_conditionType_} a.waitTime <![CDATA[ >= ]]> #{${_conditionParam_}.waitTimeStart}
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-            ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+        <if test="conditionParamRef.containsKey('waitTimeEnd') and conditionParamRef.waitTimeEnd != null">
+            ${_conditionType_} a.waitTime <![CDATA[ <= ]]> #{${_conditionParam_}.waitTimeEnd}
         </if>
 
-
-        <if test="conditionParamRef.containsKey('updateTime')">
-            <if test="conditionParamRef.updateTime != null ">
-                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+        <if test="conditionParamRef.containsKey('phCount')">
+            <if test="conditionParamRef.phCount != null ">
+                ${_conditionType_} a.phCount = #{${_conditionParam_}.phCount}
             </if>
-            <if test="conditionParamRef.updateTime == null">
-                ${_conditionType_} a.updateTime is null
+            <if test="conditionParamRef.phCount == null">
+                ${_conditionType_} a.phCount is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('phCountList') and conditionParamRef.phCountList.size() > 0">
+            ${_conditionType_} a.phCount in
+            <foreach collection="conditionParamRef.phCountList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
-        <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 test="conditionParamRef.containsKey('phCountNotList') and conditionParamRef.phCountNotList.size() > 0">
+            ${_conditionType_} a.phCount not in
+            <foreach collection="conditionParamRef.phCountNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('phCountStart') and conditionParamRef.phCountStart != null">
+            ${_conditionType_} a.phCount <![CDATA[ >= ]]> #{${_conditionParam_}.phCountStart}
         </if>
+        <if test="conditionParamRef.containsKey('phCountEnd') and conditionParamRef.phCountEnd != null">
+            ${_conditionType_} a.phCount <![CDATA[ <= ]]> #{${_conditionParam_}.phCountEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -823,27 +823,6 @@
                 </foreach>
                 ,
             </if>
-            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                field(a.siteId,
-                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
-            <if test="conditionParamRef.containsKey('waitTimeList') and conditionParamRef.waitTimeList.size() > 0">
-                field(a.waitTime,
-                <foreach collection="conditionParamRef.waitTimeList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
-            <if test="conditionParamRef.containsKey('phCountList') and conditionParamRef.phCountList.size() > 0">
-                field(a.phCount,
-                <foreach collection="conditionParamRef.phCountList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
             <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
                 field(a.year,
                 <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
@@ -872,21 +851,6 @@
                 </foreach>
                 ,
             </if>
-            <trim suffixOverrides=","  suffix="">
-                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    a.${item.colName} ${item.sortKind}
-                </foreach>
-            </trim>
-        </if>
-        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
-            order by
-            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-                field(a.id,
-                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
             <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
                 field(a.siteId,
                 <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
@@ -908,6 +872,21 @@
                 </foreach>
                 ,
             </if>
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
                 field(a.year,
                 <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
@@ -936,57 +915,38 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('waitTimeList') and conditionParamRef.waitTimeList.size() > 0">
+                field(a.waitTime,
+                <foreach collection="conditionParamRef.waitTimeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('phCountList') and conditionParamRef.phCountList.size() > 0">
+                field(a.phCount,
+                <foreach collection="conditionParamRef.phCountList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
                     <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('siteId')">
-                    a.site_id
-                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('siteCode')">
-                    a.site_code
-                    <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('siteName')">
-                    a.site_name
-                    <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
-                    ,
-                </if>
                 <if test="orderCol.containsKey('business')">
                     a.business
                     <if test='orderCol.business != null and "DESC".equalsIgnoreCase(orderCol.business)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('sectionName')">
-                    a.section_name
-                    <if test='orderCol.sectionName != null and "DESC".equalsIgnoreCase(orderCol.sectionName)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('hallName')">
-                    a.hall_name
-                    <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('waitTime')">
-                    a.wait_time
-                    <if test='orderCol.waitTime != null and "DESC".equalsIgnoreCase(orderCol.waitTime)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('windowFromnum')">
-                    a.window_fromnum
-                    <if test='orderCol.windowFromnum != null and "DESC".equalsIgnoreCase(orderCol.windowFromnum)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('phCount')">
-                    a.ph_count
-                    <if test='orderCol.phCount != null and "DESC".equalsIgnoreCase(orderCol.phCount)'>DESC</if>
-                    ,
-                </if>
                 <if test="orderCol.containsKey('year')">
                     a.year
                     <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
@@ -1017,6 +977,46 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteCode')">
+                    a.siteCode
+                    <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteName')">
+                    a.siteName
+                    <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('sectionName')">
+                    a.sectionName
+                    <if test='orderCol.sectionName != null and "DESC".equalsIgnoreCase(orderCol.sectionName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('hallName')">
+                    a.hallName
+                    <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('windowFromnum')">
+                    a.windowFromnum
+                    <if test='orderCol.windowFromnum != null and "DESC".equalsIgnoreCase(orderCol.windowFromnum)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('waitTime')">
+                    a.waitTime
+                    <if test='orderCol.waitTime != null and "DESC".equalsIgnoreCase(orderCol.waitTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('phCount')">
+                    a.phCount
+                    <if test='orderCol.phCount != null and "DESC".equalsIgnoreCase(orderCol.phCount)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
 

bill-manager/src/main/resources/sqlmap/module/ph/PhQueueStatMapperExt.xml

@@ -11,12 +11,6 @@
                 ${item},
             </foreach>
         </if>
-        a.site_id,
-        a.site_code,
-        a.site_name,
-        a.section_name,
-        a.hall_name,
-        a.business,
         <!-- 平均等待时间-->
         avg(IFNULL(a.wait_time,0)) wait_time,
         <!-- 评价数量-->

bill-manager/src/main/resources/sqlmap/module/pj/PjEvaluateStatMapper.xml

@@ -6,20 +6,20 @@
     <!-- 字段和属性映射 -->
     <resultMap type="PjEvaluateStatEntity" id="PjEvaluateStatEntity-Map">
         <id  property="id" column="id" />
-        <result property="siteId" column="site_id" />
-        <result property="siteCode" column="site_code" />
-        <result property="siteName" column="site_name" />
-        <result property="sectionName" column="section_name" />
-        <result property="pjOption" column="pj_option" />
-        <result property="windowFromnum" column="window_fromnum" />
-        <result property="hallName" column="hall_name" />
-        <result property="pjCount" column="pj_count" />
         <result property="year" column="year" />
         <result property="month" column="month" />
         <result property="day" column="day" />
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="siteId" column="siteId" />
+        <result property="siteCode" column="siteCode" />
+        <result property="siteName" column="siteName" />
+        <result property="sectionName" column="sectionName" />
+        <result property="pjOption" column="pjOption" />
+        <result property="windowFromnum" column="windowFromnum" />
+        <result property="hallName" column="hallName" />
+        <result property="pjCount" column="pjCount" />
 
     </resultMap>
 
@@ -30,30 +30,6 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                 a.id,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
-                a.site_id,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
-                a.site_code,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
-                a.site_name,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sectionName') or colPickMode == 1 and data.containsKey('sectionName')))">
-                a.section_name,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjOption') or colPickMode == 1 and data.containsKey('pjOption')))">
-                a.pj_option,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowFromnum') or colPickMode == 1 and data.containsKey('windowFromnum')))">
-                a.window_fromnum,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
-                a.hall_name,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjCount') or colPickMode == 1 and data.containsKey('pjCount')))">
-                a.pj_count,
-            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
                 a.year,
             </if>
@@ -72,23 +48,47 @@
             <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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                a.siteCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                a.siteName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sectionName') or colPickMode == 1 and data.containsKey('sectionName')))">
+                a.sectionName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjOption') or colPickMode == 1 and data.containsKey('pjOption')))">
+                a.pjOption,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowFromnum') or colPickMode == 1 and data.containsKey('windowFromnum')))">
+                a.windowFromnum,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                a.hallName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pjCount') or colPickMode == 1 and data.containsKey('pjCount')))">
+                a.pjCount,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PjEvaluateStatEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_pj_evaluate_stat
-        (site_id,site_code,site_name,section_name,pj_option,window_fromnum,hall_name,pj_count,year,month,day,createTime,updateUserId,updateTime)
+        (year,month,day,createTime,updateUserId,updateTime,siteId,siteCode,siteName,sectionName,pjOption,windowFromnum,hallName,pjCount)
         VALUES
-        (#{siteId},#{siteCode},#{siteName},#{sectionName},#{pjOption},#{windowFromnum},#{hallName},#{pjCount},#{year},#{month},#{day},#{createTime},#{updateUserId},#{updateTime})
+        (#{year},#{month},#{day},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{siteCode},#{siteName},#{sectionName},#{pjOption},#{windowFromnum},#{hallName},#{pjCount})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_pj_evaluate_stat
-        (site_id,site_code,site_name,section_name,pj_option,window_fromnum,hall_name,pj_count,year,month,day,createTime,updateUserId,updateTime)
+        (year,month,day,createTime,updateUserId,updateTime,siteId,siteCode,siteName,sectionName,pjOption,windowFromnum,hallName,pjCount)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteCode},#{item.siteName},#{item.sectionName},#{item.pjOption},#{item.windowFromnum},#{item.hallName},#{item.pjCount},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.sectionName},#{item.pjOption},#{item.windowFromnum},#{item.hallName},#{item.pjCount})
         </foreach>
     </insert>
 
@@ -98,36 +98,6 @@
         update mortals_xhx_pj_evaluate_stat as a
         set
         <trim suffixOverrides="," suffix="">
-            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
-                a.site_id=#{data.siteId},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
-                a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
-                a.site_code=#{data.siteCode},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
-                a.site_name=#{data.siteName},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('sectionName')) or (colPickMode==1 and !data.containsKey('sectionName'))">
-                a.section_name=#{data.sectionName},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('pjOption')) or (colPickMode==1 and !data.containsKey('pjOption'))">
-                a.pj_option=#{data.pjOption},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('windowFromnum')) or (colPickMode==1 and !data.containsKey('windowFromnum'))">
-                a.window_fromnum=#{data.windowFromnum},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
-                a.hall_name=#{data.hallName},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('pjCount')) or (colPickMode==1 and !data.containsKey('pjCount'))">
-                a.pj_count=#{data.pjCount},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('pjCountIncrement')) or (colPickMode==1 and !data.containsKey('pjCountIncrement'))">
-                a.pj_count=ifnull(a.pj_count,0) + #{data.pjCountIncrement},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('year')) or (colPickMode==1 and !data.containsKey('year'))">
                 a.year=#{data.year},
             </if>
@@ -158,6 +128,36 @@
             <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('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.siteCode=#{data.siteCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sectionName')) or (colPickMode==1 and !data.containsKey('sectionName'))">
+                a.sectionName=#{data.sectionName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjOption')) or (colPickMode==1 and !data.containsKey('pjOption'))">
+                a.pjOption=#{data.pjOption},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowFromnum')) or (colPickMode==1 and !data.containsKey('windowFromnum'))">
+                a.windowFromnum=#{data.windowFromnum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hallName=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjCount')) or (colPickMode==1 and !data.containsKey('pjCount'))">
+                a.pjCount=#{data.pjCount},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pjCountIncrement')) or (colPickMode==1 and !data.containsKey('pjCountIncrement'))">
+                a.pjCount=ifnull(a.pjCount,0) + #{data.pjCountIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -170,72 +170,6 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_pj_evaluate_stat as a
         <trim prefix="set" suffixOverrides=",">
-            <trim prefix="site_id=(case" suffix="ELSE site_id end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
-                            when a.id=#{item.id} then #{item.siteId}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.site_id,0) + #{item.siteIdIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <trim prefix="site_code=(case" suffix="ELSE site_code end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
-                        when a.id=#{item.id} then #{item.siteCode}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="site_name=(case" suffix="ELSE site_name end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
-                        when a.id=#{item.id} then #{item.siteName}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="section_name=(case" suffix="ELSE section_name end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('sectionName')) or (colPickMode==1 and !item.containsKey('sectionName'))">
-                        when a.id=#{item.id} then #{item.sectionName}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="pj_option=(case" suffix="ELSE pj_option end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('pjOption')) or (colPickMode==1 and !item.containsKey('pjOption'))">
-                        when a.id=#{item.id} then #{item.pjOption}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="window_fromnum=(case" suffix="ELSE window_fromnum end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('windowFromnum')) or (colPickMode==1 and !item.containsKey('windowFromnum'))">
-                        when a.id=#{item.id} then #{item.windowFromnum}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="hall_name=(case" suffix="ELSE hall_name end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
-                        when a.id=#{item.id} then #{item.hallName}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="pj_count=(case" suffix="ELSE pj_count end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('pjCount')) or (colPickMode==1 and !item.containsKey('pjCount'))">
-                            when a.id=#{item.id} then #{item.pjCount}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('pjCountIncrement')) or (colPickMode==1 and !item.containsKey('pjCountIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.pj_count,0) + #{item.pjCountIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
             <trim prefix="year=(case" suffix="ELSE year end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -298,6 +232,72 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                        when a.id=#{item.id} then #{item.siteCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                        when a.id=#{item.id} then #{item.siteName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="sectionName=(case" suffix="ELSE sectionName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('sectionName')) or (colPickMode==1 and !item.containsKey('sectionName'))">
+                        when a.id=#{item.id} then #{item.sectionName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pjOption=(case" suffix="ELSE pjOption end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('pjOption')) or (colPickMode==1 and !item.containsKey('pjOption'))">
+                        when a.id=#{item.id} then #{item.pjOption}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="windowFromnum=(case" suffix="ELSE windowFromnum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('windowFromnum')) or (colPickMode==1 and !item.containsKey('windowFromnum'))">
+                        when a.id=#{item.id} then #{item.windowFromnum}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="hallName=(case" suffix="ELSE hallName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                        when a.id=#{item.id} then #{item.hallName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pjCount=(case" suffix="ELSE pjCount end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('pjCount')) or (colPickMode==1 and !item.containsKey('pjCount'))">
+                            when a.id=#{item.id} then #{item.pjCount}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('pjCountIncrement')) or (colPickMode==1 and !item.containsKey('pjCountIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.pjCount,0) + #{item.pjCountIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -445,324 +445,324 @@
             ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
         </if>
 
-        <if test="conditionParamRef.containsKey('siteId')">
-            <if test="conditionParamRef.siteId != null ">
-                ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
+        <if test="conditionParamRef.containsKey('year')">
+            <if test="conditionParamRef.year != null ">
+                ${_conditionType_} a.year = #{${_conditionParam_}.year}
             </if>
-            <if test="conditionParamRef.siteId == null">
-                ${_conditionType_} a.site_id is null
+            <if test="conditionParamRef.year == null">
+                ${_conditionType_} a.year is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-            ${_conditionType_} a.site_id in
-            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
+            ${_conditionType_} a.year in
+            <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
-            ${_conditionType_} a.site_id not in
-            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
+            ${_conditionType_} a.year not in
+            <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
-            ${_conditionType_} a.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
+            ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
         </if>
-        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
-            ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
+            ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
         </if>
 
-
-        <if test="conditionParamRef.containsKey('siteCode')">
-            <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
-                ${_conditionType_} a.site_code like #{${_conditionParam_}.siteCode}
+        <if test="conditionParamRef.containsKey('month')">
+            <if test="conditionParamRef.month != null ">
+                ${_conditionType_} a.month = #{${_conditionParam_}.month}
             </if>
-            <if test="conditionParamRef.siteCode == null">
-                ${_conditionType_} a.site_code is null
+            <if test="conditionParamRef.month == null">
+                ${_conditionType_} a.month is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
-            ${_conditionType_} a.site_code in
-            <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
+            ${_conditionType_} a.month in
+            <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
-            ${_conditionType_} a.site_code not in
-            <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
+            ${_conditionType_} a.month not in
+            <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
+            ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
+        </if>
+        <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
+            ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('siteName')">
-            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
-                ${_conditionType_} a.site_name like #{${_conditionParam_}.siteName}
+        <if test="conditionParamRef.containsKey('day')">
+            <if test="conditionParamRef.day != null ">
+                ${_conditionType_} a.day = #{${_conditionParam_}.day}
             </if>
-            <if test="conditionParamRef.siteName == null">
-                ${_conditionType_} a.site_name is null
+            <if test="conditionParamRef.day == null">
+                ${_conditionType_} a.day is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
-            ${_conditionType_} a.site_name in
-            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
+            ${_conditionType_} a.day in
+            <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
-            ${_conditionType_} a.site_name not in
-            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
+            ${_conditionType_} a.day not in
+            <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-
-        <if test="conditionParamRef.containsKey('sectionName')">
-            <if test="conditionParamRef.sectionName != null and conditionParamRef.sectionName != ''">
-                ${_conditionType_} a.section_name like #{${_conditionParam_}.sectionName}
-            </if>
-            <if test="conditionParamRef.sectionName == null">
-                ${_conditionType_} a.section_name is null
+        <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
+            ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
+        </if>
+        <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
+            ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+            </if>
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('sectionNameList') and conditionParamRef.sectionNameList.size() > 0">
-            ${_conditionType_} a.section_name in
-            <foreach collection="conditionParamRef.sectionNameList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
         </if>
-        <if test="conditionParamRef.containsKey('sectionNameNotList') and conditionParamRef.sectionNameNotList.size() > 0">
-            ${_conditionType_} a.section_name not in
-            <foreach collection="conditionParamRef.sectionNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
+        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
-
-        <if test="conditionParamRef.containsKey('pjOption')">
-            <if test="conditionParamRef.pjOption != null and conditionParamRef.pjOption != ''">
-                ${_conditionType_} a.pj_option like #{${_conditionParam_}.pjOption}
+        <if test="conditionParamRef.containsKey('updateUserId')">
+            <if test="conditionParamRef.updateUserId != null ">
+                ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
             </if>
-            <if test="conditionParamRef.pjOption == null">
-                ${_conditionType_} a.pj_option is null
+            <if test="conditionParamRef.updateUserId == null">
+                ${_conditionType_} a.updateUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('pjOptionList') and conditionParamRef.pjOptionList.size() > 0">
-            ${_conditionType_} a.pj_option in
-            <foreach collection="conditionParamRef.pjOptionList" open="(" close=")" index="index" item="item" separator=",">
+        <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('pjOptionNotList') and conditionParamRef.pjOptionNotList.size() > 0">
-            ${_conditionType_} a.pj_option not in
-            <foreach collection="conditionParamRef.pjOptionNotList" open="(" close=")" index="index" item="item" separator=",">
+        <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}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+            ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('windowFromnum')">
-            <if test="conditionParamRef.windowFromnum != null and conditionParamRef.windowFromnum != ''">
-                ${_conditionType_} a.window_fromnum like #{${_conditionParam_}.windowFromnum}
+
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.windowFromnum == null">
-                ${_conditionType_} a.window_fromnum is null
+            <if test="conditionParamRef.updateTime == null">
+                ${_conditionType_} a.updateTime is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('windowFromnumList') and conditionParamRef.windowFromnumList.size() > 0">
-            ${_conditionType_} a.window_fromnum in
-            <foreach collection="conditionParamRef.windowFromnumList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <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('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <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('windowFromnumNotList') and conditionParamRef.windowFromnumNotList.size() > 0">
-            ${_conditionType_} a.window_fromnum not in
-            <foreach collection="conditionParamRef.windowFromnumNotList" open="(" close=")" index="index" item="item" separator=",">
+        <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}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('hallName')">
-            <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
-                ${_conditionType_} a.hall_name like #{${_conditionParam_}.hallName}
+
+        <if test="conditionParamRef.containsKey('siteCode')">
+            <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
             </if>
-            <if test="conditionParamRef.hallName == null">
-                ${_conditionType_} a.hall_name is null
+            <if test="conditionParamRef.siteCode == null">
+                ${_conditionType_} a.siteCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
-            ${_conditionType_} a.hall_name in
-            <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+            ${_conditionType_} a.siteCode in
+            <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
-            ${_conditionType_} a.hall_name not in
-            <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+            ${_conditionType_} a.siteCode not in
+            <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('pjCount')">
-            <if test="conditionParamRef.pjCount != null ">
-                ${_conditionType_} a.pj_count = #{${_conditionParam_}.pjCount}
+
+        <if test="conditionParamRef.containsKey('siteName')">
+            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
             </if>
-            <if test="conditionParamRef.pjCount == null">
-                ${_conditionType_} a.pj_count is null
+            <if test="conditionParamRef.siteName == null">
+                ${_conditionType_} a.siteName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('pjCountList') and conditionParamRef.pjCountList.size() > 0">
-            ${_conditionType_} a.pj_count in
-            <foreach collection="conditionParamRef.pjCountList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('pjCountNotList') and conditionParamRef.pjCountNotList.size() > 0">
-            ${_conditionType_} a.pj_count not in
-            <foreach collection="conditionParamRef.pjCountNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('pjCountStart') and conditionParamRef.pjCountStart != null">
-            ${_conditionType_} a.pj_count <![CDATA[ >= ]]> #{${_conditionParam_}.pjCountStart}
-        </if>
-        <if test="conditionParamRef.containsKey('pjCountEnd') and conditionParamRef.pjCountEnd != null">
-            ${_conditionType_} a.pj_count <![CDATA[ <= ]]> #{${_conditionParam_}.pjCountEnd}
-        </if>
 
-        <if test="conditionParamRef.containsKey('year')">
-            <if test="conditionParamRef.year != null ">
-                ${_conditionType_} a.year = #{${_conditionParam_}.year}
+        <if test="conditionParamRef.containsKey('sectionName')">
+            <if test="conditionParamRef.sectionName != null and conditionParamRef.sectionName != ''">
+                ${_conditionType_} a.sectionName like #{${_conditionParam_}.sectionName}
             </if>
-            <if test="conditionParamRef.year == null">
-                ${_conditionType_} a.year is null
+            <if test="conditionParamRef.sectionName == null">
+                ${_conditionType_} a.sectionName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
-            ${_conditionType_} a.year in
-            <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('sectionNameList') and conditionParamRef.sectionNameList.size() > 0">
+            ${_conditionType_} a.sectionName in
+            <foreach collection="conditionParamRef.sectionNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
-            ${_conditionType_} a.year not in
-            <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('sectionNameNotList') and conditionParamRef.sectionNameNotList.size() > 0">
+            ${_conditionType_} a.sectionName not in
+            <foreach collection="conditionParamRef.sectionNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
-            ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
-        </if>
-        <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
-            ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
-        </if>
 
-        <if test="conditionParamRef.containsKey('month')">
-            <if test="conditionParamRef.month != null ">
-                ${_conditionType_} a.month = #{${_conditionParam_}.month}
+        <if test="conditionParamRef.containsKey('pjOption')">
+            <if test="conditionParamRef.pjOption != null and conditionParamRef.pjOption != ''">
+                ${_conditionType_} a.pjOption like #{${_conditionParam_}.pjOption}
             </if>
-            <if test="conditionParamRef.month == null">
-                ${_conditionType_} a.month is null
+            <if test="conditionParamRef.pjOption == null">
+                ${_conditionType_} a.pjOption is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
-            ${_conditionType_} a.month in
-            <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('pjOptionList') and conditionParamRef.pjOptionList.size() > 0">
+            ${_conditionType_} a.pjOption in
+            <foreach collection="conditionParamRef.pjOptionList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
-            ${_conditionType_} a.month not in
-            <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('pjOptionNotList') and conditionParamRef.pjOptionNotList.size() > 0">
+            ${_conditionType_} a.pjOption not in
+            <foreach collection="conditionParamRef.pjOptionNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
-            ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
-        </if>
-        <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
-            ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
-        </if>
 
-        <if test="conditionParamRef.containsKey('day')">
-            <if test="conditionParamRef.day != null ">
-                ${_conditionType_} a.day = #{${_conditionParam_}.day}
+        <if test="conditionParamRef.containsKey('windowFromnum')">
+            <if test="conditionParamRef.windowFromnum != null and conditionParamRef.windowFromnum != ''">
+                ${_conditionType_} a.windowFromnum like #{${_conditionParam_}.windowFromnum}
             </if>
-            <if test="conditionParamRef.day == null">
-                ${_conditionType_} a.day is null
+            <if test="conditionParamRef.windowFromnum == null">
+                ${_conditionType_} a.windowFromnum is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
-            ${_conditionType_} a.day in
-            <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('windowFromnumList') and conditionParamRef.windowFromnumList.size() > 0">
+            ${_conditionType_} a.windowFromnum in
+            <foreach collection="conditionParamRef.windowFromnumList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
-            ${_conditionType_} a.day not in
-            <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('windowFromnumNotList') and conditionParamRef.windowFromnumNotList.size() > 0">
+            ${_conditionType_} a.windowFromnum not in
+            <foreach collection="conditionParamRef.windowFromnumNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
-            ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
-        </if>
-        <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
-            ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
-        </if>
-
 
-        <if test="conditionParamRef.containsKey('createTime')">
-            <if test="conditionParamRef.createTime != null ">
-                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+        <if test="conditionParamRef.containsKey('hallName')">
+            <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                ${_conditionType_} a.hallName like #{${_conditionParam_}.hallName}
             </if>
-            <if test="conditionParamRef.createTime == null">
-                ${_conditionType_} a.createTime is null
+            <if test="conditionParamRef.hallName == null">
+                ${_conditionType_} a.hallName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+            ${_conditionType_} a.hallName in
+            <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+            ${_conditionType_} a.hallName not in
+            <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('updateUserId')">
-            <if test="conditionParamRef.updateUserId != null ">
-                ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+        <if test="conditionParamRef.containsKey('pjCount')">
+            <if test="conditionParamRef.pjCount != null ">
+                ${_conditionType_} a.pjCount = #{${_conditionParam_}.pjCount}
             </if>
-            <if test="conditionParamRef.updateUserId == null">
-                ${_conditionType_} a.updateUserId is null
+            <if test="conditionParamRef.pjCount == null">
+                ${_conditionType_} a.pjCount is null
             </if>
         </if>
-        <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=",">
+        <if test="conditionParamRef.containsKey('pjCountList') and conditionParamRef.pjCountList.size() > 0">
+            ${_conditionType_} a.pjCount in
+            <foreach collection="conditionParamRef.pjCountList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <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=",">
+        <if test="conditionParamRef.containsKey('pjCountNotList') and conditionParamRef.pjCountNotList.size() > 0">
+            ${_conditionType_} a.pjCount not in
+            <foreach collection="conditionParamRef.pjCountNotList" 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 test="conditionParamRef.containsKey('pjCountStart') and conditionParamRef.pjCountStart != null">
+            ${_conditionType_} a.pjCount <![CDATA[ >= ]]> #{${_conditionParam_}.pjCountStart}
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-            ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+        <if test="conditionParamRef.containsKey('pjCountEnd') and conditionParamRef.pjCountEnd != null">
+            ${_conditionType_} a.pjCount <![CDATA[ <= ]]> #{${_conditionParam_}.pjCountEnd}
         </if>
 
-
-        <if test="conditionParamRef.containsKey('updateTime')">
-            <if test="conditionParamRef.updateTime != null ">
-                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
-            </if>
-            <if test="conditionParamRef.updateTime == null">
-                ${_conditionType_} a.updateTime is null
-            </if>
-        </if>
-        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <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>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -774,20 +774,6 @@
                 </foreach>
                 ,
             </if>
-            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                field(a.siteId,
-                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
-            <if test="conditionParamRef.containsKey('pjCountList') and conditionParamRef.pjCountList.size() > 0">
-                field(a.pjCount,
-                <foreach collection="conditionParamRef.pjCountList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
             <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
                 field(a.year,
                 <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
@@ -816,6 +802,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('pjCountList') and conditionParamRef.pjCountList.size() > 0">
+                field(a.pjCount,
+                <foreach collection="conditionParamRef.pjCountList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                     a.${item.colName} ${item.sortKind}
@@ -831,20 +831,6 @@
                 </foreach>
                 ,
             </if>
-            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                field(a.siteId,
-                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
-            <if test="conditionParamRef.containsKey('pjCountList') and conditionParamRef.pjCountList.size() > 0">
-                field(a.pjCount,
-                <foreach collection="conditionParamRef.pjCountList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
             <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
                 field(a.year,
                 <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
@@ -873,82 +859,96 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('pjCountList') and conditionParamRef.pjCountList.size() > 0">
+                field(a.pjCount,
+                <foreach collection="conditionParamRef.pjCountList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
                     <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('year')">
+                    a.year
+                    <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('month')">
+                    a.month
+                    <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('day')">
+                    a.day
+                    <if test='orderCol.day != null and "DESC".equalsIgnoreCase(orderCol.day)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateUserId')">
+                    a.updateUserId
+                    <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateTime')">
+                    a.updateTime
+                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('siteId')">
-                    a.site_id
+                    a.siteId
                     <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('siteCode')">
-                    a.site_code
+                    a.siteCode
                     <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('siteName')">
-                    a.site_name
+                    a.siteName
                     <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('sectionName')">
-                    a.section_name
+                    a.sectionName
                     <if test='orderCol.sectionName != null and "DESC".equalsIgnoreCase(orderCol.sectionName)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('pjOption')">
-                    a.pj_option
+                    a.pjOption
                     <if test='orderCol.pjOption != null and "DESC".equalsIgnoreCase(orderCol.pjOption)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('windowFromnum')">
-                    a.window_fromnum
+                    a.windowFromnum
                     <if test='orderCol.windowFromnum != null and "DESC".equalsIgnoreCase(orderCol.windowFromnum)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('hallName')">
-                    a.hall_name
+                    a.hallName
                     <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('pjCount')">
-                    a.pj_count
+                    a.pjCount
                     <if test='orderCol.pjCount != null and "DESC".equalsIgnoreCase(orderCol.pjCount)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('year')">
-                    a.year
-                    <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('month')">
-                    a.month
-                    <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('day')">
-                    a.day
-                    <if test='orderCol.day != null and "DESC".equalsIgnoreCase(orderCol.day)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('createTime')">
-                    a.createTime
-                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('updateUserId')">
-                    a.updateUserId
-                    <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('updateTime')">
-                    a.updateTime
-                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
-                    ,
-                </if>
             </trim>
         </if>
 

bill-manager/src/main/resources/sqlmap/module/pj/PjEvaluateStatMapperExt.xml

@@ -11,13 +11,6 @@
                 ${item},
             </foreach>
         </if>
-        a.site_id,
-        a.site_code,
-        a.site_name,
-        a.section_name,
-        a.pj_option,
-        a.hall_name,
-        a.window_fromnum,
         <!-- 评价数量-->
         sum(IFNULL(a.pj_count,0)) pj_count
 

bill-manager/src/main/resources/sqlmap/module/stat/StatMapper.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.stat.dao.ibatis.StatDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="StatEntity" id="StatEntity-Map">
-            <id  property="id" column="id" />
-            <result property="siteId" column="site_id" />
-            <result property="siteCode" column="site_code" />
-            <result property="siteName" column="site_name" />
-            <result property="count" column="count" />
-            <result property="year" column="year" />
-            <result property="month" column="month" />
-            <result property="day" column="day" />
-            <result property="createUserId" column="create_user_id" />
-            <result property="createTime" column="create_time" />
-            <result property="updateTime" column="update_time" />
-            
+        <id  property="id" column="id" />
+        <result property="count" column="count" />
+        <result property="year" column="year" />
+        <result property="month" column="month" />
+        <result property="day" column="day" />
+        <result property="siteId" column="siteId" />
+        <result property="siteCode" column="siteCode" />
+        <result property="siteName" column="siteName" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createTime" column="createTime" />
+        <result property="updateTime" column="updateTime" />
+
     </resultMap>
 
 
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
-                    a.id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
-                    a.site_id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
-                    a.site_code,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
-                    a.site_name,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('count') or colPickMode == 1 and data.containsKey('count')))">
-                    a.count,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
-                    a.year,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('month') or colPickMode == 1 and data.containsKey('month')))">
-                    a.month,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('day') or colPickMode == 1 and data.containsKey('day')))">
-                    a.day,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
-                    a.create_user_id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                    a.create_time,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
-                    a.update_time,
-                </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('count') or colPickMode == 1 and data.containsKey('count')))">
+                a.count,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
+                a.year,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('month') or colPickMode == 1 and data.containsKey('month')))">
+                a.month,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('day') or colPickMode == 1 and data.containsKey('day')))">
+                a.day,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                a.siteCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                a.siteName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                a.createUserId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                a.createTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                a.updateTime,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="StatEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_stat
-        (site_id,site_code,site_name,count,year,month,day,create_user_id,create_time,update_time)
+        (count,year,month,day,siteId,siteCode,siteName,createUserId,createTime,updateTime)
         VALUES
-        (#{siteId},#{siteCode},#{siteName},#{count},#{year},#{month},#{day},#{createUserId},#{createTime},#{updateTime})
+        (#{count},#{year},#{month},#{day},#{siteId},#{siteCode},#{siteName},#{createUserId},#{createTime},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_stat
-        (site_id,site_code,site_name,count,year,month,day,create_user_id,create_time,update_time)
+        (count,year,month,day,siteId,siteCode,siteName,createUserId,createTime,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteCode},#{item.siteName},#{item.count},#{item.year},#{item.month},#{item.day},#{item.createUserId},#{item.createTime},#{item.updateTime})
+            (#{item.count},#{item.year},#{item.month},#{item.day},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.createUserId},#{item.createTime},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -82,18 +82,6 @@
         update mortals_xhx_stat as a
         set
         <trim suffixOverrides="," suffix="">
-            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
-                a.site_id=#{data.siteId},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
-                a.site_id=ifnull(a.site_id,0) + #{data.siteIdIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
-                a.site_code=#{data.siteCode},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
-                a.site_name=#{data.siteName},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('count')) or (colPickMode==1 and !data.containsKey('count'))">
                 a.count=#{data.count},
             </if>
@@ -118,17 +106,29 @@
             <if test="(colPickMode==0 and data.containsKey('dayIncrement')) or (colPickMode==1 and !data.containsKey('dayIncrement'))">
                 a.day=ifnull(a.day,0) + #{data.dayIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.siteCode=#{data.siteCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
-                a.create_user_id=#{data.createUserId},
+                a.createUserId=#{data.createUserId},
             </if>
             <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
-                a.create_user_id=ifnull(a.create_user_id,0) + #{data.createUserIdIncrement},
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
-                a.create_time=#{data.createTime},
+                a.createTime=#{data.createTime},
             </if>
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
-                a.update_time=#{data.updateTime},
+                a.updateTime=#{data.updateTime},
             </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
@@ -142,106 +142,106 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_stat as a
         <trim prefix="set" suffixOverrides=",">
-                        <trim prefix="site_id=(case" suffix="ELSE site_id end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
-                                        when a.id=#{item.id} then #{item.siteId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.site_id,0) + #{item.siteIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="site_code=(case" suffix="ELSE site_code end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
-                            when a.id=#{item.id} then #{item.siteCode}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="site_name=(case" suffix="ELSE site_name end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
-                            when a.id=#{item.id} then #{item.siteName}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="count=(case" suffix="ELSE count end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('count')) or (colPickMode==1 and !item.containsKey('count'))">
-                                        when a.id=#{item.id} then #{item.count}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('countIncrement')) or (colPickMode==1 and !item.containsKey('countIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.count,0) + #{item.countIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="year=(case" suffix="ELSE year end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('year')) or (colPickMode==1 and !item.containsKey('year'))">
-                                        when a.id=#{item.id} then #{item.year}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('yearIncrement')) or (colPickMode==1 and !item.containsKey('yearIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.year,0) + #{item.yearIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="month=(case" suffix="ELSE month end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('month')) or (colPickMode==1 and !item.containsKey('month'))">
-                                        when a.id=#{item.id} then #{item.month}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('monthIncrement')) or (colPickMode==1 and !item.containsKey('monthIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.month,0) + #{item.monthIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="day=(case" suffix="ELSE day end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('day')) or (colPickMode==1 and !item.containsKey('day'))">
-                                        when a.id=#{item.id} then #{item.day}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('dayIncrement')) or (colPickMode==1 and !item.containsKey('dayIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.day,0) + #{item.dayIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="create_user_id=(case" suffix="ELSE create_user_id end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                                        when a.id=#{item.id} then #{item.createUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.create_user_id,0) + #{item.createUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="create_time=(case" suffix="ELSE create_time end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                            when a.id=#{item.id} then #{item.createTime}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="update_time=(case" suffix="ELSE update_time end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
-                            when a.id=#{item.id} then #{item.updateTime}
-                        </if>
-                    </foreach>
-                </trim>
+            <trim prefix="count=(case" suffix="ELSE count end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('count')) or (colPickMode==1 and !item.containsKey('count'))">
+                            when a.id=#{item.id} then #{item.count}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('countIncrement')) or (colPickMode==1 and !item.containsKey('countIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.count,0) + #{item.countIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="year=(case" suffix="ELSE year end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('year')) or (colPickMode==1 and !item.containsKey('year'))">
+                            when a.id=#{item.id} then #{item.year}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('yearIncrement')) or (colPickMode==1 and !item.containsKey('yearIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.year,0) + #{item.yearIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="month=(case" suffix="ELSE month end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('month')) or (colPickMode==1 and !item.containsKey('month'))">
+                            when a.id=#{item.id} then #{item.month}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('monthIncrement')) or (colPickMode==1 and !item.containsKey('monthIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.month,0) + #{item.monthIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="day=(case" suffix="ELSE day end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('day')) or (colPickMode==1 and !item.containsKey('day'))">
+                            when a.id=#{item.id} then #{item.day}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('dayIncrement')) or (colPickMode==1 and !item.containsKey('dayIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.day,0) + #{item.dayIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                        when a.id=#{item.id} then #{item.siteCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                        when a.id=#{item.id} then #{item.siteName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                            when a.id=#{item.id} then #{item.createUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                        when a.id=#{item.id} then #{item.createTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                        when a.id=#{item.id} then #{item.updateTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -362,433 +362,433 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('id')">
-                <if test="conditionParamRef.id != null ">
-                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
-                </if>
-                <if test="conditionParamRef.id == null">
-                    ${_conditionType_} a.id is null
-                </if>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <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 test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
-            <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}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <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') and conditionParamRef.idNotList.size() > 0">
+            ${_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>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('count')">
+            <if test="conditionParamRef.count != null ">
+                ${_conditionType_} a.count = #{${_conditionParam_}.count}
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            <if test="conditionParamRef.count == null">
+                ${_conditionType_} a.count is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('countList') and conditionParamRef.countList.size() > 0">
+            ${_conditionType_} a.count in
+            <foreach collection="conditionParamRef.countList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('countNotList') and conditionParamRef.countNotList.size() > 0">
+            ${_conditionType_} a.count not in
+            <foreach collection="conditionParamRef.countNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('countStart') and conditionParamRef.countStart != null">
+            ${_conditionType_} a.count <![CDATA[ >= ]]> #{${_conditionParam_}.countStart}
+        </if>
+        <if test="conditionParamRef.containsKey('countEnd') and conditionParamRef.countEnd != null">
+            ${_conditionType_} a.count <![CDATA[ <= ]]> #{${_conditionParam_}.countEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('siteId')">
-                <if test="conditionParamRef.siteId != null ">
-                    ${_conditionType_} a.site_id = #{${_conditionParam_}.siteId}
-                </if>
-                <if test="conditionParamRef.siteId == null">
-                    ${_conditionType_} a.site_id is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                ${_conditionType_} a.site_id in
-                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('year')">
+            <if test="conditionParamRef.year != null ">
+                ${_conditionType_} a.year = #{${_conditionParam_}.year}
             </if>
-            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
-                ${_conditionType_} a.site_id not in
-                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.year == null">
+                ${_conditionType_} a.year is null
             </if>
-            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
-                ${_conditionType_} a.site_id <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
+            ${_conditionType_} a.year in
+            <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
+            ${_conditionType_} a.year not in
+            <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
+            ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
+        </if>
+        <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
+            ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('month')">
+            <if test="conditionParamRef.month != null ">
+                ${_conditionType_} a.month = #{${_conditionParam_}.month}
             </if>
-            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
-                ${_conditionType_} a.site_id <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            <if test="conditionParamRef.month == null">
+                ${_conditionType_} a.month is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
+            ${_conditionType_} a.month in
+            <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
+            ${_conditionType_} a.month not in
+            <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
+            ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
+        </if>
+        <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
+            ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
+        </if>
 
-
-            <if test="conditionParamRef.containsKey('siteCode')">
-                <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
-                    ${_conditionType_} a.site_code like #{${_conditionParam_}.siteCode}
-                </if>
-                <if test="conditionParamRef.siteCode == null">
-                    ${_conditionType_} a.site_code is null
-                </if>
+        <if test="conditionParamRef.containsKey('day')">
+            <if test="conditionParamRef.day != null ">
+                ${_conditionType_} a.day = #{${_conditionParam_}.day}
             </if>
-            <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
-                ${_conditionType_} a.site_code in
-                <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.day == null">
+                ${_conditionType_} a.day is null
             </if>
-            <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
-                ${_conditionType_} a.site_code not in
-                <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
+            ${_conditionType_} a.day in
+            <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
+            ${_conditionType_} a.day not in
+            <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
+            ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
+        </if>
+        <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
+            ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
             </if>
+        </if>
+        <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') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_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>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('siteName')">
-                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
-                    ${_conditionType_} a.site_name like #{${_conditionParam_}.siteName}
-                </if>
-                <if test="conditionParamRef.siteName == null">
-                    ${_conditionType_} a.site_name is null
-                </if>
+
+        <if test="conditionParamRef.containsKey('siteCode')">
+            <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
             </if>
-            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
-                ${_conditionType_} a.site_name in
-                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.siteCode == null">
+                ${_conditionType_} a.siteCode is null
             </if>
-            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
-                ${_conditionType_} a.site_name not in
-                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+            ${_conditionType_} a.siteCode in
+            <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+            ${_conditionType_} a.siteCode not in
+            <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('siteName')">
+            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
             </if>
-            <if test="conditionParamRef.containsKey('count')">
-                <if test="conditionParamRef.count != null ">
-                    ${_conditionType_} a.count = #{${_conditionParam_}.count}
-                </if>
-                <if test="conditionParamRef.count == null">
-                    ${_conditionType_} a.count is null
-                </if>
+            <if test="conditionParamRef.siteName == null">
+                ${_conditionType_} a.siteName is null
             </if>
-            <if test="conditionParamRef.containsKey('countList') and conditionParamRef.countList.size() > 0">
-                ${_conditionType_} a.count in
-                <foreach collection="conditionParamRef.countList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserId')">
+            <if test="conditionParamRef.createUserId != null ">
+                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
             </if>
-            <if test="conditionParamRef.containsKey('countNotList') and conditionParamRef.countNotList.size() > 0">
-                ${_conditionType_} a.count not in
-                <foreach collection="conditionParamRef.countNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
-            <if test="conditionParamRef.containsKey('countStart') and conditionParamRef.countStart != null">
-                ${_conditionType_} a.count <![CDATA[ >= ]]> #{${_conditionParam_}.countStart}
+        </if>
+        <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') and conditionParamRef.createUserIdNotList.size() > 0">
+            ${_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>
+        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.containsKey('countEnd') and conditionParamRef.countEnd != null">
-                ${_conditionType_} a.count <![CDATA[ <= ]]> #{${_conditionParam_}.countEnd}
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
 
-            <if test="conditionParamRef.containsKey('year')">
-                <if test="conditionParamRef.year != null ">
-                    ${_conditionType_} a.year = #{${_conditionParam_}.year}
-                </if>
-                <if test="conditionParamRef.year == null">
-                    ${_conditionType_} a.year is null
-                </if>
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
-                ${_conditionType_} a.year in
-                <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.updateTime == null">
+                ${_conditionType_} a.updateTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <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>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
-                ${_conditionType_} a.year not in
-                <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('countList') and conditionParamRef.countList.size() > 0">
+                field(a.count,
+                <foreach collection="conditionParamRef.countList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
-                ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
-            </if>
-            <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
-                ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
-            </if>
-
-            <if test="conditionParamRef.containsKey('month')">
-                <if test="conditionParamRef.month != null ">
-                    ${_conditionType_} a.month = #{${_conditionParam_}.month}
-                </if>
-                <if test="conditionParamRef.month == null">
-                    ${_conditionType_} a.month is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
-                ${_conditionType_} a.month in
-                <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
+                field(a.year,
+                <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
-                ${_conditionType_} a.month not in
-                <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
+                field(a.month,
+                <foreach collection="conditionParamRef.monthList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
-                ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
-            </if>
-            <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
-                ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
-            </if>
-
-            <if test="conditionParamRef.containsKey('day')">
-                <if test="conditionParamRef.day != null ">
-                    ${_conditionType_} a.day = #{${_conditionParam_}.day}
-                </if>
-                <if test="conditionParamRef.day == null">
-                    ${_conditionType_} a.day is null
-                </if>
+                ,
             </if>
             <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
-                ${_conditionType_} a.day in
-                <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
+                field(a.day,
+                <foreach collection="conditionParamRef.dayList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
-                ${_conditionType_} a.day not in
-                <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
-                ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
-            </if>
-            <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
-                ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
-            </if>
-
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.create_user_id = #{${_conditionParam_}.createUserId}
-                </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.create_user_id is null
-                </if>
+                ,
             </if>
             <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                ${_conditionType_} a.create_user_id in
-                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
-                ${_conditionType_} a.create_user_id not in
-                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
-                ${_conditionType_} a.create_user_id <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
-            </if>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.create_user_id <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
-            </if>
-
-
-            <if test="conditionParamRef.containsKey('createTime')">
-                <if test="conditionParamRef.createTime != null ">
-                    ${_conditionType_} a.create_time = #{${_conditionParam_}.createTime}
-                </if>
-                <if test="conditionParamRef.createTime == null">
-                    ${_conditionType_} a.create_time is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-                ${_conditionType_} a.create_time <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('countList') and conditionParamRef.countList.size() > 0">
+                field(a.count,
+                <foreach collection="conditionParamRef.countList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-                ${_conditionType_} a.create_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
+                field(a.year,
+                <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
             </if>
-
-            <if test="conditionParamRef.containsKey('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.update_time = #{${_conditionParam_}.updateTime}
-                </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.update_time is null
-                </if>
+            <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
+                field(a.month,
+                <foreach collection="conditionParamRef.monthList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-                ${_conditionType_} a.update_time <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
+                field(a.day,
+                <foreach collection="conditionParamRef.dayList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
-                ${_conditionType_} a.update_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
             </if>
-    </sql>
-    <sql id="_orderCols_">
-        <if test="orderColList != null and !orderColList.isEmpty()">
-            order by
-                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-                        field(a.id,
-                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                        field(a.siteId,
-                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('countList') and conditionParamRef.countList.size() > 0">
-                        field(a.count,
-                        <foreach collection="conditionParamRef.countList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
-                        field(a.year,
-                        <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
-                        field(a.month,
-                        <foreach collection="conditionParamRef.monthList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
-                        field(a.day,
-                        <foreach collection="conditionParamRef.dayList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                        field(a.createUserId,
-                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-            <trim suffixOverrides=","  suffix="">
-                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${item.colName} ${item.sortKind}
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
                 </foreach>
-            </trim>
-        </if>
-        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
-            order by
-                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-                        field(a.id,
-                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                        field(a.siteId,
-                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('countList') and conditionParamRef.countList.size() > 0">
-                        field(a.count,
-                        <foreach collection="conditionParamRef.countList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
-                        field(a.year,
-                        <foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
-                        field(a.month,
-                        <foreach collection="conditionParamRef.monthList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
-                        field(a.day,
-                        <foreach collection="conditionParamRef.dayList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                        field(a.createUserId,
-                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
-                    <if test="orderCol.containsKey('id')">
-                        a.id
-                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('siteId')">
-                        a.site_id
-                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('siteCode')">
-                        a.site_code
-                        <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('siteName')">
-                        a.site_name
-                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('count')">
-                        a.count
-                        <if test='orderCol.count != null and "DESC".equalsIgnoreCase(orderCol.count)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('year')">
-                        a.year
-                        <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('month')">
-                        a.month
-                        <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('day')">
-                        a.day
-                        <if test='orderCol.day != null and "DESC".equalsIgnoreCase(orderCol.day)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserId')">
-                        a.create_user_id
-                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createTime')">
-                        a.create_time
-                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateTime')">
-                        a.update_time
-                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
-                        ,
-                    </if>
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('count')">
+                    a.count
+                    <if test='orderCol.count != null and "DESC".equalsIgnoreCase(orderCol.count)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('year')">
+                    a.year
+                    <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('month')">
+                    a.month
+                    <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('day')">
+                    a.day
+                    <if test='orderCol.day != null and "DESC".equalsIgnoreCase(orderCol.day)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteCode')">
+                    a.siteCode
+                    <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteName')">
+                    a.siteName
+                    <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserId')">
+                    a.createUserId
+                    <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateTime')">
+                    a.updateTime
+                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
 

bill-manager/src/main/resources/sqlmap/module/stat/StatMapperExt.xml

@@ -11,9 +11,6 @@
                 ${item},
             </foreach>
         </if>
-        a.site_id,
-        a.site_code,
-        a.site_name,
         <!-- 评价数量-->
         sum(IFNULL(a.count,0)) count
 

bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueStatController.http

@@ -21,7 +21,7 @@ Content-Type: application/json
   "timeStart": "2023-04-01",
   "timeEnd": "2023-05-03",
 
-  "groupList": ["year","month","day"],
+  "groupList": ["year","month","day","section_name"],
   "page": 1,
   "size": 10
 }