From 470c80a3aed315e0193417090539c88565236ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Thu, 27 Jul 2023 16:24:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B8=E6=9F=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/check/CheckGoworkRecordMapper.xml  | 288 +++++++-----------
 1 file changed, 113 insertions(+), 175 deletions(-)

diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml
index de5ef742..d998fd19 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "mybatis-3-mapper.dtd">
-<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckEffectRecordDaoImpl">
+<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckGoworkRecordDaoImpl">
 
     <!-- 瀛楁鍜屽睘鎬ф槧灏� -->
-    <resultMap type="CheckEffectRecordEntity" id="CheckEffectRecordEntity-Map">
+    <resultMap type="CheckGoworkRecordEntity" id="CheckGoworkRecordEntity-Map">
         <id  property="id" column="id" />
         <result property="recordId" column="recordId" />
         <result property="staffId" column="staffId" />
@@ -13,11 +13,10 @@
         <result property="windowNum" column="windowNum" />
         <result property="deptId" column="deptId" />
         <result property="deptName" column="deptName" />
-        <result property="irregularType" column="irregularType" />
-        <result property="happenTime" column="happenTime" />
-        <result property="duration" column="duration" />
-        <result property="alarmTime" column="alarmTime" />
-        <result property="snapPath" column="snapPath" />
+        <result property="goworkCode" column="goworkCode" />
+        <result property="goworkDepts" column="goworkDepts" />
+        <result property="matterlName" column="matterlName" />
+        <result property="goworkTime" column="goworkTime" />
         <result property="ruleId" column="ruleId" />
         <result property="ruleName" column="ruleName" />
         <result property="subMethod" column="subMethod" />
@@ -71,20 +70,17 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
                 a.deptName,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('irregularType') or colPickMode == 1 and data.containsKey('irregularType')))">
-                a.irregularType,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goworkCode') or colPickMode == 1 and data.containsKey('goworkCode')))">
+                a.goworkCode,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('happenTime') or colPickMode == 1 and data.containsKey('happenTime')))">
-                a.happenTime,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goworkDepts') or colPickMode == 1 and data.containsKey('goworkDepts')))">
+                a.goworkDepts,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duration') or colPickMode == 1 and data.containsKey('duration')))">
-                a.duration,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterlName') or colPickMode == 1 and data.containsKey('matterlName')))">
+                a.matterlName,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmTime') or colPickMode == 1 and data.containsKey('alarmTime')))">
-                a.alarmTime,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('snapPath') or colPickMode == 1 and data.containsKey('snapPath')))">
-                a.snapPath,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goworkTime') or colPickMode == 1 and data.containsKey('goworkTime')))">
+                a.goworkTime,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleId') or colPickMode == 1 and data.containsKey('ruleId')))">
                 a.ruleId,
@@ -155,27 +151,27 @@
         </trim>
     </sql>
     <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
-    <insert id="insert" parameterType="CheckEffectRecordEntity"  useGeneratedKeys="true" keyProperty="id">
-        insert into mortals_xhx_check_effect_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,subAddType,auditStatus)
+    <insert id="insert" parameterType="CheckGoworkRecordEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_check_gowork_record
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,subAddType,auditStatus)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName},#{subAddType},#{auditStatus})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName},#{subAddType},#{auditStatus})
     </insert>
 
     <!-- 鎵归噺鏂板 -->
     <insert id="insertBatch" parameterType="paramDto">
-        insert into mortals_xhx_check_effect_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,subAddType,auditStatus)
+        insert into mortals_xhx_check_gowork_record
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName,subAddType,auditStatus)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName},#{item.subAddType},#{item.auditStatus})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName},#{item.subAddType},#{item.auditStatus})
         </foreach>
     </insert>
 
 
     <!-- 鏍规嵁ParamDto鏇存柊 -->
     <update id="update" parameterType="paramDto">
-        update mortals_xhx_check_effect_record as a
+        update mortals_xhx_check_gowork_record as a
         set
         <trim suffixOverrides="," suffix="">
             <if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
@@ -208,26 +204,17 @@
             <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
                 a.deptName=#{data.deptName},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('irregularType')) or (colPickMode==1 and !data.containsKey('irregularType'))">
-                a.irregularType=#{data.irregularType},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('irregularTypeIncrement')) or (colPickMode==1 and !data.containsKey('irregularTypeIncrement'))">
-                a.irregularType=ifnull(a.irregularType,0) + #{data.irregularTypeIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('happenTime')) or (colPickMode==1 and !data.containsKey('happenTime'))">
-                a.happenTime=#{data.happenTime},
+            <if test="(colPickMode==0 and data.containsKey('goworkCode')) or (colPickMode==1 and !data.containsKey('goworkCode'))">
+                a.goworkCode=#{data.goworkCode},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('duration')) or (colPickMode==1 and !data.containsKey('duration'))">
-                a.duration=#{data.duration},
+            <if test="(colPickMode==0 and data.containsKey('goworkDepts')) or (colPickMode==1 and !data.containsKey('goworkDepts'))">
+                a.goworkDepts=#{data.goworkDepts},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('durationIncrement')) or (colPickMode==1 and !data.containsKey('durationIncrement'))">
-                a.duration=ifnull(a.duration,0) + #{data.durationIncrement},
+            <if test="(colPickMode==0 and data.containsKey('matterlName')) or (colPickMode==1 and !data.containsKey('matterlName'))">
+                a.matterlName=#{data.matterlName},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('alarmTime')) or (colPickMode==1 and !data.containsKey('alarmTime'))">
-                a.alarmTime=#{data.alarmTime},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('snapPath')) or (colPickMode==1 and !data.containsKey('snapPath'))">
-                a.snapPath=#{data.snapPath},
+            <if test="(colPickMode==0 and data.containsKey('goworkTime')) or (colPickMode==1 and !data.containsKey('goworkTime'))">
+                a.goworkTime=#{data.goworkTime},
             </if>
             <if test="(colPickMode==0 and data.containsKey('ruleId')) or (colPickMode==1 and !data.containsKey('ruleId'))">
                 a.ruleId=#{data.ruleId},
@@ -332,7 +319,7 @@
     </update>
     <!-- 鎵归噺鏇存柊 -->
     <update id="updateBatch" parameterType="paramDto">
-        update mortals_xhx_check_effect_record as a
+        update mortals_xhx_check_gowork_record as a
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="recordId=(case" suffix="ELSE recordId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
@@ -398,48 +385,31 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="irregularType=(case" suffix="ELSE irregularType end),">
+            <trim prefix="goworkCode=(case" suffix="ELSE goworkCode end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('irregularType')) or (colPickMode==1 and !item.containsKey('irregularType'))">
-                            when a.id=#{item.id} then #{item.irregularType}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('irregularTypeIncrement')) or (colPickMode==1 and !item.containsKey('irregularTypeIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.irregularType,0) + #{item.irregularTypeIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <trim prefix="happenTime=(case" suffix="ELSE happenTime end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('happenTime')) or (colPickMode==1 and !item.containsKey('happenTime'))">
-                        when a.id=#{item.id} then #{item.happenTime}
+                    <if test="(colPickMode==0 and item.containsKey('goworkCode')) or (colPickMode==1 and !item.containsKey('goworkCode'))">
+                        when a.id=#{item.id} then #{item.goworkCode}
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="duration=(case" suffix="ELSE duration end),">
+            <trim prefix="goworkDepts=(case" suffix="ELSE goworkDepts end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('duration')) or (colPickMode==1 and !item.containsKey('duration'))">
-                            when a.id=#{item.id} then #{item.duration}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('durationIncrement')) or (colPickMode==1 and !item.containsKey('durationIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.duration,0) + #{item.durationIncrement}
-                        </when>
-                    </choose>
+                    <if test="(colPickMode==0 and item.containsKey('goworkDepts')) or (colPickMode==1 and !item.containsKey('goworkDepts'))">
+                        when a.id=#{item.id} then #{item.goworkDepts}
+                    </if>
                 </foreach>
             </trim>
-            <trim prefix="alarmTime=(case" suffix="ELSE alarmTime end),">
+            <trim prefix="matterlName=(case" suffix="ELSE matterlName end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('alarmTime')) or (colPickMode==1 and !item.containsKey('alarmTime'))">
-                        when a.id=#{item.id} then #{item.alarmTime}
+                    <if test="(colPickMode==0 and item.containsKey('matterlName')) or (colPickMode==1 and !item.containsKey('matterlName'))">
+                        when a.id=#{item.id} then #{item.matterlName}
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="snapPath=(case" suffix="ELSE snapPath end),">
+            <trim prefix="goworkTime=(case" suffix="ELSE goworkTime end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('snapPath')) or (colPickMode==1 and !item.containsKey('snapPath'))">
-                        when a.id=#{item.id} then #{item.snapPath}
+                    <if test="(colPickMode==0 and item.containsKey('goworkTime')) or (colPickMode==1 and !item.containsKey('goworkTime'))">
+                        when a.id=#{item.id} then #{item.goworkTime}
                     </if>
                 </foreach>
             </trim>
@@ -649,25 +619,25 @@
         </foreach>
     </update>
     <!-- 鏍规嵁涓诲仴鏌ヨ -->
-    <select id="getByKey" parameterType="paramDto" resultMap="CheckEffectRecordEntity-Map">
+    <select id="getByKey" parameterType="paramDto" resultMap="CheckGoworkRecordEntity-Map">
         select <include refid="_columns"/>
-        from mortals_xhx_check_effect_record as a
+        from mortals_xhx_check_gowork_record as a
         where a.id=#{condition.id}
     </select>
     <!-- 鏍规嵁涓诲仴鍒犻櫎 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_check_effect_record as a where a.id=#{condition.id}
+        delete a.* from mortals_xhx_check_gowork_record as a where a.id=#{condition.id}
     </delete>
     <!-- 鏍规嵁涓诲仴鍒犻櫎涓€鎵癸紝閽堝鍗曚竴涓诲仴鏈夋晥 -->
     <delete id="deleteByKeys">
-        delete from mortals_xhx_check_effect_record where id in
+        delete from mortals_xhx_check_gowork_record where id in
         <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </delete>
     <!-- 鏍规嵁涓诲仴鍒楄〃鍒犻櫎涓€鎵癸紝閽堝鍗曚竴涓诲仴鏈夋晥 -->
     <delete id="deleteByKeyList">
-        delete from mortals_xhx_check_effect_record where id in
+        delete from mortals_xhx_check_gowork_record where id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -675,14 +645,14 @@
 
     <!-- 鏍规嵁瀵硅薄鍒楄〃鍒犻櫎涓€鎵癸紝閽堝鍗曚竴涓诲仴鏈夋晥 -->
     <delete id="deleteByEntityList">
-        delete from mortals_xhx_check_effect_record where id in
+        delete from mortals_xhx_check_gowork_record where id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item.id}
         </foreach>
     </delete>
     <!-- 鏍规嵁paramDto鍒犻櫎涓€鎵� -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_check_effect_record as a
+        delete a.* from mortals_xhx_check_gowork_record as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -691,9 +661,9 @@
         </trim>
     </delete>
     <!-- 鑾峰彇鍒楄〃 -->
-    <select id="getList" parameterType="paramDto" resultMap="CheckEffectRecordEntity-Map">
+    <select id="getList" parameterType="paramDto" resultMap="CheckGoworkRecordEntity-Map">
         select <include refid="_columns"/>
-        from mortals_xhx_check_effect_record as a
+        from mortals_xhx_check_gowork_record as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -708,7 +678,7 @@
     <!-- 鑾峰彇 -->
     <select id="getListCount" parameterType="paramDto" resultType="int">
         select count(1)
-        from mortals_xhx_check_effect_record as a
+        from mortals_xhx_check_gowork_record as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">
@@ -950,110 +920,83 @@
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('irregularType')">
-            <if test="conditionParamRef.irregularType != null ">
-                ${_conditionType_} a.irregularType = #{${_conditionParam_}.irregularType}
+
+        <if test="conditionParamRef.containsKey('goworkCode')">
+            <if test="conditionParamRef.goworkCode != null and conditionParamRef.goworkCode != ''">
+                ${_conditionType_} a.goworkCode like #{${_conditionParam_}.goworkCode}
             </if>
-            <if test="conditionParamRef.irregularType == null">
-                ${_conditionType_} a.irregularType is null
+            <if test="conditionParamRef.goworkCode == null">
+                ${_conditionType_} a.goworkCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('irregularTypeList') and conditionParamRef.irregularTypeList.size() > 0">
-            ${_conditionType_} a.irregularType in
-            <foreach collection="conditionParamRef.irregularTypeList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('goworkCodeList') and conditionParamRef.goworkCodeList.size() > 0">
+            ${_conditionType_} a.goworkCode in
+            <foreach collection="conditionParamRef.goworkCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('irregularTypeNotList') and conditionParamRef.irregularTypeNotList.size() > 0">
-            ${_conditionType_} a.irregularType not in
-            <foreach collection="conditionParamRef.irregularTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('goworkCodeNotList') and conditionParamRef.goworkCodeNotList.size() > 0">
+            ${_conditionType_} a.goworkCode not in
+            <foreach collection="conditionParamRef.goworkCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('irregularTypeStart') and conditionParamRef.irregularTypeStart != null">
-            ${_conditionType_} a.irregularType <![CDATA[ >= ]]> #{${_conditionParam_}.irregularTypeStart}
-        </if>
-        <if test="conditionParamRef.containsKey('irregularTypeEnd') and conditionParamRef.irregularTypeEnd != null">
-            ${_conditionType_} a.irregularType <![CDATA[ <= ]]> #{${_conditionParam_}.irregularTypeEnd}
-        </if>
 
-
-        <if test="conditionParamRef.containsKey('happenTime')">
-            <if test="conditionParamRef.happenTime != null ">
-                ${_conditionType_} a.happenTime = #{${_conditionParam_}.happenTime}
-            </if>
-            <if test="conditionParamRef.happenTime == null">
-                ${_conditionType_} a.happenTime is null
-            </if>
-        </if>
-        <if test="conditionParamRef.containsKey('happenTimeStart') and conditionParamRef.happenTimeStart != null and conditionParamRef.happenTimeStart!=''">
-            ${_conditionType_} a.happenTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.happenTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('happenTimeEnd') and conditionParamRef.happenTimeEnd != null and conditionParamRef.happenTimeEnd!=''">
-            ${_conditionType_} a.happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.happenTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('duration')">
-            <if test="conditionParamRef.duration != null ">
-                ${_conditionType_} a.duration = #{${_conditionParam_}.duration}
+        <if test="conditionParamRef.containsKey('goworkDepts')">
+            <if test="conditionParamRef.goworkDepts != null and conditionParamRef.goworkDepts != ''">
+                ${_conditionType_} a.goworkDepts like #{${_conditionParam_}.goworkDepts}
             </if>
-            <if test="conditionParamRef.duration == null">
-                ${_conditionType_} a.duration is null
+            <if test="conditionParamRef.goworkDepts == null">
+                ${_conditionType_} a.goworkDepts is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('durationList') and conditionParamRef.durationList.size() > 0">
-            ${_conditionType_} a.duration in
-            <foreach collection="conditionParamRef.durationList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('goworkDeptsList') and conditionParamRef.goworkDeptsList.size() > 0">
+            ${_conditionType_} a.goworkDepts in
+            <foreach collection="conditionParamRef.goworkDeptsList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('durationNotList') and conditionParamRef.durationNotList.size() > 0">
-            ${_conditionType_} a.duration not in
-            <foreach collection="conditionParamRef.durationNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('goworkDeptsNotList') and conditionParamRef.goworkDeptsNotList.size() > 0">
+            ${_conditionType_} a.goworkDepts not in
+            <foreach collection="conditionParamRef.goworkDeptsNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('durationStart') and conditionParamRef.durationStart != null">
-            ${_conditionType_} a.duration <![CDATA[ >= ]]> #{${_conditionParam_}.durationStart}
-        </if>
-        <if test="conditionParamRef.containsKey('durationEnd') and conditionParamRef.durationEnd != null">
-            ${_conditionType_} a.duration <![CDATA[ <= ]]> #{${_conditionParam_}.durationEnd}
-        </if>
 
-
-        <if test="conditionParamRef.containsKey('alarmTime')">
-            <if test="conditionParamRef.alarmTime != null ">
-                ${_conditionType_} a.alarmTime = #{${_conditionParam_}.alarmTime}
+        <if test="conditionParamRef.containsKey('matterlName')">
+            <if test="conditionParamRef.matterlName != null and conditionParamRef.matterlName != ''">
+                ${_conditionType_} a.matterlName like #{${_conditionParam_}.matterlName}
             </if>
-            <if test="conditionParamRef.alarmTime == null">
-                ${_conditionType_} a.alarmTime is null
+            <if test="conditionParamRef.matterlName == null">
+                ${_conditionType_} a.matterlName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('alarmTimeStart') and conditionParamRef.alarmTimeStart != null and conditionParamRef.alarmTimeStart!=''">
-            ${_conditionType_} a.alarmTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.alarmTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('matterlNameList') and conditionParamRef.matterlNameList.size() > 0">
+            ${_conditionType_} a.matterlName in
+            <foreach collection="conditionParamRef.matterlNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('alarmTimeEnd') and conditionParamRef.alarmTimeEnd != null and conditionParamRef.alarmTimeEnd!=''">
-            ${_conditionType_} a.alarmTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.alarmTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('matterlNameNotList') and conditionParamRef.matterlNameNotList.size() > 0">
+            ${_conditionType_} a.matterlName not in
+            <foreach collection="conditionParamRef.matterlNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
 
-        <if test="conditionParamRef.containsKey('snapPath')">
-            <if test="conditionParamRef.snapPath != null and conditionParamRef.snapPath != ''">
-                ${_conditionType_} a.snapPath like #{${_conditionParam_}.snapPath}
+        <if test="conditionParamRef.containsKey('goworkTime')">
+            <if test="conditionParamRef.goworkTime != null ">
+                ${_conditionType_} a.goworkTime = #{${_conditionParam_}.goworkTime}
             </if>
-            <if test="conditionParamRef.snapPath == null">
-                ${_conditionType_} a.snapPath is null
+            <if test="conditionParamRef.goworkTime == null">
+                ${_conditionType_} a.goworkTime is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('snapPathList') and conditionParamRef.snapPathList.size() > 0">
-            ${_conditionType_} a.snapPath in
-            <foreach collection="conditionParamRef.snapPathList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
+        <if test="conditionParamRef.containsKey('goworkTimeStart') and conditionParamRef.goworkTimeStart != null and conditionParamRef.goworkTimeStart!=''">
+            ${_conditionType_} a.goworkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.goworkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
         </if>
-        <if test="conditionParamRef.containsKey('snapPathNotList') and conditionParamRef.snapPathNotList.size() > 0">
-            ${_conditionType_} a.snapPath not in
-            <foreach collection="conditionParamRef.snapPathNotList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
+        <if test="conditionParamRef.containsKey('goworkTimeEnd') and conditionParamRef.goworkTimeEnd != null and conditionParamRef.goworkTimeEnd!=''">
+            ${_conditionType_} a.goworkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.goworkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
         <if test="conditionParamRef.containsKey('ruleId')">
             <if test="conditionParamRef.ruleId != null ">
@@ -1600,29 +1543,24 @@
                     <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('irregularType')">
-                    a.irregularType
-                    <if test='orderCol.irregularType != null and "DESC".equalsIgnoreCase(orderCol.irregularType)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('happenTime')">
-                    a.happenTime
-                    <if test='orderCol.happenTime != null and "DESC".equalsIgnoreCase(orderCol.happenTime)'>DESC</if>
+                <if test="orderCol.containsKey('goworkCode')">
+                    a.goworkCode
+                    <if test='orderCol.goworkCode != null and "DESC".equalsIgnoreCase(orderCol.goworkCode)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('duration')">
-                    a.duration
-                    <if test='orderCol.duration != null and "DESC".equalsIgnoreCase(orderCol.duration)'>DESC</if>
+                <if test="orderCol.containsKey('goworkDepts')">
+                    a.goworkDepts
+                    <if test='orderCol.goworkDepts != null and "DESC".equalsIgnoreCase(orderCol.goworkDepts)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('alarmTime')">
-                    a.alarmTime
-                    <if test='orderCol.alarmTime != null and "DESC".equalsIgnoreCase(orderCol.alarmTime)'>DESC</if>
+                <if test="orderCol.containsKey('matterlName')">
+                    a.matterlName
+                    <if test='orderCol.matterlName != null and "DESC".equalsIgnoreCase(orderCol.matterlName)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('snapPath')">
-                    a.snapPath
-                    <if test='orderCol.snapPath != null and "DESC".equalsIgnoreCase(orderCol.snapPath)'>DESC</if>
+                <if test="orderCol.containsKey('goworkTime')">
+                    a.goworkTime
+                    <if test='orderCol.goworkTime != null and "DESC".equalsIgnoreCase(orderCol.goworkTime)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('ruleId')">
-- 
2.24.3