diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
index b66cd43e8cc0e36bb0de5b9da238f832d6c7079a..d7164c28cfda4d023e5e0111e68748684ba942cc 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
@@ -9,106 +9,113 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.check.model.vo.CheckAttendRecordVo;
 import lombok.Data;
 /**
-* 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅瀹炰綋瀵硅薄
-*
-* @author zxfei
-* @date 2023-05-18
-*/
+ * 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅瀹炰綋瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 @Data
 public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 璁板綍ID
-    */
+     * 璁板綍ID
+     */
     private Long recordId;
     /**
-    * 鍛樺伐ID
-    */
+     * 鍛樺伐ID
+     */
     private Long staffId;
     /**
-    * 鍛樺伐濮撳悕
-    */
+     * 鍛樺伐濮撳悕
+     */
     private String staffName;
     /**
-    * 宸ュ彿
-    */
+     * 宸ュ彿
+     */
     private String workNum;
     /**
-    * 鎵€灞為儴闂�
-    */
+     * 鎵€灞為儴闂�
+     */
     private Long deptId;
     /**
-    * 鎵€灞為儴闂ㄥ悕绉�
-    */
+     * 鎵€灞為儴闂ㄥ悕绉�
+     */
     private String deptName;
     /**
-    * 鎵€灞炶€冨嫟缁処D
-    */
+     * 鎵€灞炶€冨嫟缁処D
+     */
     private Long attendanceGroupId;
     /**
-    * 鎵€灞炶€冨嫟缁勫悕绉�
-    */
+     * 鎵€灞炶€冨嫟缁勫悕绉�
+     */
     private String attendanceGroupName;
     /**
-    * 鑰冨嫟鏃堕棿
-    */
+     * 鑰冨嫟鏃堕棿
+     */
     private Date attendanceDate;
     /**
-    * 缁╂晥瑙勫垯id
-    */
+     * 缁╂晥瑙勫垯id
+     */
     private Long ruleId;
     /**
-    * 瑙勫垯鍚嶇О
-    */
+     * 瑙勫垯鍚嶇О
+     */
     private String ruleName;
     /**
-    * 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    */
+     * 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     */
     private Integer subAddType;
     /**
-    * 鎵e垎鎴栧鍔犲垎鍊�
-    */
+     * 鎵e垎鎴栧鍔犲垎鍊�
+     */
     private BigDecimal score;
     /**
-    * 涓婁笅鐝椂闂�
-    */
+     * 涓婁笅鐝椂闂�
+     */
     private String goOffTimeStr;
     /**
-    * 寮傚父鏃堕棿
-    */
+     * 寮傚父鏃堕棿
+     */
     private Date errorTime;
     /**
-    * 瀹為檯鎵撳崱鏃堕棿
-    */
+     * 瀹為檯鎵撳崱鏃堕棿
+     */
     private Date actualAttendTime;
     /**
-    * 寮傚父澶勭悊缁撴灉
-    */
+     * 寮傚父澶勭悊缁撴灉
+     */
     private String errorResult;
     /**
-    * 鏍告煡浜哄憳
-    */
+     * 鏍告煡浜哄憳
+     */
+    @Excel(name = "鏍告煡浜哄憳")
     private String checkPerson;
     /**
-    * 鏍告煡鏃堕棿
-    */
+     * 鏍告煡鏃堕棿
+     */
     private Date checkTime;
     /**
-    * 鏍告煡璇存槑
-    */
+     * 鏍告煡璇存槑
+     */
+    @Excel(name = "鏍告煡璇存槑")
     private String checkDesc;
     /**
-    * 鏍告煡缁撴灉
-    */
+     * 鏍告煡缁撴灉
+     */
+    @Excel(name = "鏍告煡缁撴灉")
     private String checkResult;
     /**
-    * 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    */
+     * 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     */
     private Integer checkStatus;
+    /**
+     * 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     */
+    private Integer subMethod;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -116,7 +123,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
         if (obj instanceof CheckAttendRecordEntity) {
             CheckAttendRecordEntity tmp = (CheckAttendRecordEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -124,48 +131,50 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
 
     public void initAttrValue(){
 
-            this.recordId = -1L;
+        this.recordId = -1L;
+
+        this.staffId = -1L;
 
-            this.staffId = -1L;
+        this.staffName = "";
 
-            this.staffName = "";
+        this.workNum = "";
 
-            this.workNum = "";
+        this.deptId = -1L;
 
-            this.deptId = -1L;
+        this.deptName = "";
 
-            this.deptName = "";
+        this.attendanceGroupId = -1L;
 
-            this.attendanceGroupId = -1L;
+        this.attendanceGroupName = "";
 
-            this.attendanceGroupName = "";
+        this.attendanceDate = null;
 
-            this.attendanceDate = null;
+        this.ruleId = -1L;
 
-            this.ruleId = -1L;
+        this.ruleName = "";
 
-            this.ruleName = "";
+        this.subAddType = 1;
 
-            this.subAddType = 1;
+        this.score = BigDecimal.valueOf(0.00);
 
-            this.score = BigDecimal.valueOf(0.00);
+        this.goOffTimeStr = "";
 
-            this.goOffTimeStr = "";
+        this.errorTime = null;
 
-            this.errorTime = null;
+        this.actualAttendTime = null;
 
-            this.actualAttendTime = null;
+        this.errorResult = "";
 
-            this.errorResult = "";
+        this.checkPerson = "";
 
-            this.checkPerson = "";
+        this.checkTime = null;
 
-            this.checkTime = null;
+        this.checkDesc = "";
 
-            this.checkDesc = "";
+        this.checkResult = "";
 
-            this.checkResult = "";
+        this.checkStatus = 1;
 
-            this.checkStatus = 1;
+        this.subMethod = 1;
     }
 }
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
index 302193668dc1e54961fd29fc219eb846083a7947..e162dd8c396a7b05f8a38b281ed1f5955ce9e4f6 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 /**
-* 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅鏌ヨ瀵硅薄
-*
-* @author zxfei
-* @date 2023-05-18
-*/
+ * 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅鏌ヨ瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
     private Long idStart;
@@ -262,6 +262,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 缁撴潫 鏇存柊鏃堕棿 */
     private String updateTimeEnd;
 
+    /** 寮€濮� 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡) */
+    private Integer subMethodStart;
+
+    /** 缁撴潫 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡) */
+    private Integer subMethodEnd;
+
+    /** 澧炲姞 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡) */
+    private Integer subMethodIncrement;
+
+    /** 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)鍒楄〃 */
+    private List <Integer> subMethodList;
+
+    /** 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)鎺掗櫎鍒楄〃 */
+    private List <Integer> subMethodNotList;
+
     /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckAttendRecordQuery> orConditionList;
 
@@ -271,2226 +286,2361 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     public CheckAttendRecordQuery(){}
 
     /**
-    * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @return idStart
-    */
+     * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @return $idEnd
-    */
+     * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @return idIncrement
-    */
+     * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-    * @return idList
-    */
+     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-    * @return idNotList
-    */
+     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+     * @return idNotList
+     */
     public List<Long> getIdNotList(){
         return this.idNotList;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idNotList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idNotList
+     */
     public void setIdNotList(List<Long> idNotList){
         this.idNotList = idNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 璁板綍ID
-    * @return recordIdStart
-    */
+     * 鑾峰彇 寮€濮� 璁板綍ID
+     * @return recordIdStart
+     */
     public Long getRecordIdStart(){
         return this.recordIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 璁板綍ID
-    * @param recordIdStart
-    */
+     * 璁剧疆 寮€濮� 璁板綍ID
+     * @param recordIdStart
+     */
     public void setRecordIdStart(Long recordIdStart){
         this.recordIdStart = recordIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 璁板綍ID
-    * @return $recordIdEnd
-    */
+     * 鑾峰彇 缁撴潫 璁板綍ID
+     * @return $recordIdEnd
+     */
     public Long getRecordIdEnd(){
         return this.recordIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 璁板綍ID
-    * @param recordIdEnd
-    */
+     * 璁剧疆 缁撴潫 璁板綍ID
+     * @param recordIdEnd
+     */
     public void setRecordIdEnd(Long recordIdEnd){
         this.recordIdEnd = recordIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 璁板綍ID
-    * @return recordIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 璁板綍ID
+     * @return recordIdIncrement
+     */
     public Long getRecordIdIncrement(){
         return this.recordIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 璁板綍ID
-    * @param recordIdIncrement
-    */
+     * 璁剧疆 澧炲姞 璁板綍ID
+     * @param recordIdIncrement
+     */
     public void setRecordIdIncrement(Long recordIdIncrement){
         this.recordIdIncrement = recordIdIncrement;
     }
 
     /**
-    * 鑾峰彇 璁板綍ID
-    * @return recordIdList
-    */
+     * 鑾峰彇 璁板綍ID
+     * @return recordIdList
+     */
     public List<Long> getRecordIdList(){
         return this.recordIdList;
     }
 
     /**
-    * 璁剧疆 璁板綍ID
-    * @param recordIdList
-    */
+     * 璁剧疆 璁板綍ID
+     * @param recordIdList
+     */
     public void setRecordIdList(List<Long> recordIdList){
         this.recordIdList = recordIdList;
     }
 
     /**
-    * 鑾峰彇 璁板綍ID
-    * @return recordIdNotList
-    */
+     * 鑾峰彇 璁板綍ID
+     * @return recordIdNotList
+     */
     public List<Long> getRecordIdNotList(){
         return this.recordIdNotList;
     }
 
     /**
-    * 璁剧疆 璁板綍ID
-    * @param recordIdNotList
-    */
+     * 璁剧疆 璁板綍ID
+     * @param recordIdNotList
+     */
     public void setRecordIdNotList(List<Long> recordIdNotList){
         this.recordIdNotList = recordIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鍛樺伐ID
-    * @return staffIdStart
-    */
+     * 鑾峰彇 寮€濮� 鍛樺伐ID
+     * @return staffIdStart
+     */
     public Long getStaffIdStart(){
         return this.staffIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍛樺伐ID
-    * @param staffIdStart
-    */
+     * 璁剧疆 寮€濮� 鍛樺伐ID
+     * @param staffIdStart
+     */
     public void setStaffIdStart(Long staffIdStart){
         this.staffIdStart = staffIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍛樺伐ID
-    * @return $staffIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鍛樺伐ID
+     * @return $staffIdEnd
+     */
     public Long getStaffIdEnd(){
         return this.staffIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍛樺伐ID
-    * @param staffIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍛樺伐ID
+     * @param staffIdEnd
+     */
     public void setStaffIdEnd(Long staffIdEnd){
         this.staffIdEnd = staffIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍛樺伐ID
-    * @return staffIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鍛樺伐ID
+     * @return staffIdIncrement
+     */
     public Long getStaffIdIncrement(){
         return this.staffIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍛樺伐ID
-    * @param staffIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍛樺伐ID
+     * @param staffIdIncrement
+     */
     public void setStaffIdIncrement(Long staffIdIncrement){
         this.staffIdIncrement = staffIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鍛樺伐ID
-    * @return staffIdList
-    */
+     * 鑾峰彇 鍛樺伐ID
+     * @return staffIdList
+     */
     public List<Long> getStaffIdList(){
         return this.staffIdList;
     }
 
     /**
-    * 璁剧疆 鍛樺伐ID
-    * @param staffIdList
-    */
+     * 璁剧疆 鍛樺伐ID
+     * @param staffIdList
+     */
     public void setStaffIdList(List<Long> staffIdList){
         this.staffIdList = staffIdList;
     }
 
     /**
-    * 鑾峰彇 鍛樺伐ID
-    * @return staffIdNotList
-    */
+     * 鑾峰彇 鍛樺伐ID
+     * @return staffIdNotList
+     */
     public List<Long> getStaffIdNotList(){
         return this.staffIdNotList;
     }
 
     /**
-    * 璁剧疆 鍛樺伐ID
-    * @param staffIdNotList
-    */
+     * 璁剧疆 鍛樺伐ID
+     * @param staffIdNotList
+     */
     public void setStaffIdNotList(List<Long> staffIdNotList){
         this.staffIdNotList = staffIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 鍛樺伐濮撳悕
-    * @return staffNameList
-    */
+     * 鑾峰彇 鍛樺伐濮撳悕
+     * @return staffNameList
+     */
     public List<String> getStaffNameList(){
         return this.staffNameList;
     }
 
     /**
-    * 璁剧疆 鍛樺伐濮撳悕
-    * @param staffNameList
-    */
+     * 璁剧疆 鍛樺伐濮撳悕
+     * @param staffNameList
+     */
     public void setStaffNameList(List<String> staffNameList){
         this.staffNameList = staffNameList;
     }
 
     /**
-    * 鑾峰彇 鍛樺伐濮撳悕
-    * @return staffNameNotList
-    */
+     * 鑾峰彇 鍛樺伐濮撳悕
+     * @return staffNameNotList
+     */
     public List<String> getStaffNameNotList(){
         return this.staffNameNotList;
     }
 
     /**
-    * 璁剧疆 鍛樺伐濮撳悕
-    * @param staffNameNotList
-    */
+     * 璁剧疆 鍛樺伐濮撳悕
+     * @param staffNameNotList
+     */
     public void setStaffNameNotList(List<String> staffNameNotList){
         this.staffNameNotList = staffNameNotList;
     }
 
     /**
-    * 鑾峰彇 宸ュ彿
-    * @return workNumList
-    */
+     * 鑾峰彇 宸ュ彿
+     * @return workNumList
+     */
     public List<String> getWorkNumList(){
         return this.workNumList;
     }
 
     /**
-    * 璁剧疆 宸ュ彿
-    * @param workNumList
-    */
+     * 璁剧疆 宸ュ彿
+     * @param workNumList
+     */
     public void setWorkNumList(List<String> workNumList){
         this.workNumList = workNumList;
     }
 
     /**
-    * 鑾峰彇 宸ュ彿
-    * @return workNumNotList
-    */
+     * 鑾峰彇 宸ュ彿
+     * @return workNumNotList
+     */
     public List<String> getWorkNumNotList(){
         return this.workNumNotList;
     }
 
     /**
-    * 璁剧疆 宸ュ彿
-    * @param workNumNotList
-    */
+     * 璁剧疆 宸ュ彿
+     * @param workNumNotList
+     */
     public void setWorkNumNotList(List<String> workNumNotList){
         this.workNumNotList = workNumNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鎵€灞為儴闂�
-    * @return deptIdStart
-    */
+     * 鑾峰彇 寮€濮� 鎵€灞為儴闂�
+     * @return deptIdStart
+     */
     public Long getDeptIdStart(){
         return this.deptIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鎵€灞為儴闂�
-    * @param deptIdStart
-    */
+     * 璁剧疆 寮€濮� 鎵€灞為儴闂�
+     * @param deptIdStart
+     */
     public void setDeptIdStart(Long deptIdStart){
         this.deptIdStart = deptIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鎵€灞為儴闂�
-    * @return $deptIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鎵€灞為儴闂�
+     * @return $deptIdEnd
+     */
     public Long getDeptIdEnd(){
         return this.deptIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎵€灞為儴闂�
-    * @param deptIdEnd
-    */
+     * 璁剧疆 缁撴潫 鎵€灞為儴闂�
+     * @param deptIdEnd
+     */
     public void setDeptIdEnd(Long deptIdEnd){
         this.deptIdEnd = deptIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鎵€灞為儴闂�
-    * @return deptIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鎵€灞為儴闂�
+     * @return deptIdIncrement
+     */
     public Long getDeptIdIncrement(){
         return this.deptIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎵€灞為儴闂�
-    * @param deptIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鎵€灞為儴闂�
+     * @param deptIdIncrement
+     */
     public void setDeptIdIncrement(Long deptIdIncrement){
         this.deptIdIncrement = deptIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鎵€灞為儴闂�
-    * @return deptIdList
-    */
+     * 鑾峰彇 鎵€灞為儴闂�
+     * @return deptIdList
+     */
     public List<Long> getDeptIdList(){
         return this.deptIdList;
     }
 
     /**
-    * 璁剧疆 鎵€灞為儴闂�
-    * @param deptIdList
-    */
+     * 璁剧疆 鎵€灞為儴闂�
+     * @param deptIdList
+     */
     public void setDeptIdList(List<Long> deptIdList){
         this.deptIdList = deptIdList;
     }
 
     /**
-    * 鑾峰彇 鎵€灞為儴闂�
-    * @return deptIdNotList
-    */
+     * 鑾峰彇 鎵€灞為儴闂�
+     * @return deptIdNotList
+     */
     public List<Long> getDeptIdNotList(){
         return this.deptIdNotList;
     }
 
     /**
-    * 璁剧疆 鎵€灞為儴闂�
-    * @param deptIdNotList
-    */
+     * 璁剧疆 鎵€灞為儴闂�
+     * @param deptIdNotList
+     */
     public void setDeptIdNotList(List<Long> deptIdNotList){
         this.deptIdNotList = deptIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
-    * @return deptNameList
-    */
+     * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
+     * @return deptNameList
+     */
     public List<String> getDeptNameList(){
         return this.deptNameList;
     }
 
     /**
-    * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
-    * @param deptNameList
-    */
+     * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+     * @param deptNameList
+     */
     public void setDeptNameList(List<String> deptNameList){
         this.deptNameList = deptNameList;
     }
 
     /**
-    * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
-    * @return deptNameNotList
-    */
+     * 鑾峰彇 鎵€灞為儴闂ㄥ悕绉�
+     * @return deptNameNotList
+     */
     public List<String> getDeptNameNotList(){
         return this.deptNameNotList;
     }
 
     /**
-    * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
-    * @param deptNameNotList
-    */
+     * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+     * @param deptNameNotList
+     */
     public void setDeptNameNotList(List<String> deptNameNotList){
         this.deptNameNotList = deptNameNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鎵€灞炶€冨嫟缁処D
-    * @return attendanceGroupIdStart
-    */
+     * 鑾峰彇 寮€濮� 鎵€灞炶€冨嫟缁処D
+     * @return attendanceGroupIdStart
+     */
     public Long getAttendanceGroupIdStart(){
         return this.attendanceGroupIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdStart
-    */
+     * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdStart
+     */
     public void setAttendanceGroupIdStart(Long attendanceGroupIdStart){
         this.attendanceGroupIdStart = attendanceGroupIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鎵€灞炶€冨嫟缁処D
-    * @return $attendanceGroupIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鎵€灞炶€冨嫟缁処D
+     * @return $attendanceGroupIdEnd
+     */
     public Long getAttendanceGroupIdEnd(){
         return this.attendanceGroupIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdEnd
-    */
+     * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdEnd
+     */
     public void setAttendanceGroupIdEnd(Long attendanceGroupIdEnd){
         this.attendanceGroupIdEnd = attendanceGroupIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鎵€灞炶€冨嫟缁処D
-    * @return attendanceGroupIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鎵€灞炶€冨嫟缁処D
+     * @return attendanceGroupIdIncrement
+     */
     public Long getAttendanceGroupIdIncrement(){
         return this.attendanceGroupIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdIncrement
+     */
     public void setAttendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
         this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鎵€灞炶€冨嫟缁処D
-    * @return attendanceGroupIdList
-    */
+     * 鑾峰彇 鎵€灞炶€冨嫟缁処D
+     * @return attendanceGroupIdList
+     */
     public List<Long> getAttendanceGroupIdList(){
         return this.attendanceGroupIdList;
     }
 
     /**
-    * 璁剧疆 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdList
-    */
+     * 璁剧疆 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdList
+     */
     public void setAttendanceGroupIdList(List<Long> attendanceGroupIdList){
         this.attendanceGroupIdList = attendanceGroupIdList;
     }
 
     /**
-    * 鑾峰彇 鎵€灞炶€冨嫟缁処D
-    * @return attendanceGroupIdNotList
-    */
+     * 鑾峰彇 鎵€灞炶€冨嫟缁処D
+     * @return attendanceGroupIdNotList
+     */
     public List<Long> getAttendanceGroupIdNotList(){
         return this.attendanceGroupIdNotList;
     }
 
     /**
-    * 璁剧疆 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdNotList
-    */
+     * 璁剧疆 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdNotList
+     */
     public void setAttendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
         this.attendanceGroupIdNotList = attendanceGroupIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
-    * @return attendanceGroupNameList
-    */
+     * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
+     * @return attendanceGroupNameList
+     */
     public List<String> getAttendanceGroupNameList(){
         return this.attendanceGroupNameList;
     }
 
     /**
-    * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
-    * @param attendanceGroupNameList
-    */
+     * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+     * @param attendanceGroupNameList
+     */
     public void setAttendanceGroupNameList(List<String> attendanceGroupNameList){
         this.attendanceGroupNameList = attendanceGroupNameList;
     }
 
     /**
-    * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
-    * @return attendanceGroupNameNotList
-    */
+     * 鑾峰彇 鎵€灞炶€冨嫟缁勫悕绉�
+     * @return attendanceGroupNameNotList
+     */
     public List<String> getAttendanceGroupNameNotList(){
         return this.attendanceGroupNameNotList;
     }
 
     /**
-    * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
-    * @param attendanceGroupNameNotList
-    */
+     * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+     * @param attendanceGroupNameNotList
+     */
     public void setAttendanceGroupNameNotList(List<String> attendanceGroupNameNotList){
         this.attendanceGroupNameNotList = attendanceGroupNameNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鑰冨嫟鏃堕棿
-    * @return attendanceDateStart
-    */
+     * 鑾峰彇 寮€濮� 鑰冨嫟鏃堕棿
+     * @return attendanceDateStart
+     */
     public String getAttendanceDateStart(){
         return this.attendanceDateStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鑰冨嫟鏃堕棿
-    * @param attendanceDateStart
-    */
+     * 璁剧疆 寮€濮� 鑰冨嫟鏃堕棿
+     * @param attendanceDateStart
+     */
     public void setAttendanceDateStart(String attendanceDateStart){
         this.attendanceDateStart = attendanceDateStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鑰冨嫟鏃堕棿
-    * @return attendanceDateEnd
-    */
+     * 鑾峰彇 缁撴潫 鑰冨嫟鏃堕棿
+     * @return attendanceDateEnd
+     */
     public String getAttendanceDateEnd(){
         return this.attendanceDateEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑰冨嫟鏃堕棿
-    * @param attendanceDateEnd
-    */
+     * 璁剧疆 缁撴潫 鑰冨嫟鏃堕棿
+     * @param attendanceDateEnd
+     */
     public void setAttendanceDateEnd(String attendanceDateEnd){
         this.attendanceDateEnd = attendanceDateEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 缁╂晥瑙勫垯id
-    * @return ruleIdStart
-    */
+     * 鑾峰彇 寮€濮� 缁╂晥瑙勫垯id
+     * @return ruleIdStart
+     */
     public Long getRuleIdStart(){
         return this.ruleIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
-    * @param ruleIdStart
-    */
+     * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
+     * @param ruleIdStart
+     */
     public void setRuleIdStart(Long ruleIdStart){
         this.ruleIdStart = ruleIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 缁╂晥瑙勫垯id
-    * @return $ruleIdEnd
-    */
+     * 鑾峰彇 缁撴潫 缁╂晥瑙勫垯id
+     * @return $ruleIdEnd
+     */
     public Long getRuleIdEnd(){
         return this.ruleIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
-    * @param ruleIdEnd
-    */
+     * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
+     * @param ruleIdEnd
+     */
     public void setRuleIdEnd(Long ruleIdEnd){
         this.ruleIdEnd = ruleIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 缁╂晥瑙勫垯id
-    * @return ruleIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 缁╂晥瑙勫垯id
+     * @return ruleIdIncrement
+     */
     public Long getRuleIdIncrement(){
         return this.ruleIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
-    * @param ruleIdIncrement
-    */
+     * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
+     * @param ruleIdIncrement
+     */
     public void setRuleIdIncrement(Long ruleIdIncrement){
         this.ruleIdIncrement = ruleIdIncrement;
     }
 
     /**
-    * 鑾峰彇 缁╂晥瑙勫垯id
-    * @return ruleIdList
-    */
+     * 鑾峰彇 缁╂晥瑙勫垯id
+     * @return ruleIdList
+     */
     public List<Long> getRuleIdList(){
         return this.ruleIdList;
     }
 
     /**
-    * 璁剧疆 缁╂晥瑙勫垯id
-    * @param ruleIdList
-    */
+     * 璁剧疆 缁╂晥瑙勫垯id
+     * @param ruleIdList
+     */
     public void setRuleIdList(List<Long> ruleIdList){
         this.ruleIdList = ruleIdList;
     }
 
     /**
-    * 鑾峰彇 缁╂晥瑙勫垯id
-    * @return ruleIdNotList
-    */
+     * 鑾峰彇 缁╂晥瑙勫垯id
+     * @return ruleIdNotList
+     */
     public List<Long> getRuleIdNotList(){
         return this.ruleIdNotList;
     }
 
     /**
-    * 璁剧疆 缁╂晥瑙勫垯id
-    * @param ruleIdNotList
-    */
+     * 璁剧疆 缁╂晥瑙勫垯id
+     * @param ruleIdNotList
+     */
     public void setRuleIdNotList(List<Long> ruleIdNotList){
         this.ruleIdNotList = ruleIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 瑙勫垯鍚嶇О
-    * @return ruleNameList
-    */
+     * 鑾峰彇 瑙勫垯鍚嶇О
+     * @return ruleNameList
+     */
     public List<String> getRuleNameList(){
         return this.ruleNameList;
     }
 
     /**
-    * 璁剧疆 瑙勫垯鍚嶇О
-    * @param ruleNameList
-    */
+     * 璁剧疆 瑙勫垯鍚嶇О
+     * @param ruleNameList
+     */
     public void setRuleNameList(List<String> ruleNameList){
         this.ruleNameList = ruleNameList;
     }
 
     /**
-    * 鑾峰彇 瑙勫垯鍚嶇О
-    * @return ruleNameNotList
-    */
+     * 鑾峰彇 瑙勫垯鍚嶇О
+     * @return ruleNameNotList
+     */
     public List<String> getRuleNameNotList(){
         return this.ruleNameNotList;
     }
 
     /**
-    * 璁剧疆 瑙勫垯鍚嶇О
-    * @param ruleNameNotList
-    */
+     * 璁剧疆 瑙勫垯鍚嶇О
+     * @param ruleNameNotList
+     */
     public void setRuleNameNotList(List<String> ruleNameNotList){
         this.ruleNameNotList = ruleNameNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @return subAddTypeStart
-    */
+     * 鑾峰彇 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @return subAddTypeStart
+     */
     public Integer getSubAddTypeStart(){
         return this.subAddTypeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeStart
-    */
+     * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeStart
+     */
     public void setSubAddTypeStart(Integer subAddTypeStart){
         this.subAddTypeStart = subAddTypeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @return $subAddTypeEnd
-    */
+     * 鑾峰彇 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @return $subAddTypeEnd
+     */
     public Integer getSubAddTypeEnd(){
         return this.subAddTypeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeEnd
-    */
+     * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeEnd
+     */
     public void setSubAddTypeEnd(Integer subAddTypeEnd){
         this.subAddTypeEnd = subAddTypeEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @return subAddTypeIncrement
-    */
+     * 鑾峰彇 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @return subAddTypeIncrement
+     */
     public Integer getSubAddTypeIncrement(){
         return this.subAddTypeIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeIncrement
+     */
     public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
         this.subAddTypeIncrement = subAddTypeIncrement;
     }
 
     /**
-    * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @return subAddTypeList
-    */
+     * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @return subAddTypeList
+     */
     public List<Integer> getSubAddTypeList(){
         return this.subAddTypeList;
     }
 
     /**
-    * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeList
-    */
+     * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeList
+     */
     public void setSubAddTypeList(List<Integer> subAddTypeList){
         this.subAddTypeList = subAddTypeList;
     }
 
     /**
-    * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @return subAddTypeNotList
-    */
+     * 鑾峰彇 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @return subAddTypeNotList
+     */
     public List<Integer> getSubAddTypeNotList(){
         return this.subAddTypeNotList;
     }
 
     /**
-    * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeNotList
-    */
+     * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeNotList
+     */
     public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
         this.subAddTypeNotList = subAddTypeNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鎵e垎鎴栧鍔犲垎鍊�
-    * @return scoreStart
-    */
+     * 鑾峰彇 寮€濮� 鎵e垎鎴栧鍔犲垎鍊�
+     * @return scoreStart
+     */
     public BigDecimal getScoreStart(){
         return this.scoreStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreStart
-    */
+     * 璁剧疆 寮€濮� 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreStart
+     */
     public void setScoreStart(BigDecimal scoreStart){
         this.scoreStart = scoreStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鎵e垎鎴栧鍔犲垎鍊�
-    * @return $scoreEnd
-    */
+     * 鑾峰彇 缁撴潫 鎵e垎鎴栧鍔犲垎鍊�
+     * @return $scoreEnd
+     */
     public BigDecimal getScoreEnd(){
         return this.scoreEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreEnd
-    */
+     * 璁剧疆 缁撴潫 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreEnd
+     */
     public void setScoreEnd(BigDecimal scoreEnd){
         this.scoreEnd = scoreEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鎵e垎鎴栧鍔犲垎鍊�
-    * @return scoreIncrement
-    */
+     * 鑾峰彇 澧炲姞 鎵e垎鎴栧鍔犲垎鍊�
+     * @return scoreIncrement
+     */
     public BigDecimal getScoreIncrement(){
         return this.scoreIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreIncrement
-    */
+     * 璁剧疆 澧炲姞 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreIncrement
+     */
     public void setScoreIncrement(BigDecimal scoreIncrement){
         this.scoreIncrement = scoreIncrement;
     }
 
     /**
-    * 鑾峰彇 鎵e垎鎴栧鍔犲垎鍊�
-    * @return scoreList
-    */
+     * 鑾峰彇 鎵e垎鎴栧鍔犲垎鍊�
+     * @return scoreList
+     */
     public List<BigDecimal> getScoreList(){
         return this.scoreList;
     }
 
     /**
-    * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreList
-    */
+     * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreList
+     */
     public void setScoreList(List<BigDecimal> scoreList){
         this.scoreList = scoreList;
     }
 
     /**
-    * 鑾峰彇 鎵e垎鎴栧鍔犲垎鍊�
-    * @return scoreNotList
-    */
+     * 鑾峰彇 鎵e垎鎴栧鍔犲垎鍊�
+     * @return scoreNotList
+     */
     public List<BigDecimal> getScoreNotList(){
         return this.scoreNotList;
     }
 
     /**
-    * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreNotList
-    */
+     * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreNotList
+     */
     public void setScoreNotList(List<BigDecimal> scoreNotList){
         this.scoreNotList = scoreNotList;
     }
 
 
     /**
-    * 鑾峰彇 涓婁笅鐝椂闂�
-    * @return goOffTimeStrList
-    */
+     * 鑾峰彇 涓婁笅鐝椂闂�
+     * @return goOffTimeStrList
+     */
     public List<String> getGoOffTimeStrList(){
         return this.goOffTimeStrList;
     }
 
     /**
-    * 璁剧疆 涓婁笅鐝椂闂�
-    * @param goOffTimeStrList
-    */
+     * 璁剧疆 涓婁笅鐝椂闂�
+     * @param goOffTimeStrList
+     */
     public void setGoOffTimeStrList(List<String> goOffTimeStrList){
         this.goOffTimeStrList = goOffTimeStrList;
     }
 
     /**
-    * 鑾峰彇 涓婁笅鐝椂闂�
-    * @return goOffTimeStrNotList
-    */
+     * 鑾峰彇 涓婁笅鐝椂闂�
+     * @return goOffTimeStrNotList
+     */
     public List<String> getGoOffTimeStrNotList(){
         return this.goOffTimeStrNotList;
     }
 
     /**
-    * 璁剧疆 涓婁笅鐝椂闂�
-    * @param goOffTimeStrNotList
-    */
+     * 璁剧疆 涓婁笅鐝椂闂�
+     * @param goOffTimeStrNotList
+     */
     public void setGoOffTimeStrNotList(List<String> goOffTimeStrNotList){
         this.goOffTimeStrNotList = goOffTimeStrNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 寮傚父鏃堕棿
-    * @return errorTimeStart
-    */
+     * 鑾峰彇 寮€濮� 寮傚父鏃堕棿
+     * @return errorTimeStart
+     */
     public String getErrorTimeStart(){
         return this.errorTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 寮傚父鏃堕棿
-    * @param errorTimeStart
-    */
+     * 璁剧疆 寮€濮� 寮傚父鏃堕棿
+     * @param errorTimeStart
+     */
     public void setErrorTimeStart(String errorTimeStart){
         this.errorTimeStart = errorTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 寮傚父鏃堕棿
-    * @return errorTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 寮傚父鏃堕棿
+     * @return errorTimeEnd
+     */
     public String getErrorTimeEnd(){
         return this.errorTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 寮傚父鏃堕棿
-    * @param errorTimeEnd
-    */
+     * 璁剧疆 缁撴潫 寮傚父鏃堕棿
+     * @param errorTimeEnd
+     */
     public void setErrorTimeEnd(String errorTimeEnd){
         this.errorTimeEnd = errorTimeEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 瀹為檯鎵撳崱鏃堕棿
-    * @return actualAttendTimeStart
-    */
+     * 鑾峰彇 寮€濮� 瀹為檯鎵撳崱鏃堕棿
+     * @return actualAttendTimeStart
+     */
     public String getActualAttendTimeStart(){
         return this.actualAttendTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 瀹為檯鎵撳崱鏃堕棿
-    * @param actualAttendTimeStart
-    */
+     * 璁剧疆 寮€濮� 瀹為檯鎵撳崱鏃堕棿
+     * @param actualAttendTimeStart
+     */
     public void setActualAttendTimeStart(String actualAttendTimeStart){
         this.actualAttendTimeStart = actualAttendTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 瀹為檯鎵撳崱鏃堕棿
-    * @return actualAttendTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 瀹為檯鎵撳崱鏃堕棿
+     * @return actualAttendTimeEnd
+     */
     public String getActualAttendTimeEnd(){
         return this.actualAttendTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 瀹為檯鎵撳崱鏃堕棿
-    * @param actualAttendTimeEnd
-    */
+     * 璁剧疆 缁撴潫 瀹為檯鎵撳崱鏃堕棿
+     * @param actualAttendTimeEnd
+     */
     public void setActualAttendTimeEnd(String actualAttendTimeEnd){
         this.actualAttendTimeEnd = actualAttendTimeEnd;
     }
 
     /**
-    * 鑾峰彇 寮傚父澶勭悊缁撴灉
-    * @return errorResultList
-    */
+     * 鑾峰彇 寮傚父澶勭悊缁撴灉
+     * @return errorResultList
+     */
     public List<String> getErrorResultList(){
         return this.errorResultList;
     }
 
     /**
-    * 璁剧疆 寮傚父澶勭悊缁撴灉
-    * @param errorResultList
-    */
+     * 璁剧疆 寮傚父澶勭悊缁撴灉
+     * @param errorResultList
+     */
     public void setErrorResultList(List<String> errorResultList){
         this.errorResultList = errorResultList;
     }
 
     /**
-    * 鑾峰彇 寮傚父澶勭悊缁撴灉
-    * @return errorResultNotList
-    */
+     * 鑾峰彇 寮傚父澶勭悊缁撴灉
+     * @return errorResultNotList
+     */
     public List<String> getErrorResultNotList(){
         return this.errorResultNotList;
     }
 
     /**
-    * 璁剧疆 寮傚父澶勭悊缁撴灉
-    * @param errorResultNotList
-    */
+     * 璁剧疆 寮傚父澶勭悊缁撴灉
+     * @param errorResultNotList
+     */
     public void setErrorResultNotList(List<String> errorResultNotList){
         this.errorResultNotList = errorResultNotList;
     }
 
     /**
-    * 鑾峰彇 鏍告煡浜哄憳
-    * @return checkPersonList
-    */
+     * 鑾峰彇 鏍告煡浜哄憳
+     * @return checkPersonList
+     */
     public List<String> getCheckPersonList(){
         return this.checkPersonList;
     }
 
     /**
-    * 璁剧疆 鏍告煡浜哄憳
-    * @param checkPersonList
-    */
+     * 璁剧疆 鏍告煡浜哄憳
+     * @param checkPersonList
+     */
     public void setCheckPersonList(List<String> checkPersonList){
         this.checkPersonList = checkPersonList;
     }
 
     /**
-    * 鑾峰彇 鏍告煡浜哄憳
-    * @return checkPersonNotList
-    */
+     * 鑾峰彇 鏍告煡浜哄憳
+     * @return checkPersonNotList
+     */
     public List<String> getCheckPersonNotList(){
         return this.checkPersonNotList;
     }
 
     /**
-    * 璁剧疆 鏍告煡浜哄憳
-    * @param checkPersonNotList
-    */
+     * 璁剧疆 鏍告煡浜哄憳
+     * @param checkPersonNotList
+     */
     public void setCheckPersonNotList(List<String> checkPersonNotList){
         this.checkPersonNotList = checkPersonNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鏍告煡鏃堕棿
-    * @return checkTimeStart
-    */
+     * 鑾峰彇 寮€濮� 鏍告煡鏃堕棿
+     * @return checkTimeStart
+     */
     public String getCheckTimeStart(){
         return this.checkTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鏍告煡鏃堕棿
-    * @param checkTimeStart
-    */
+     * 璁剧疆 寮€濮� 鏍告煡鏃堕棿
+     * @param checkTimeStart
+     */
     public void setCheckTimeStart(String checkTimeStart){
         this.checkTimeStart = checkTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鏍告煡鏃堕棿
-    * @return checkTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 鏍告煡鏃堕棿
+     * @return checkTimeEnd
+     */
     public String getCheckTimeEnd(){
         return this.checkTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏍告煡鏃堕棿
-    * @param checkTimeEnd
-    */
+     * 璁剧疆 缁撴潫 鏍告煡鏃堕棿
+     * @param checkTimeEnd
+     */
     public void setCheckTimeEnd(String checkTimeEnd){
         this.checkTimeEnd = checkTimeEnd;
     }
 
     /**
-    * 鑾峰彇 鏍告煡璇存槑
-    * @return checkDescList
-    */
+     * 鑾峰彇 鏍告煡璇存槑
+     * @return checkDescList
+     */
     public List<String> getCheckDescList(){
         return this.checkDescList;
     }
 
     /**
-    * 璁剧疆 鏍告煡璇存槑
-    * @param checkDescList
-    */
+     * 璁剧疆 鏍告煡璇存槑
+     * @param checkDescList
+     */
     public void setCheckDescList(List<String> checkDescList){
         this.checkDescList = checkDescList;
     }
 
     /**
-    * 鑾峰彇 鏍告煡璇存槑
-    * @return checkDescNotList
-    */
+     * 鑾峰彇 鏍告煡璇存槑
+     * @return checkDescNotList
+     */
     public List<String> getCheckDescNotList(){
         return this.checkDescNotList;
     }
 
     /**
-    * 璁剧疆 鏍告煡璇存槑
-    * @param checkDescNotList
-    */
+     * 璁剧疆 鏍告煡璇存槑
+     * @param checkDescNotList
+     */
     public void setCheckDescNotList(List<String> checkDescNotList){
         this.checkDescNotList = checkDescNotList;
     }
 
     /**
-    * 鑾峰彇 鏍告煡缁撴灉
-    * @return checkResultList
-    */
+     * 鑾峰彇 鏍告煡缁撴灉
+     * @return checkResultList
+     */
     public List<String> getCheckResultList(){
         return this.checkResultList;
     }
 
     /**
-    * 璁剧疆 鏍告煡缁撴灉
-    * @param checkResultList
-    */
+     * 璁剧疆 鏍告煡缁撴灉
+     * @param checkResultList
+     */
     public void setCheckResultList(List<String> checkResultList){
         this.checkResultList = checkResultList;
     }
 
     /**
-    * 鑾峰彇 鏍告煡缁撴灉
-    * @return checkResultNotList
-    */
+     * 鑾峰彇 鏍告煡缁撴灉
+     * @return checkResultNotList
+     */
     public List<String> getCheckResultNotList(){
         return this.checkResultNotList;
     }
 
     /**
-    * 璁剧疆 鏍告煡缁撴灉
-    * @param checkResultNotList
-    */
+     * 璁剧疆 鏍告煡缁撴灉
+     * @param checkResultNotList
+     */
     public void setCheckResultNotList(List<String> checkResultNotList){
         this.checkResultNotList = checkResultNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @return checkStatusStart
-    */
+     * 鑾峰彇 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @return checkStatusStart
+     */
     public Integer getCheckStatusStart(){
         return this.checkStatusStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusStart
-    */
+     * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusStart
+     */
     public void setCheckStatusStart(Integer checkStatusStart){
         this.checkStatusStart = checkStatusStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @return $checkStatusEnd
-    */
+     * 鑾峰彇 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @return $checkStatusEnd
+     */
     public Integer getCheckStatusEnd(){
         return this.checkStatusEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusEnd
-    */
+     * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusEnd
+     */
     public void setCheckStatusEnd(Integer checkStatusEnd){
         this.checkStatusEnd = checkStatusEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @return checkStatusIncrement
-    */
+     * 鑾峰彇 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @return checkStatusIncrement
+     */
     public Integer getCheckStatusIncrement(){
         return this.checkStatusIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusIncrement
-    */
+     * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusIncrement
+     */
     public void setCheckStatusIncrement(Integer checkStatusIncrement){
         this.checkStatusIncrement = checkStatusIncrement;
     }
 
     /**
-    * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @return checkStatusList
-    */
+     * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @return checkStatusList
+     */
     public List<Integer> getCheckStatusList(){
         return this.checkStatusList;
     }
 
     /**
-    * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusList
-    */
+     * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusList
+     */
     public void setCheckStatusList(List<Integer> checkStatusList){
         this.checkStatusList = checkStatusList;
     }
 
     /**
-    * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @return checkStatusNotList
-    */
+     * 鑾峰彇 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @return checkStatusNotList
+     */
     public List<Integer> getCheckStatusNotList(){
         return this.checkStatusNotList;
     }
 
     /**
-    * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusNotList
-    */
+     * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusNotList
+     */
     public void setCheckStatusNotList(List<Integer> checkStatusNotList){
         this.checkStatusNotList = checkStatusNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @return createUserIdStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @return $createUserIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @return createUserIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdNotList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdNotList
+     */
     public List<Long> getCreateUserIdNotList(){
         return this.createUserIdNotList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdNotList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdNotList
+     */
     public void setCreateUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-    * @return createTimeStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-    * @param createTimeStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-    * @return createTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-    * @param createTimeEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛
-    * @return updateUserIdStart
-    */
+     * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛
+     * @return updateUserIdStart
+     */
     public Long getUpdateUserIdStart(){
         return this.updateUserIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
-    * @param updateUserIdStart
-    */
+     * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
+     * @param updateUserIdStart
+     */
     public void setUpdateUserIdStart(Long updateUserIdStart){
         this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛
-    * @return $updateUserIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛
+     * @return $updateUserIdEnd
+     */
     public Long getUpdateUserIdEnd(){
         return this.updateUserIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
-    * @param updateUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
+     * @param updateUserIdEnd
+     */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
         this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛
-    * @return updateUserIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛
+     * @return updateUserIdIncrement
+     */
     public Long getUpdateUserIdIncrement(){
         return this.updateUserIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
-    * @param updateUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
+     * @param updateUserIdIncrement
+     */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
         this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鏇存柊鐢ㄦ埛
-    * @return updateUserIdList
-    */
+     * 鑾峰彇 鏇存柊鐢ㄦ埛
+     * @return updateUserIdList
+     */
     public List<Long> getUpdateUserIdList(){
         return this.updateUserIdList;
     }
 
     /**
-    * 璁剧疆 鏇存柊鐢ㄦ埛
-    * @param updateUserIdList
-    */
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdList
+     */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 鑾峰彇 鏇存柊鐢ㄦ埛
-    * @return updateUserIdNotList
-    */
+     * 鑾峰彇 鏇存柊鐢ㄦ埛
+     * @return updateUserIdNotList
+     */
     public List<Long> getUpdateUserIdNotList(){
         return this.updateUserIdNotList;
     }
 
     /**
-    * 璁剧疆 鏇存柊鐢ㄦ埛
-    * @param updateUserIdNotList
-    */
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdNotList
+     */
     public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
-    * @return updateTimeStart
-    */
+     * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
+     * @return updateTimeStart
+     */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
-    * @param updateTimeStart
-    */
+     * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
+     * @param updateTimeStart
+     */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
-    * @return updateTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
+     * @return updateTimeEnd
+     */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
-    * @param updateTimeEnd
-    */
+     * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
+     * @param updateTimeEnd
+     */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-    * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
-    * @param id
-    */
+     * 鑾峰彇 寮€濮� 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @return subMethodStart
+     */
+    public Integer getSubMethodStart(){
+        return this.subMethodStart;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodStart
+     */
+    public void setSubMethodStart(Integer subMethodStart){
+        this.subMethodStart = subMethodStart;
+    }
+
+    /**
+     * 鑾峰彇 缁撴潫 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @return $subMethodEnd
+     */
+    public Integer getSubMethodEnd(){
+        return this.subMethodEnd;
+    }
+
+    /**
+     * 璁剧疆 缁撴潫 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodEnd
+     */
+    public void setSubMethodEnd(Integer subMethodEnd){
+        this.subMethodEnd = subMethodEnd;
+    }
+
+    /**
+     * 鑾峰彇 澧炲姞 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @return subMethodIncrement
+     */
+    public Integer getSubMethodIncrement(){
+        return this.subMethodIncrement;
+    }
+
+    /**
+     * 璁剧疆 澧炲姞 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodIncrement
+     */
+    public void setSubMethodIncrement(Integer subMethodIncrement){
+        this.subMethodIncrement = subMethodIncrement;
+    }
+
+    /**
+     * 鑾峰彇 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @return subMethodList
+     */
+    public List<Integer> getSubMethodList(){
+        return this.subMethodList;
+    }
+
+    /**
+     * 璁剧疆 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodList
+     */
+    public void setSubMethodList(List<Integer> subMethodList){
+        this.subMethodList = subMethodList;
+    }
+
+    /**
+     * 鑾峰彇 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @return subMethodNotList
+     */
+    public List<Integer> getSubMethodNotList(){
+        return this.subMethodNotList;
+    }
+
+    /**
+     * 璁剧疆 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodNotList
+     */
+    public void setSubMethodNotList(List<Integer> subMethodNotList){
+        this.subMethodNotList = subMethodNotList;
+    }
+
+
+    /**
+     * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
+     * @param id
+     */
     public CheckAttendRecordQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public CheckAttendRecordQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public CheckAttendRecordQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public CheckAttendRecordQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public CheckAttendRecordQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-        * @param idNotList
-        */
-        public CheckAttendRecordQuery idNotList(List<Long> idNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idNotList
+     */
+    public CheckAttendRecordQuery idNotList(List<Long> idNotList){
         this.idNotList = idNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  璁板綍ID
-    * @param recordId
-    */
+     * 璁剧疆  璁板綍ID
+     * @param recordId
+     */
     public CheckAttendRecordQuery recordId(Long recordId){
-	    setRecordId(recordId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 璁板綍ID
-    * @param recordIdStart
-    */
+        setRecordId(recordId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 璁板綍ID
+     * @param recordIdStart
+     */
     public CheckAttendRecordQuery recordIdStart(Long recordIdStart){
-		this.recordIdStart = recordIdStart;
-		return this;
+        this.recordIdStart = recordIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 璁板綍ID
-    * @param recordIdEnd
-    */
+     * 璁剧疆 缁撴潫 璁板綍ID
+     * @param recordIdEnd
+     */
     public CheckAttendRecordQuery recordIdEnd(Long recordIdEnd){
-		this.recordIdEnd = recordIdEnd;
-		return this;
+        this.recordIdEnd = recordIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 璁板綍ID
-    * @param recordIdIncrement
-    */
+     * 璁剧疆 澧炲姞 璁板綍ID
+     * @param recordIdIncrement
+     */
     public CheckAttendRecordQuery recordIdIncrement(Long recordIdIncrement){
-		this.recordIdIncrement = recordIdIncrement;
-		return this;
+        this.recordIdIncrement = recordIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 璁板綍ID
-    * @param recordIdList
-    */
+     * 璁剧疆 璁板綍ID
+     * @param recordIdList
+     */
     public CheckAttendRecordQuery recordIdList(List<Long> recordIdList){
         this.recordIdList = recordIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 璁板綍ID
-        * @param recordIdNotList
-        */
-        public CheckAttendRecordQuery recordIdNotList(List<Long> recordIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 璁板綍ID
+     * @param recordIdNotList
+     */
+    public CheckAttendRecordQuery recordIdNotList(List<Long> recordIdNotList){
         this.recordIdNotList = recordIdNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  鍛樺伐ID
-    * @param staffId
-    */
+     * 璁剧疆  鍛樺伐ID
+     * @param staffId
+     */
     public CheckAttendRecordQuery staffId(Long staffId){
-	    setStaffId(staffId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍛樺伐ID
-    * @param staffIdStart
-    */
+        setStaffId(staffId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍛樺伐ID
+     * @param staffIdStart
+     */
     public CheckAttendRecordQuery staffIdStart(Long staffIdStart){
-		this.staffIdStart = staffIdStart;
-		return this;
+        this.staffIdStart = staffIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍛樺伐ID
-    * @param staffIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍛樺伐ID
+     * @param staffIdEnd
+     */
     public CheckAttendRecordQuery staffIdEnd(Long staffIdEnd){
-		this.staffIdEnd = staffIdEnd;
-		return this;
+        this.staffIdEnd = staffIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍛樺伐ID
-    * @param staffIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍛樺伐ID
+     * @param staffIdIncrement
+     */
     public CheckAttendRecordQuery staffIdIncrement(Long staffIdIncrement){
-		this.staffIdIncrement = staffIdIncrement;
-		return this;
+        this.staffIdIncrement = staffIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍛樺伐ID
-    * @param staffIdList
-    */
+     * 璁剧疆 鍛樺伐ID
+     * @param staffIdList
+     */
     public CheckAttendRecordQuery staffIdList(List<Long> staffIdList){
         this.staffIdList = staffIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鍛樺伐ID
-        * @param staffIdNotList
-        */
-        public CheckAttendRecordQuery staffIdNotList(List<Long> staffIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍛樺伐ID
+     * @param staffIdNotList
+     */
+    public CheckAttendRecordQuery staffIdNotList(List<Long> staffIdNotList){
         this.staffIdNotList = staffIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 鍛樺伐濮撳悕
-    * @param staffName
-    */
+    /**
+     * 璁剧疆 鍛樺伐濮撳悕
+     * @param staffName
+     */
     public CheckAttendRecordQuery staffName(String staffName){
         setStaffName(staffName);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍛樺伐濮撳悕
-    * @param staffNameList
-    */
+     * 璁剧疆 鍛樺伐濮撳悕
+     * @param staffNameList
+     */
     public CheckAttendRecordQuery staffNameList(List<String> staffNameList){
         this.staffNameList = staffNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 宸ュ彿
-    * @param workNum
-    */
+    /**
+     * 璁剧疆 宸ュ彿
+     * @param workNum
+     */
     public CheckAttendRecordQuery workNum(String workNum){
         setWorkNum(workNum);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 宸ュ彿
-    * @param workNumList
-    */
+     * 璁剧疆 宸ュ彿
+     * @param workNumList
+     */
     public CheckAttendRecordQuery workNumList(List<String> workNumList){
         this.workNumList = workNumList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  鎵€灞為儴闂�
-    * @param deptId
-    */
+     * 璁剧疆  鎵€灞為儴闂�
+     * @param deptId
+     */
     public CheckAttendRecordQuery deptId(Long deptId){
-	    setDeptId(deptId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鎵€灞為儴闂�
-    * @param deptIdStart
-    */
+        setDeptId(deptId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鎵€灞為儴闂�
+     * @param deptIdStart
+     */
     public CheckAttendRecordQuery deptIdStart(Long deptIdStart){
-		this.deptIdStart = deptIdStart;
-		return this;
+        this.deptIdStart = deptIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎵€灞為儴闂�
-    * @param deptIdEnd
-    */
+     * 璁剧疆 缁撴潫 鎵€灞為儴闂�
+     * @param deptIdEnd
+     */
     public CheckAttendRecordQuery deptIdEnd(Long deptIdEnd){
-		this.deptIdEnd = deptIdEnd;
-		return this;
+        this.deptIdEnd = deptIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎵€灞為儴闂�
-    * @param deptIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鎵€灞為儴闂�
+     * @param deptIdIncrement
+     */
     public CheckAttendRecordQuery deptIdIncrement(Long deptIdIncrement){
-		this.deptIdIncrement = deptIdIncrement;
-		return this;
+        this.deptIdIncrement = deptIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎵€灞為儴闂�
-    * @param deptIdList
-    */
+     * 璁剧疆 鎵€灞為儴闂�
+     * @param deptIdList
+     */
     public CheckAttendRecordQuery deptIdList(List<Long> deptIdList){
         this.deptIdList = deptIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鎵€灞為儴闂�
-        * @param deptIdNotList
-        */
-        public CheckAttendRecordQuery deptIdNotList(List<Long> deptIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鎵€灞為儴闂�
+     * @param deptIdNotList
+     */
+    public CheckAttendRecordQuery deptIdNotList(List<Long> deptIdNotList){
         this.deptIdNotList = deptIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
-    * @param deptName
-    */
+    /**
+     * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+     * @param deptName
+     */
     public CheckAttendRecordQuery deptName(String deptName){
         setDeptName(deptName);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
-    * @param deptNameList
-    */
+     * 璁剧疆 鎵€灞為儴闂ㄥ悕绉�
+     * @param deptNameList
+     */
     public CheckAttendRecordQuery deptNameList(List<String> deptNameList){
         this.deptNameList = deptNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupId
-    */
+     * 璁剧疆  鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupId
+     */
     public CheckAttendRecordQuery attendanceGroupId(Long attendanceGroupId){
-	    setAttendanceGroupId(attendanceGroupId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdStart
-    */
+        setAttendanceGroupId(attendanceGroupId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdStart
+     */
     public CheckAttendRecordQuery attendanceGroupIdStart(Long attendanceGroupIdStart){
-		this.attendanceGroupIdStart = attendanceGroupIdStart;
-		return this;
+        this.attendanceGroupIdStart = attendanceGroupIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdEnd
-    */
+     * 璁剧疆 缁撴潫 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdEnd
+     */
     public CheckAttendRecordQuery attendanceGroupIdEnd(Long attendanceGroupIdEnd){
-		this.attendanceGroupIdEnd = attendanceGroupIdEnd;
-		return this;
+        this.attendanceGroupIdEnd = attendanceGroupIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdIncrement
+     */
     public CheckAttendRecordQuery attendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
-		this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
-		return this;
+        this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎵€灞炶€冨嫟缁処D
-    * @param attendanceGroupIdList
-    */
+     * 璁剧疆 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdList
+     */
     public CheckAttendRecordQuery attendanceGroupIdList(List<Long> attendanceGroupIdList){
         this.attendanceGroupIdList = attendanceGroupIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鎵€灞炶€冨嫟缁処D
-        * @param attendanceGroupIdNotList
-        */
-        public CheckAttendRecordQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鎵€灞炶€冨嫟缁処D
+     * @param attendanceGroupIdNotList
+     */
+    public CheckAttendRecordQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
         this.attendanceGroupIdNotList = attendanceGroupIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
-    * @param attendanceGroupName
-    */
+    /**
+     * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+     * @param attendanceGroupName
+     */
     public CheckAttendRecordQuery attendanceGroupName(String attendanceGroupName){
         setAttendanceGroupName(attendanceGroupName);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
-    * @param attendanceGroupNameList
-    */
+     * 璁剧疆 鎵€灞炶€冨嫟缁勫悕绉�
+     * @param attendanceGroupNameList
+     */
     public CheckAttendRecordQuery attendanceGroupNameList(List<String> attendanceGroupNameList){
         this.attendanceGroupNameList = attendanceGroupNameList;
-		return this;
+        return this;
     }
 
 
     /**
-    * 璁剧疆  缁╂晥瑙勫垯id
-    * @param ruleId
-    */
+     * 璁剧疆  缁╂晥瑙勫垯id
+     * @param ruleId
+     */
     public CheckAttendRecordQuery ruleId(Long ruleId){
-	    setRuleId(ruleId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
-    * @param ruleIdStart
-    */
+        setRuleId(ruleId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 缁╂晥瑙勫垯id
+     * @param ruleIdStart
+     */
     public CheckAttendRecordQuery ruleIdStart(Long ruleIdStart){
-		this.ruleIdStart = ruleIdStart;
-		return this;
+        this.ruleIdStart = ruleIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
-    * @param ruleIdEnd
-    */
+     * 璁剧疆 缁撴潫 缁╂晥瑙勫垯id
+     * @param ruleIdEnd
+     */
     public CheckAttendRecordQuery ruleIdEnd(Long ruleIdEnd){
-		this.ruleIdEnd = ruleIdEnd;
-		return this;
+        this.ruleIdEnd = ruleIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
-    * @param ruleIdIncrement
-    */
+     * 璁剧疆 澧炲姞 缁╂晥瑙勫垯id
+     * @param ruleIdIncrement
+     */
     public CheckAttendRecordQuery ruleIdIncrement(Long ruleIdIncrement){
-		this.ruleIdIncrement = ruleIdIncrement;
-		return this;
+        this.ruleIdIncrement = ruleIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁╂晥瑙勫垯id
-    * @param ruleIdList
-    */
+     * 璁剧疆 缁╂晥瑙勫垯id
+     * @param ruleIdList
+     */
     public CheckAttendRecordQuery ruleIdList(List<Long> ruleIdList){
         this.ruleIdList = ruleIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 缁╂晥瑙勫垯id
-        * @param ruleIdNotList
-        */
-        public CheckAttendRecordQuery ruleIdNotList(List<Long> ruleIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 缁╂晥瑙勫垯id
+     * @param ruleIdNotList
+     */
+    public CheckAttendRecordQuery ruleIdNotList(List<Long> ruleIdNotList){
         this.ruleIdNotList = ruleIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 瑙勫垯鍚嶇О
-    * @param ruleName
-    */
+    /**
+     * 璁剧疆 瑙勫垯鍚嶇О
+     * @param ruleName
+     */
     public CheckAttendRecordQuery ruleName(String ruleName){
         setRuleName(ruleName);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 瑙勫垯鍚嶇О
-    * @param ruleNameList
-    */
+     * 璁剧疆 瑙勫垯鍚嶇О
+     * @param ruleNameList
+     */
     public CheckAttendRecordQuery ruleNameList(List<String> ruleNameList){
         this.ruleNameList = ruleNameList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddType
-    */
+     * 璁剧疆  澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddType
+     */
     public CheckAttendRecordQuery subAddType(Integer subAddType){
-	    setSubAddType(subAddType);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeStart
-    */
+        setSubAddType(subAddType);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeStart
+     */
     public CheckAttendRecordQuery subAddTypeStart(Integer subAddTypeStart){
-		this.subAddTypeStart = subAddTypeStart;
-		return this;
+        this.subAddTypeStart = subAddTypeStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeEnd
-    */
+     * 璁剧疆 缁撴潫 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeEnd
+     */
     public CheckAttendRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
-		this.subAddTypeEnd = subAddTypeEnd;
-		return this;
+        this.subAddTypeEnd = subAddTypeEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeIncrement
+     */
     public CheckAttendRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
-		this.subAddTypeIncrement = subAddTypeIncrement;
-		return this;
+        this.subAddTypeIncrement = subAddTypeIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-    * @param subAddTypeList
-    */
+     * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeList
+     */
     public CheckAttendRecordQuery subAddTypeList(List<Integer> subAddTypeList){
         this.subAddTypeList = subAddTypeList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
-        * @param subAddTypeNotList
-        */
-        public CheckAttendRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 澧炲噺绫诲瀷(1.澧炲姞,2.鎵i櫎)
+     * @param subAddTypeNotList
+     */
+    public CheckAttendRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
         this.subAddTypeNotList = subAddTypeNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  鎵e垎鎴栧鍔犲垎鍊�
-    * @param score
-    */
+     * 璁剧疆  鎵e垎鎴栧鍔犲垎鍊�
+     * @param score
+     */
     public CheckAttendRecordQuery score(BigDecimal score){
-	    setScore(score);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreStart
-    */
+        setScore(score);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreStart
+     */
     public CheckAttendRecordQuery scoreStart(BigDecimal scoreStart){
-		this.scoreStart = scoreStart;
-		return this;
+        this.scoreStart = scoreStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreEnd
-    */
+     * 璁剧疆 缁撴潫 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreEnd
+     */
     public CheckAttendRecordQuery scoreEnd(BigDecimal scoreEnd){
-		this.scoreEnd = scoreEnd;
-		return this;
+        this.scoreEnd = scoreEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreIncrement
-    */
+     * 璁剧疆 澧炲姞 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreIncrement
+     */
     public CheckAttendRecordQuery scoreIncrement(BigDecimal scoreIncrement){
-		this.scoreIncrement = scoreIncrement;
-		return this;
+        this.scoreIncrement = scoreIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
-    * @param scoreList
-    */
+     * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreList
+     */
     public CheckAttendRecordQuery scoreList(List<BigDecimal> scoreList){
         this.scoreList = scoreList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
-        * @param scoreNotList
-        */
-        public CheckAttendRecordQuery scoreNotList(List<BigDecimal> scoreNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鎵e垎鎴栧鍔犲垎鍊�
+     * @param scoreNotList
+     */
+    public CheckAttendRecordQuery scoreNotList(List<BigDecimal> scoreNotList){
         this.scoreNotList = scoreNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 涓婁笅鐝椂闂�
-    * @param goOffTimeStr
-    */
+    /**
+     * 璁剧疆 涓婁笅鐝椂闂�
+     * @param goOffTimeStr
+     */
     public CheckAttendRecordQuery goOffTimeStr(String goOffTimeStr){
         setGoOffTimeStr(goOffTimeStr);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 涓婁笅鐝椂闂�
-    * @param goOffTimeStrList
-    */
+     * 璁剧疆 涓婁笅鐝椂闂�
+     * @param goOffTimeStrList
+     */
     public CheckAttendRecordQuery goOffTimeStrList(List<String> goOffTimeStrList){
         this.goOffTimeStrList = goOffTimeStrList;
-		return this;
+        return this;
     }
 
 
 
 
-	/**
-    * 璁剧疆 寮傚父澶勭悊缁撴灉
-    * @param errorResult
-    */
+    /**
+     * 璁剧疆 寮傚父澶勭悊缁撴灉
+     * @param errorResult
+     */
     public CheckAttendRecordQuery errorResult(String errorResult){
         setErrorResult(errorResult);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 寮傚父澶勭悊缁撴灉
-    * @param errorResultList
-    */
+     * 璁剧疆 寮傚父澶勭悊缁撴灉
+     * @param errorResultList
+     */
     public CheckAttendRecordQuery errorResultList(List<String> errorResultList){
         this.errorResultList = errorResultList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 鏍告煡浜哄憳
-    * @param checkPerson
-    */
+    /**
+     * 璁剧疆 鏍告煡浜哄憳
+     * @param checkPerson
+     */
     public CheckAttendRecordQuery checkPerson(String checkPerson){
         setCheckPerson(checkPerson);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏍告煡浜哄憳
-    * @param checkPersonList
-    */
+     * 璁剧疆 鏍告煡浜哄憳
+     * @param checkPersonList
+     */
     public CheckAttendRecordQuery checkPersonList(List<String> checkPersonList){
         this.checkPersonList = checkPersonList;
-		return this;
+        return this;
     }
 
 
 
-	/**
-    * 璁剧疆 鏍告煡璇存槑
-    * @param checkDesc
-    */
+    /**
+     * 璁剧疆 鏍告煡璇存槑
+     * @param checkDesc
+     */
     public CheckAttendRecordQuery checkDesc(String checkDesc){
         setCheckDesc(checkDesc);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏍告煡璇存槑
-    * @param checkDescList
-    */
+     * 璁剧疆 鏍告煡璇存槑
+     * @param checkDescList
+     */
     public CheckAttendRecordQuery checkDescList(List<String> checkDescList){
         this.checkDescList = checkDescList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 鏍告煡缁撴灉
-    * @param checkResult
-    */
+    /**
+     * 璁剧疆 鏍告煡缁撴灉
+     * @param checkResult
+     */
     public CheckAttendRecordQuery checkResult(String checkResult){
         setCheckResult(checkResult);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏍告煡缁撴灉
-    * @param checkResultList
-    */
+     * 璁剧疆 鏍告煡缁撴灉
+     * @param checkResultList
+     */
     public CheckAttendRecordQuery checkResultList(List<String> checkResultList){
         this.checkResultList = checkResultList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatus
-    */
+     * 璁剧疆  澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatus
+     */
     public CheckAttendRecordQuery checkStatus(Integer checkStatus){
-	    setCheckStatus(checkStatus);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusStart
-    */
+        setCheckStatus(checkStatus);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusStart
+     */
     public CheckAttendRecordQuery checkStatusStart(Integer checkStatusStart){
-		this.checkStatusStart = checkStatusStart;
-		return this;
+        this.checkStatusStart = checkStatusStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusEnd
-    */
+     * 璁剧疆 缁撴潫 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusEnd
+     */
     public CheckAttendRecordQuery checkStatusEnd(Integer checkStatusEnd){
-		this.checkStatusEnd = checkStatusEnd;
-		return this;
+        this.checkStatusEnd = checkStatusEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusIncrement
-    */
+     * 璁剧疆 澧炲姞 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusIncrement
+     */
     public CheckAttendRecordQuery checkStatusIncrement(Integer checkStatusIncrement){
-		this.checkStatusIncrement = checkStatusIncrement;
-		return this;
+        this.checkStatusIncrement = checkStatusIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-    * @param checkStatusList
-    */
+     * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusList
+     */
     public CheckAttendRecordQuery checkStatusList(List<Integer> checkStatusList){
         this.checkStatusList = checkStatusList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
-        * @param checkStatusNotList
-        */
-        public CheckAttendRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 澶勭悊鐘舵€�(1.鏈鐞�,2.宸插鐞�)
+     * @param checkStatusNotList
+     */
+    public CheckAttendRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){
         this.checkStatusNotList = checkStatusNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  鍒涘缓鐢ㄦ埛
-    * @param createUserId
-    */
+     * 璁剧疆  鍒涘缓鐢ㄦ埛
+     * @param createUserId
+     */
     public CheckAttendRecordQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public CheckAttendRecordQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public CheckAttendRecordQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public CheckAttendRecordQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public CheckAttendRecordQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鍒涘缓鐢ㄦ埛
-        * @param createUserIdNotList
-        */
-        public CheckAttendRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdNotList
+     */
+    public CheckAttendRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
         return this;
-        }
+    }
 
 
     /**
-    * 璁剧疆  鏇存柊鐢ㄦ埛
-    * @param updateUserId
-    */
+     * 璁剧疆  鏇存柊鐢ㄦ埛
+     * @param updateUserId
+     */
     public CheckAttendRecordQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
-    * @param updateUserIdStart
-    */
+        setUpdateUserId(updateUserId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
+     * @param updateUserIdStart
+     */
     public CheckAttendRecordQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
-		return this;
+        this.updateUserIdStart = updateUserIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
-    * @param updateUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
+     * @param updateUserIdEnd
+     */
     public CheckAttendRecordQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
-		return this;
+        this.updateUserIdEnd = updateUserIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
-    * @param updateUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
+     * @param updateUserIdIncrement
+     */
     public CheckAttendRecordQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
-		return this;
+        this.updateUserIdIncrement = updateUserIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏇存柊鐢ㄦ埛
-    * @param updateUserIdList
-    */
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdList
+     */
     public CheckAttendRecordQuery updateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鏇存柊鐢ㄦ埛
-        * @param updateUserIdNotList
-        */
-        public CheckAttendRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdNotList
+     */
+    public CheckAttendRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
         return this;
-        }
+    }
+
+
+    /**
+     * 璁剧疆  鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethod
+     */
+    public CheckAttendRecordQuery subMethod(Integer subMethod){
+        setSubMethod(subMethod);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodStart
+     */
+    public CheckAttendRecordQuery subMethodStart(Integer subMethodStart){
+        this.subMethodStart = subMethodStart;
+        return this;
+    }
 
+    /**
+     * 璁剧疆 缁撴潫 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodEnd
+     */
+    public CheckAttendRecordQuery subMethodEnd(Integer subMethodEnd){
+        this.subMethodEnd = subMethodEnd;
+        return this;
+    }
+
+    /**
+     * 璁剧疆 澧炲姞 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodIncrement
+     */
+    public CheckAttendRecordQuery subMethodIncrement(Integer subMethodIncrement){
+        this.subMethodIncrement = subMethodIncrement;
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodList
+     */
+    public CheckAttendRecordQuery subMethodList(List<Integer> subMethodList){
+        this.subMethodList = subMethodList;
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)
+     * @param subMethodNotList
+     */
+    public CheckAttendRecordQuery subMethodNotList(List<Integer> subMethodNotList){
+        this.subMethodNotList = subMethodNotList;
+        return this;
+    }
 
     /**
-    * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<CheckAttendRecordQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
+     * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
     public void setOrConditionList(List<CheckAttendRecordQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<CheckAttendRecordQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
+     * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
     public void setAndConditionList(List<CheckAttendRecordQuery> andConditionList){
         this.andConditionList = andConditionList;
     }
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackEntity.java
index 83704791a15a0304362ce5a3c16df9b834d54e29..fcee8acfffd7e08d9a1f63f589d933d35521d0ec 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackEntity.java
@@ -10,57 +10,61 @@ import com.mortals.xhx.module.feedback.model.vo.FeedbackVo;
 import com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity;
 import lombok.Data;
 /**
-* 缁╂晥鍙嶉璁板綍淇℃伅瀹炰綋瀵硅薄
-*
-* @author zxfei
-* @date 2023-07-05
-*/
+ * 缁╂晥鍙嶉璁板綍淇℃伅瀹炰綋瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 @Data
 public class FeedbackEntity extends FeedbackVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 闂嵎鏍囬
-    */
+     * 闂嵎鏍囬
+     */
     private String title;
     /**
-    * 鍙嶉寮€濮嬫椂闂�
-    */
+     * 鍙嶉寮€濮嬫椂闂�
+     */
     private Date feedbackTimeStart;
     /**
-    * 鍙嶉缁撴潫鏃堕棿
-    */
+     * 鍙嶉缁撴潫鏃堕棿
+     */
     private Date feedbackTimeEnd;
     /**
-    * 閭€璇蜂汉鏁�
-    */
+     * 閭€璇蜂汉鏁�
+     */
     private Integer inviteNum;
     /**
-    * 鍙嶉浜烘暟
-    */
+     * 鍙嶉浜烘暟
+     */
     private Integer feedbackNum;
     /**
-    * 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    */
+     * 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     */
     private Integer processStatus;
     /**
-    * 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    */
+     * 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     */
     private Integer weblink;
     /**
-    * 闂澶栭摼鍦板潃
-    */
+     * 闂澶栭摼鍦板潃
+     */
     private String webUrl;
     /**
-    * 澶囨敞璇存槑
-    */
+     * 澶囨敞璇存槑
+     */
     private String remark;
     /**
-    * 缁╂晥鍙嶉闂淇℃伅
-    */
+     * 琛ㄥ崟鍐呭
+     */
+    private String formContent;
+    /**
+     * 缁╂晥鍙嶉闂淇℃伅
+     */
     private List<FeedbackQuestionEntity> feedbackQuestionList=new ArrayList<>();;
     public List<FeedbackQuestionEntity> getFeedbackQuestionList(){
-      return feedbackQuestionList;
+        return feedbackQuestionList;
     }
 
     public void setFeedbackQuestionList(List<FeedbackQuestionEntity> feedbackQuestionList){
@@ -68,7 +72,7 @@ public class FeedbackEntity extends FeedbackVo {
     }
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -76,7 +80,7 @@ public class FeedbackEntity extends FeedbackVo {
         if (obj instanceof FeedbackEntity) {
             FeedbackEntity tmp = (FeedbackEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -84,22 +88,24 @@ public class FeedbackEntity extends FeedbackVo {
 
     public void initAttrValue(){
 
-            this.title = "";
+        this.title = "";
+
+        this.feedbackTimeStart = null;
 
-            this.feedbackTimeStart = null;
+        this.feedbackTimeEnd = null;
 
-            this.feedbackTimeEnd = null;
+        this.inviteNum = 0;
 
-            this.inviteNum = 0;
+        this.feedbackNum = 0;
 
-            this.feedbackNum = 0;
+        this.processStatus = 0;
 
-            this.processStatus = 0;
+        this.weblink = 0;
 
-            this.weblink = 0;
+        this.webUrl = "";
 
-            this.webUrl = "";
+        this.remark = "";
 
-            this.remark = "";
+        this.formContent = "";
     }
 }
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackQuery.java
index 668f0c7e75ac1f12582c3f5966c350cf07059a24..5348599cc9b0c910def253cb44b54f2f112f5eba 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackQuery.java
@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.feedback.model.FeedbackEntity;
 /**
-* 缁╂晥鍙嶉璁板綍淇℃伅鏌ヨ瀵硅薄
-*
-* @author zxfei
-* @date 2023-07-05
-*/
+ * 缁╂晥鍙嶉璁板綍淇℃伅鏌ヨ瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-07-07
+ */
 public class FeedbackQuery extends FeedbackEntity {
     /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
     private Long idStart;
@@ -155,6 +155,11 @@ public class FeedbackQuery extends FeedbackEntity {
     /** 缁撴潫 鏇存柊鏃堕棿 */
     private String updateTimeEnd;
 
+    /** 琛ㄥ崟鍐呭 */
+    private List<String> formContentList;
+
+    /** 琛ㄥ崟鍐呭鎺掗櫎鍒楄〃 */
+    private List <String> formContentNotList;
     /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<FeedbackQuery> orConditionList;
 
@@ -164,1263 +169,1314 @@ public class FeedbackQuery extends FeedbackEntity {
     public FeedbackQuery(){}
 
     /**
-    * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @return idStart
-    */
+     * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @return $idEnd
-    */
+     * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @return idIncrement
-    */
+     * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-    * @return idList
-    */
+     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-    * @return idNotList
-    */
+     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+     * @return idNotList
+     */
     public List<Long> getIdNotList(){
         return this.idNotList;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idNotList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idNotList
+     */
     public void setIdNotList(List<Long> idNotList){
         this.idNotList = idNotList;
     }
 
 
     /**
-    * 鑾峰彇 闂嵎鏍囬
-    * @return titleList
-    */
+     * 鑾峰彇 闂嵎鏍囬
+     * @return titleList
+     */
     public List<String> getTitleList(){
         return this.titleList;
     }
 
     /**
-    * 璁剧疆 闂嵎鏍囬
-    * @param titleList
-    */
+     * 璁剧疆 闂嵎鏍囬
+     * @param titleList
+     */
     public void setTitleList(List<String> titleList){
         this.titleList = titleList;
     }
 
     /**
-    * 鑾峰彇 闂嵎鏍囬
-    * @return titleNotList
-    */
+     * 鑾峰彇 闂嵎鏍囬
+     * @return titleNotList
+     */
     public List<String> getTitleNotList(){
         return this.titleNotList;
     }
 
     /**
-    * 璁剧疆 闂嵎鏍囬
-    * @param titleNotList
-    */
+     * 璁剧疆 闂嵎鏍囬
+     * @param titleNotList
+     */
     public void setTitleNotList(List<String> titleNotList){
         this.titleNotList = titleNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍙嶉寮€濮嬫椂闂�
-    * @return feedbackTimeStartStart
-    */
+     * 鑾峰彇 寮€濮� 鍙嶉寮€濮嬫椂闂�
+     * @return feedbackTimeStartStart
+     */
     public String getFeedbackTimeStartStart(){
         return this.feedbackTimeStartStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍙嶉寮€濮嬫椂闂�
-    * @param feedbackTimeStartStart
-    */
+     * 璁剧疆 寮€濮� 鍙嶉寮€濮嬫椂闂�
+     * @param feedbackTimeStartStart
+     */
     public void setFeedbackTimeStartStart(String feedbackTimeStartStart){
         this.feedbackTimeStartStart = feedbackTimeStartStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍙嶉寮€濮嬫椂闂�
-    * @return feedbackTimeStartEnd
-    */
+     * 鑾峰彇 缁撴潫 鍙嶉寮€濮嬫椂闂�
+     * @return feedbackTimeStartEnd
+     */
     public String getFeedbackTimeStartEnd(){
         return this.feedbackTimeStartEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍙嶉寮€濮嬫椂闂�
-    * @param feedbackTimeStartEnd
-    */
+     * 璁剧疆 缁撴潫 鍙嶉寮€濮嬫椂闂�
+     * @param feedbackTimeStartEnd
+     */
     public void setFeedbackTimeStartEnd(String feedbackTimeStartEnd){
         this.feedbackTimeStartEnd = feedbackTimeStartEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍙嶉缁撴潫鏃堕棿
-    * @return feedbackTimeEndStart
-    */
+     * 鑾峰彇 寮€濮� 鍙嶉缁撴潫鏃堕棿
+     * @return feedbackTimeEndStart
+     */
     public String getFeedbackTimeEndStart(){
         return this.feedbackTimeEndStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍙嶉缁撴潫鏃堕棿
-    * @param feedbackTimeEndStart
-    */
+     * 璁剧疆 寮€濮� 鍙嶉缁撴潫鏃堕棿
+     * @param feedbackTimeEndStart
+     */
     public void setFeedbackTimeEndStart(String feedbackTimeEndStart){
         this.feedbackTimeEndStart = feedbackTimeEndStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍙嶉缁撴潫鏃堕棿
-    * @return feedbackTimeEndEnd
-    */
+     * 鑾峰彇 缁撴潫 鍙嶉缁撴潫鏃堕棿
+     * @return feedbackTimeEndEnd
+     */
     public String getFeedbackTimeEndEnd(){
         return this.feedbackTimeEndEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍙嶉缁撴潫鏃堕棿
-    * @param feedbackTimeEndEnd
-    */
+     * 璁剧疆 缁撴潫 鍙嶉缁撴潫鏃堕棿
+     * @param feedbackTimeEndEnd
+     */
     public void setFeedbackTimeEndEnd(String feedbackTimeEndEnd){
         this.feedbackTimeEndEnd = feedbackTimeEndEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 閭€璇蜂汉鏁�
-    * @return inviteNumStart
-    */
+     * 鑾峰彇 寮€濮� 閭€璇蜂汉鏁�
+     * @return inviteNumStart
+     */
     public Integer getInviteNumStart(){
         return this.inviteNumStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 閭€璇蜂汉鏁�
-    * @param inviteNumStart
-    */
+     * 璁剧疆 寮€濮� 閭€璇蜂汉鏁�
+     * @param inviteNumStart
+     */
     public void setInviteNumStart(Integer inviteNumStart){
         this.inviteNumStart = inviteNumStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 閭€璇蜂汉鏁�
-    * @return $inviteNumEnd
-    */
+     * 鑾峰彇 缁撴潫 閭€璇蜂汉鏁�
+     * @return $inviteNumEnd
+     */
     public Integer getInviteNumEnd(){
         return this.inviteNumEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 閭€璇蜂汉鏁�
-    * @param inviteNumEnd
-    */
+     * 璁剧疆 缁撴潫 閭€璇蜂汉鏁�
+     * @param inviteNumEnd
+     */
     public void setInviteNumEnd(Integer inviteNumEnd){
         this.inviteNumEnd = inviteNumEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 閭€璇蜂汉鏁�
-    * @return inviteNumIncrement
-    */
+     * 鑾峰彇 澧炲姞 閭€璇蜂汉鏁�
+     * @return inviteNumIncrement
+     */
     public Integer getInviteNumIncrement(){
         return this.inviteNumIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 閭€璇蜂汉鏁�
-    * @param inviteNumIncrement
-    */
+     * 璁剧疆 澧炲姞 閭€璇蜂汉鏁�
+     * @param inviteNumIncrement
+     */
     public void setInviteNumIncrement(Integer inviteNumIncrement){
         this.inviteNumIncrement = inviteNumIncrement;
     }
 
     /**
-    * 鑾峰彇 閭€璇蜂汉鏁�
-    * @return inviteNumList
-    */
+     * 鑾峰彇 閭€璇蜂汉鏁�
+     * @return inviteNumList
+     */
     public List<Integer> getInviteNumList(){
         return this.inviteNumList;
     }
 
     /**
-    * 璁剧疆 閭€璇蜂汉鏁�
-    * @param inviteNumList
-    */
+     * 璁剧疆 閭€璇蜂汉鏁�
+     * @param inviteNumList
+     */
     public void setInviteNumList(List<Integer> inviteNumList){
         this.inviteNumList = inviteNumList;
     }
 
     /**
-    * 鑾峰彇 閭€璇蜂汉鏁�
-    * @return inviteNumNotList
-    */
+     * 鑾峰彇 閭€璇蜂汉鏁�
+     * @return inviteNumNotList
+     */
     public List<Integer> getInviteNumNotList(){
         return this.inviteNumNotList;
     }
 
     /**
-    * 璁剧疆 閭€璇蜂汉鏁�
-    * @param inviteNumNotList
-    */
+     * 璁剧疆 閭€璇蜂汉鏁�
+     * @param inviteNumNotList
+     */
     public void setInviteNumNotList(List<Integer> inviteNumNotList){
         this.inviteNumNotList = inviteNumNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鍙嶉浜烘暟
-    * @return feedbackNumStart
-    */
+     * 鑾峰彇 寮€濮� 鍙嶉浜烘暟
+     * @return feedbackNumStart
+     */
     public Integer getFeedbackNumStart(){
         return this.feedbackNumStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍙嶉浜烘暟
-    * @param feedbackNumStart
-    */
+     * 璁剧疆 寮€濮� 鍙嶉浜烘暟
+     * @param feedbackNumStart
+     */
     public void setFeedbackNumStart(Integer feedbackNumStart){
         this.feedbackNumStart = feedbackNumStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍙嶉浜烘暟
-    * @return $feedbackNumEnd
-    */
+     * 鑾峰彇 缁撴潫 鍙嶉浜烘暟
+     * @return $feedbackNumEnd
+     */
     public Integer getFeedbackNumEnd(){
         return this.feedbackNumEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍙嶉浜烘暟
-    * @param feedbackNumEnd
-    */
+     * 璁剧疆 缁撴潫 鍙嶉浜烘暟
+     * @param feedbackNumEnd
+     */
     public void setFeedbackNumEnd(Integer feedbackNumEnd){
         this.feedbackNumEnd = feedbackNumEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍙嶉浜烘暟
-    * @return feedbackNumIncrement
-    */
+     * 鑾峰彇 澧炲姞 鍙嶉浜烘暟
+     * @return feedbackNumIncrement
+     */
     public Integer getFeedbackNumIncrement(){
         return this.feedbackNumIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍙嶉浜烘暟
-    * @param feedbackNumIncrement
-    */
+     * 璁剧疆 澧炲姞 鍙嶉浜烘暟
+     * @param feedbackNumIncrement
+     */
     public void setFeedbackNumIncrement(Integer feedbackNumIncrement){
         this.feedbackNumIncrement = feedbackNumIncrement;
     }
 
     /**
-    * 鑾峰彇 鍙嶉浜烘暟
-    * @return feedbackNumList
-    */
+     * 鑾峰彇 鍙嶉浜烘暟
+     * @return feedbackNumList
+     */
     public List<Integer> getFeedbackNumList(){
         return this.feedbackNumList;
     }
 
     /**
-    * 璁剧疆 鍙嶉浜烘暟
-    * @param feedbackNumList
-    */
+     * 璁剧疆 鍙嶉浜烘暟
+     * @param feedbackNumList
+     */
     public void setFeedbackNumList(List<Integer> feedbackNumList){
         this.feedbackNumList = feedbackNumList;
     }
 
     /**
-    * 鑾峰彇 鍙嶉浜烘暟
-    * @return feedbackNumNotList
-    */
+     * 鑾峰彇 鍙嶉浜烘暟
+     * @return feedbackNumNotList
+     */
     public List<Integer> getFeedbackNumNotList(){
         return this.feedbackNumNotList;
     }
 
     /**
-    * 璁剧疆 鍙嶉浜烘暟
-    * @param feedbackNumNotList
-    */
+     * 璁剧疆 鍙嶉浜烘暟
+     * @param feedbackNumNotList
+     */
     public void setFeedbackNumNotList(List<Integer> feedbackNumNotList){
         this.feedbackNumNotList = feedbackNumNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @return processStatusStart
-    */
+     * 鑾峰彇 寮€濮� 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @return processStatusStart
+     */
     public Integer getProcessStatusStart(){
         return this.processStatusStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusStart
-    */
+     * 璁剧疆 寮€濮� 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusStart
+     */
     public void setProcessStatusStart(Integer processStatusStart){
         this.processStatusStart = processStatusStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @return $processStatusEnd
-    */
+     * 鑾峰彇 缁撴潫 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @return $processStatusEnd
+     */
     public Integer getProcessStatusEnd(){
         return this.processStatusEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusEnd
-    */
+     * 璁剧疆 缁撴潫 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusEnd
+     */
     public void setProcessStatusEnd(Integer processStatusEnd){
         this.processStatusEnd = processStatusEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @return processStatusIncrement
-    */
+     * 鑾峰彇 澧炲姞 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @return processStatusIncrement
+     */
     public Integer getProcessStatusIncrement(){
         return this.processStatusIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusIncrement
-    */
+     * 璁剧疆 澧炲姞 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusIncrement
+     */
     public void setProcessStatusIncrement(Integer processStatusIncrement){
         this.processStatusIncrement = processStatusIncrement;
     }
 
     /**
-    * 鑾峰彇 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @return processStatusList
-    */
+     * 鑾峰彇 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @return processStatusList
+     */
     public List<Integer> getProcessStatusList(){
         return this.processStatusList;
     }
 
     /**
-    * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusList
-    */
+     * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusList
+     */
     public void setProcessStatusList(List<Integer> processStatusList){
         this.processStatusList = processStatusList;
     }
 
     /**
-    * 鑾峰彇 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @return processStatusNotList
-    */
+     * 鑾峰彇 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @return processStatusNotList
+     */
     public List<Integer> getProcessStatusNotList(){
         return this.processStatusNotList;
     }
 
     /**
-    * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusNotList
-    */
+     * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusNotList
+     */
     public void setProcessStatusNotList(List<Integer> processStatusNotList){
         this.processStatusNotList = processStatusNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @return weblinkStart
-    */
+     * 鑾峰彇 寮€濮� 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @return weblinkStart
+     */
     public Integer getWeblinkStart(){
         return this.weblinkStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkStart
-    */
+     * 璁剧疆 寮€濮� 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkStart
+     */
     public void setWeblinkStart(Integer weblinkStart){
         this.weblinkStart = weblinkStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @return $weblinkEnd
-    */
+     * 鑾峰彇 缁撴潫 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @return $weblinkEnd
+     */
     public Integer getWeblinkEnd(){
         return this.weblinkEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkEnd
-    */
+     * 璁剧疆 缁撴潫 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkEnd
+     */
     public void setWeblinkEnd(Integer weblinkEnd){
         this.weblinkEnd = weblinkEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @return weblinkIncrement
-    */
+     * 鑾峰彇 澧炲姞 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @return weblinkIncrement
+     */
     public Integer getWeblinkIncrement(){
         return this.weblinkIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkIncrement
-    */
+     * 璁剧疆 澧炲姞 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkIncrement
+     */
     public void setWeblinkIncrement(Integer weblinkIncrement){
         this.weblinkIncrement = weblinkIncrement;
     }
 
     /**
-    * 鑾峰彇 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @return weblinkList
-    */
+     * 鑾峰彇 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @return weblinkList
+     */
     public List<Integer> getWeblinkList(){
         return this.weblinkList;
     }
 
     /**
-    * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkList
-    */
+     * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkList
+     */
     public void setWeblinkList(List<Integer> weblinkList){
         this.weblinkList = weblinkList;
     }
 
     /**
-    * 鑾峰彇 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @return weblinkNotList
-    */
+     * 鑾峰彇 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @return weblinkNotList
+     */
     public List<Integer> getWeblinkNotList(){
         return this.weblinkNotList;
     }
 
     /**
-    * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkNotList
-    */
+     * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkNotList
+     */
     public void setWeblinkNotList(List<Integer> weblinkNotList){
         this.weblinkNotList = weblinkNotList;
     }
 
 
     /**
-    * 鑾峰彇 闂澶栭摼鍦板潃
-    * @return webUrlList
-    */
+     * 鑾峰彇 闂澶栭摼鍦板潃
+     * @return webUrlList
+     */
     public List<String> getWebUrlList(){
         return this.webUrlList;
     }
 
     /**
-    * 璁剧疆 闂澶栭摼鍦板潃
-    * @param webUrlList
-    */
+     * 璁剧疆 闂澶栭摼鍦板潃
+     * @param webUrlList
+     */
     public void setWebUrlList(List<String> webUrlList){
         this.webUrlList = webUrlList;
     }
 
     /**
-    * 鑾峰彇 闂澶栭摼鍦板潃
-    * @return webUrlNotList
-    */
+     * 鑾峰彇 闂澶栭摼鍦板潃
+     * @return webUrlNotList
+     */
     public List<String> getWebUrlNotList(){
         return this.webUrlNotList;
     }
 
     /**
-    * 璁剧疆 闂澶栭摼鍦板潃
-    * @param webUrlNotList
-    */
+     * 璁剧疆 闂澶栭摼鍦板潃
+     * @param webUrlNotList
+     */
     public void setWebUrlNotList(List<String> webUrlNotList){
         this.webUrlNotList = webUrlNotList;
     }
 
     /**
-    * 鑾峰彇 澶囨敞璇存槑
-    * @return remarkList
-    */
+     * 鑾峰彇 澶囨敞璇存槑
+     * @return remarkList
+     */
     public List<String> getRemarkList(){
         return this.remarkList;
     }
 
     /**
-    * 璁剧疆 澶囨敞璇存槑
-    * @param remarkList
-    */
+     * 璁剧疆 澶囨敞璇存槑
+     * @param remarkList
+     */
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
 
     /**
-    * 鑾峰彇 澶囨敞璇存槑
-    * @return remarkNotList
-    */
+     * 鑾峰彇 澶囨敞璇存槑
+     * @return remarkNotList
+     */
     public List<String> getRemarkNotList(){
         return this.remarkNotList;
     }
 
     /**
-    * 璁剧疆 澶囨敞璇存槑
-    * @param remarkNotList
-    */
+     * 璁剧疆 澶囨敞璇存槑
+     * @param remarkNotList
+     */
     public void setRemarkNotList(List<String> remarkNotList){
         this.remarkNotList = remarkNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @return createUserIdStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @return $createUserIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @return createUserIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdNotList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdNotList
+     */
     public List<Long> getCreateUserIdNotList(){
         return this.createUserIdNotList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdNotList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdNotList
+     */
     public void setCreateUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-    * @return createTimeStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-    * @param createTimeStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-    * @return createTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-    * @param createTimeEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛
-    * @return updateUserIdStart
-    */
+     * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛
+     * @return updateUserIdStart
+     */
     public Long getUpdateUserIdStart(){
         return this.updateUserIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
-    * @param updateUserIdStart
-    */
+     * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
+     * @param updateUserIdStart
+     */
     public void setUpdateUserIdStart(Long updateUserIdStart){
         this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛
-    * @return $updateUserIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛
+     * @return $updateUserIdEnd
+     */
     public Long getUpdateUserIdEnd(){
         return this.updateUserIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
-    * @param updateUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
+     * @param updateUserIdEnd
+     */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
         this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛
-    * @return updateUserIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛
+     * @return updateUserIdIncrement
+     */
     public Long getUpdateUserIdIncrement(){
         return this.updateUserIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
-    * @param updateUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
+     * @param updateUserIdIncrement
+     */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
         this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鏇存柊鐢ㄦ埛
-    * @return updateUserIdList
-    */
+     * 鑾峰彇 鏇存柊鐢ㄦ埛
+     * @return updateUserIdList
+     */
     public List<Long> getUpdateUserIdList(){
         return this.updateUserIdList;
     }
 
     /**
-    * 璁剧疆 鏇存柊鐢ㄦ埛
-    * @param updateUserIdList
-    */
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdList
+     */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 鑾峰彇 鏇存柊鐢ㄦ埛
-    * @return updateUserIdNotList
-    */
+     * 鑾峰彇 鏇存柊鐢ㄦ埛
+     * @return updateUserIdNotList
+     */
     public List<Long> getUpdateUserIdNotList(){
         return this.updateUserIdNotList;
     }
 
     /**
-    * 璁剧疆 鏇存柊鐢ㄦ埛
-    * @param updateUserIdNotList
-    */
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdNotList
+     */
     public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
-    * @return updateTimeStart
-    */
+     * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
+     * @return updateTimeStart
+     */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
-    * @param updateTimeStart
-    */
+     * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
+     * @param updateTimeStart
+     */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
-    * @return updateTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
+     * @return updateTimeEnd
+     */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
-    * @param updateTimeEnd
-    */
+     * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
+     * @param updateTimeEnd
+     */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-    * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
-    * @param id
-    */
+     * 鑾峰彇 琛ㄥ崟鍐呭
+     * @return formContentList
+     */
+    public List<String> getFormContentList(){
+        return this.formContentList;
+    }
+
+    /**
+     * 璁剧疆 琛ㄥ崟鍐呭
+     * @param formContentList
+     */
+    public void setFormContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+    }
+
+    /**
+     * 鑾峰彇 琛ㄥ崟鍐呭
+     * @return formContentNotList
+     */
+    public List<String> getFormContentNotList(){
+        return this.formContentNotList;
+    }
+
+    /**
+     * 璁剧疆 琛ㄥ崟鍐呭
+     * @param formContentNotList
+     */
+    public void setFormContentNotList(List<String> formContentNotList){
+        this.formContentNotList = formContentNotList;
+    }
+
+    /**
+     * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
+     * @param id
+     */
     public FeedbackQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public FeedbackQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public FeedbackQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public FeedbackQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public FeedbackQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-        * @param idNotList
-        */
-        public FeedbackQuery idNotList(List<Long> idNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idNotList
+     */
+    public FeedbackQuery idNotList(List<Long> idNotList){
         this.idNotList = idNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 闂嵎鏍囬
-    * @param title
-    */
+    /**
+     * 璁剧疆 闂嵎鏍囬
+     * @param title
+     */
     public FeedbackQuery title(String title){
         setTitle(title);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 闂嵎鏍囬
-    * @param titleList
-    */
+     * 璁剧疆 闂嵎鏍囬
+     * @param titleList
+     */
     public FeedbackQuery titleList(List<String> titleList){
         this.titleList = titleList;
-		return this;
+        return this;
     }
 
 
 
     /**
-    * 璁剧疆  閭€璇蜂汉鏁�
-    * @param inviteNum
-    */
+     * 璁剧疆  閭€璇蜂汉鏁�
+     * @param inviteNum
+     */
     public FeedbackQuery inviteNum(Integer inviteNum){
-	    setInviteNum(inviteNum);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 閭€璇蜂汉鏁�
-    * @param inviteNumStart
-    */
+        setInviteNum(inviteNum);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 閭€璇蜂汉鏁�
+     * @param inviteNumStart
+     */
     public FeedbackQuery inviteNumStart(Integer inviteNumStart){
-		this.inviteNumStart = inviteNumStart;
-		return this;
+        this.inviteNumStart = inviteNumStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 閭€璇蜂汉鏁�
-    * @param inviteNumEnd
-    */
+     * 璁剧疆 缁撴潫 閭€璇蜂汉鏁�
+     * @param inviteNumEnd
+     */
     public FeedbackQuery inviteNumEnd(Integer inviteNumEnd){
-		this.inviteNumEnd = inviteNumEnd;
-		return this;
+        this.inviteNumEnd = inviteNumEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 閭€璇蜂汉鏁�
-    * @param inviteNumIncrement
-    */
+     * 璁剧疆 澧炲姞 閭€璇蜂汉鏁�
+     * @param inviteNumIncrement
+     */
     public FeedbackQuery inviteNumIncrement(Integer inviteNumIncrement){
-		this.inviteNumIncrement = inviteNumIncrement;
-		return this;
+        this.inviteNumIncrement = inviteNumIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 閭€璇蜂汉鏁�
-    * @param inviteNumList
-    */
+     * 璁剧疆 閭€璇蜂汉鏁�
+     * @param inviteNumList
+     */
     public FeedbackQuery inviteNumList(List<Integer> inviteNumList){
         this.inviteNumList = inviteNumList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 閭€璇蜂汉鏁�
-        * @param inviteNumNotList
-        */
-        public FeedbackQuery inviteNumNotList(List<Integer> inviteNumNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 閭€璇蜂汉鏁�
+     * @param inviteNumNotList
+     */
+    public FeedbackQuery inviteNumNotList(List<Integer> inviteNumNotList){
         this.inviteNumNotList = inviteNumNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  鍙嶉浜烘暟
-    * @param feedbackNum
-    */
+     * 璁剧疆  鍙嶉浜烘暟
+     * @param feedbackNum
+     */
     public FeedbackQuery feedbackNum(Integer feedbackNum){
-	    setFeedbackNum(feedbackNum);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍙嶉浜烘暟
-    * @param feedbackNumStart
-    */
+        setFeedbackNum(feedbackNum);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍙嶉浜烘暟
+     * @param feedbackNumStart
+     */
     public FeedbackQuery feedbackNumStart(Integer feedbackNumStart){
-		this.feedbackNumStart = feedbackNumStart;
-		return this;
+        this.feedbackNumStart = feedbackNumStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍙嶉浜烘暟
-    * @param feedbackNumEnd
-    */
+     * 璁剧疆 缁撴潫 鍙嶉浜烘暟
+     * @param feedbackNumEnd
+     */
     public FeedbackQuery feedbackNumEnd(Integer feedbackNumEnd){
-		this.feedbackNumEnd = feedbackNumEnd;
-		return this;
+        this.feedbackNumEnd = feedbackNumEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍙嶉浜烘暟
-    * @param feedbackNumIncrement
-    */
+     * 璁剧疆 澧炲姞 鍙嶉浜烘暟
+     * @param feedbackNumIncrement
+     */
     public FeedbackQuery feedbackNumIncrement(Integer feedbackNumIncrement){
-		this.feedbackNumIncrement = feedbackNumIncrement;
-		return this;
+        this.feedbackNumIncrement = feedbackNumIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍙嶉浜烘暟
-    * @param feedbackNumList
-    */
+     * 璁剧疆 鍙嶉浜烘暟
+     * @param feedbackNumList
+     */
     public FeedbackQuery feedbackNumList(List<Integer> feedbackNumList){
         this.feedbackNumList = feedbackNumList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鍙嶉浜烘暟
-        * @param feedbackNumNotList
-        */
-        public FeedbackQuery feedbackNumNotList(List<Integer> feedbackNumNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍙嶉浜烘暟
+     * @param feedbackNumNotList
+     */
+    public FeedbackQuery feedbackNumNotList(List<Integer> feedbackNumNotList){
         this.feedbackNumNotList = feedbackNumNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatus
-    */
+     * 璁剧疆  鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatus
+     */
     public FeedbackQuery processStatus(Integer processStatus){
-	    setProcessStatus(processStatus);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusStart
-    */
+        setProcessStatus(processStatus);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusStart
+     */
     public FeedbackQuery processStatusStart(Integer processStatusStart){
-		this.processStatusStart = processStatusStart;
-		return this;
+        this.processStatusStart = processStatusStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusEnd
-    */
+     * 璁剧疆 缁撴潫 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusEnd
+     */
     public FeedbackQuery processStatusEnd(Integer processStatusEnd){
-		this.processStatusEnd = processStatusEnd;
-		return this;
+        this.processStatusEnd = processStatusEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusIncrement
-    */
+     * 璁剧疆 澧炲姞 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusIncrement
+     */
     public FeedbackQuery processStatusIncrement(Integer processStatusIncrement){
-		this.processStatusIncrement = processStatusIncrement;
-		return this;
+        this.processStatusIncrement = processStatusIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-    * @param processStatusList
-    */
+     * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusList
+     */
     public FeedbackQuery processStatusList(List<Integer> processStatusList){
         this.processStatusList = processStatusList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
-        * @param processStatusNotList
-        */
-        public FeedbackQuery processStatusNotList(List<Integer> processStatusNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)
+     * @param processStatusNotList
+     */
+    public FeedbackQuery processStatusNotList(List<Integer> processStatusNotList){
         this.processStatusNotList = processStatusNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblink
-    */
+     * 璁剧疆  闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblink
+     */
     public FeedbackQuery weblink(Integer weblink){
-	    setWeblink(weblink);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkStart
-    */
+        setWeblink(weblink);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkStart
+     */
     public FeedbackQuery weblinkStart(Integer weblinkStart){
-		this.weblinkStart = weblinkStart;
-		return this;
+        this.weblinkStart = weblinkStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkEnd
-    */
+     * 璁剧疆 缁撴潫 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkEnd
+     */
     public FeedbackQuery weblinkEnd(Integer weblinkEnd){
-		this.weblinkEnd = weblinkEnd;
-		return this;
+        this.weblinkEnd = weblinkEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkIncrement
-    */
+     * 璁剧疆 澧炲姞 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkIncrement
+     */
     public FeedbackQuery weblinkIncrement(Integer weblinkIncrement){
-		this.weblinkIncrement = weblinkIncrement;
-		return this;
+        this.weblinkIncrement = weblinkIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-    * @param weblinkList
-    */
+     * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkList
+     */
     public FeedbackQuery weblinkList(List<Integer> weblinkList){
         this.weblinkList = weblinkList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
-        * @param weblinkNotList
-        */
-        public FeedbackQuery weblinkNotList(List<Integer> weblinkNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)
+     * @param weblinkNotList
+     */
+    public FeedbackQuery weblinkNotList(List<Integer> weblinkNotList){
         this.weblinkNotList = weblinkNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 闂澶栭摼鍦板潃
-    * @param webUrl
-    */
+    /**
+     * 璁剧疆 闂澶栭摼鍦板潃
+     * @param webUrl
+     */
     public FeedbackQuery webUrl(String webUrl){
         setWebUrl(webUrl);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 闂澶栭摼鍦板潃
-    * @param webUrlList
-    */
+     * 璁剧疆 闂澶栭摼鍦板潃
+     * @param webUrlList
+     */
     public FeedbackQuery webUrlList(List<String> webUrlList){
         this.webUrlList = webUrlList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 澶囨敞璇存槑
-    * @param remark
-    */
+    /**
+     * 璁剧疆 澶囨敞璇存槑
+     * @param remark
+     */
     public FeedbackQuery remark(String remark){
         setRemark(remark);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 澶囨敞璇存槑
-    * @param remarkList
-    */
+     * 璁剧疆 澶囨敞璇存槑
+     * @param remarkList
+     */
     public FeedbackQuery remarkList(List<String> remarkList){
         this.remarkList = remarkList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  鍒涘缓鐢ㄦ埛
-    * @param createUserId
-    */
+     * 璁剧疆  鍒涘缓鐢ㄦ埛
+     * @param createUserId
+     */
     public FeedbackQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public FeedbackQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public FeedbackQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public FeedbackQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public FeedbackQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鍒涘缓鐢ㄦ埛
-        * @param createUserIdNotList
-        */
-        public FeedbackQuery createUserIdNotList(List<Long> createUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdNotList
+     */
+    public FeedbackQuery createUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
         return this;
-        }
+    }
 
 
     /**
-    * 璁剧疆  鏇存柊鐢ㄦ埛
-    * @param updateUserId
-    */
+     * 璁剧疆  鏇存柊鐢ㄦ埛
+     * @param updateUserId
+     */
     public FeedbackQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
-    * @param updateUserIdStart
-    */
+        setUpdateUserId(updateUserId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛
+     * @param updateUserIdStart
+     */
     public FeedbackQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
-		return this;
+        this.updateUserIdStart = updateUserIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
-    * @param updateUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛
+     * @param updateUserIdEnd
+     */
     public FeedbackQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
-		return this;
+        this.updateUserIdEnd = updateUserIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
-    * @param updateUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛
+     * @param updateUserIdIncrement
+     */
     public FeedbackQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
-		return this;
+        this.updateUserIdIncrement = updateUserIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏇存柊鐢ㄦ埛
-    * @param updateUserIdList
-    */
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdList
+     */
     public FeedbackQuery updateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鏇存柊鐢ㄦ埛
-        * @param updateUserIdNotList
-        */
-        public FeedbackQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鏇存柊鐢ㄦ埛
+     * @param updateUserIdNotList
+     */
+    public FeedbackQuery updateUserIdNotList(List<Long> updateUserIdNotList){
         this.updateUserIdNotList = updateUserIdNotList;
         return this;
-        }
+    }
+
 
 
     /**
-    * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 璁剧疆 琛ㄥ崟鍐呭
+     * @param formContent
+     */
+    public FeedbackQuery formContent(String formContent){
+        setFormContent(formContent);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 琛ㄥ崟鍐呭
+     * @param formContentList
+     */
+    public FeedbackQuery formContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+        return this;
+    }
+
+    /**
+     * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<FeedbackQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
+     * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
     public void setOrConditionList(List<FeedbackQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<FeedbackQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
+     * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
     public void setAndConditionList(List<FeedbackQuery> andConditionList){
         this.andConditionList = andConditionList;
     }
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
index c05260a4142025678b56b92f45b6bd308dc91670..c949160b0daa2c31b8210ac7471f3364c99b41d5 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
@@ -1,142 +1,146 @@
 <?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.check.dao.ibatis.CheckAttendRecordDaoImpl">
 
     <!-- 瀛楁鍜屽睘鎬ф槧灏� -->
     <resultMap type="CheckAttendRecordEntity" id="CheckAttendRecordEntity-Map">
-            <id  property="id" column="id" />
-            <result property="recordId" column="recordId" />
-            <result property="staffId" column="staffId" />
-            <result property="staffName" column="staffName" />
-            <result property="workNum" column="workNum" />
-            <result property="deptId" column="deptId" />
-            <result property="deptName" column="deptName" />
-            <result property="attendanceGroupId" column="attendanceGroupId" />
-            <result property="attendanceGroupName" column="attendanceGroupName" />
-            <result property="attendanceDate" column="attendanceDate" />
-            <result property="ruleId" column="ruleId" />
-            <result property="ruleName" column="ruleName" />
-            <result property="subAddType" column="subAddType" />
-            <result property="score" column="score" />
-            <result property="goOffTimeStr" column="goOffTimeStr" />
-            <result property="errorTime" column="errorTime" />
-            <result property="actualAttendTime" column="actualAttendTime" />
-            <result property="errorResult" column="errorResult" />
-            <result property="checkPerson" column="checkPerson" />
-            <result property="checkTime" column="checkTime" />
-            <result property="checkDesc" column="checkDesc" />
-            <result property="checkResult" column="checkResult" />
-            <result property="checkStatus" column="checkStatus" />
-            <result property="createUserId" column="createUserId" />
-            <result property="createTime" column="createTime" />
-            <result property="updateUserId" column="updateUserId" />
-            <result property="updateTime" column="updateTime" />
-            
+        <id  property="id" column="id" />
+        <result property="recordId" column="recordId" />
+        <result property="staffId" column="staffId" />
+        <result property="staffName" column="staffName" />
+        <result property="workNum" column="workNum" />
+        <result property="deptId" column="deptId" />
+        <result property="deptName" column="deptName" />
+        <result property="attendanceGroupId" column="attendanceGroupId" />
+        <result property="attendanceGroupName" column="attendanceGroupName" />
+        <result property="attendanceDate" column="attendanceDate" />
+        <result property="ruleId" column="ruleId" />
+        <result property="ruleName" column="ruleName" />
+        <result property="subAddType" column="subAddType" />
+        <result property="score" column="score" />
+        <result property="goOffTimeStr" column="goOffTimeStr" />
+        <result property="errorTime" column="errorTime" />
+        <result property="actualAttendTime" column="actualAttendTime" />
+        <result property="errorResult" column="errorResult" />
+        <result property="checkPerson" column="checkPerson" />
+        <result property="checkTime" column="checkTime" />
+        <result property="checkDesc" column="checkDesc" />
+        <result property="checkResult" column="checkResult" />
+        <result property="checkStatus" column="checkStatus" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createTime" column="createTime" />
+        <result property="updateUserId" column="updateUserId" />
+        <result property="updateTime" column="updateTime" />
+        <result property="subMethod" column="subMethod" />
+
     </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('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
-                    a.recordId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
-                    a.staffId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffName') or colPickMode == 1 and data.containsKey('staffName')))">
-                    a.staffName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workNum') or colPickMode == 1 and data.containsKey('workNum')))">
-                    a.workNum,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
-                    a.deptId,
-                </if>
-                <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('attendanceGroupId') or colPickMode == 1 and data.containsKey('attendanceGroupId')))">
-                    a.attendanceGroupId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceGroupName') or colPickMode == 1 and data.containsKey('attendanceGroupName')))">
-                    a.attendanceGroupName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceDate') or colPickMode == 1 and data.containsKey('attendanceDate')))">
-                    a.attendanceDate,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleId') or colPickMode == 1 and data.containsKey('ruleId')))">
-                    a.ruleId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleName') or colPickMode == 1 and data.containsKey('ruleName')))">
-                    a.ruleName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
-                    a.subAddType,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('score') or colPickMode == 1 and data.containsKey('score')))">
-                    a.score,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goOffTimeStr') or colPickMode == 1 and data.containsKey('goOffTimeStr')))">
-                    a.goOffTimeStr,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorTime') or colPickMode == 1 and data.containsKey('errorTime')))">
-                    a.errorTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('actualAttendTime') or colPickMode == 1 and data.containsKey('actualAttendTime')))">
-                    a.actualAttendTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorResult') or colPickMode == 1 and data.containsKey('errorResult')))">
-                    a.errorResult,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkPerson') or colPickMode == 1 and data.containsKey('checkPerson')))">
-                    a.checkPerson,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkTime') or colPickMode == 1 and data.containsKey('checkTime')))">
-                    a.checkTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkDesc') or colPickMode == 1 and data.containsKey('checkDesc')))">
-                    a.checkDesc,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkResult') or colPickMode == 1 and data.containsKey('checkResult')))">
-                    a.checkResult,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkStatus') or colPickMode == 1 and data.containsKey('checkStatus')))">
-                    a.checkStatus,
-                </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('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
-                    a.updateUserId,
-                </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>
+            <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('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
+                a.recordId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
+                a.staffId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffName') or colPickMode == 1 and data.containsKey('staffName')))">
+                a.staffName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workNum') or colPickMode == 1 and data.containsKey('workNum')))">
+                a.workNum,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
+                a.deptId,
+            </if>
+            <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('attendanceGroupId') or colPickMode == 1 and data.containsKey('attendanceGroupId')))">
+                a.attendanceGroupId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceGroupName') or colPickMode == 1 and data.containsKey('attendanceGroupName')))">
+                a.attendanceGroupName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendanceDate') or colPickMode == 1 and data.containsKey('attendanceDate')))">
+                a.attendanceDate,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleId') or colPickMode == 1 and data.containsKey('ruleId')))">
+                a.ruleId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ruleName') or colPickMode == 1 and data.containsKey('ruleName')))">
+                a.ruleName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
+                a.subAddType,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('score') or colPickMode == 1 and data.containsKey('score')))">
+                a.score,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goOffTimeStr') or colPickMode == 1 and data.containsKey('goOffTimeStr')))">
+                a.goOffTimeStr,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorTime') or colPickMode == 1 and data.containsKey('errorTime')))">
+                a.errorTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('actualAttendTime') or colPickMode == 1 and data.containsKey('actualAttendTime')))">
+                a.actualAttendTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorResult') or colPickMode == 1 and data.containsKey('errorResult')))">
+                a.errorResult,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkPerson') or colPickMode == 1 and data.containsKey('checkPerson')))">
+                a.checkPerson,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkTime') or colPickMode == 1 and data.containsKey('checkTime')))">
+                a.checkTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkDesc') or colPickMode == 1 and data.containsKey('checkDesc')))">
+                a.checkDesc,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkResult') or colPickMode == 1 and data.containsKey('checkResult')))">
+                a.checkResult,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('checkStatus') or colPickMode == 1 and data.containsKey('checkStatus')))">
+                a.checkStatus,
+            </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('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                a.updateUserId,
+            </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>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subMethod') or colPickMode == 1 and data.containsKey('subMethod')))">
+                a.subMethod,
+            </if>
         </trim>
     </sql>
     <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
     <insert id="insert" parameterType="CheckAttendRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_attend_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime)
+        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod})
     </insert>
 
     <!-- 鎵归噺鏂板 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_attend_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime)
+        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod})
         </foreach>
     </insert>
 
@@ -254,6 +258,12 @@
             <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('subMethod')) or (colPickMode==1 and !data.containsKey('subMethod'))">
+                a.subMethod=#{data.subMethod},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('subMethodIncrement')) or (colPickMode==1 and !data.containsKey('subMethodIncrement'))">
+                a.subMethod=ifnull(a.subMethod,0) + #{data.subMethodIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -266,238 +276,250 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_check_attend_record as a
         <trim prefix="set" suffixOverrides=",">
-                        <trim prefix="recordId=(case" suffix="ELSE recordId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
-                                        when a.id=#{item.id} then #{item.recordId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="staffId=(case" suffix="ELSE staffId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
-                                        when a.id=#{item.id} then #{item.staffId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="staffName=(case" suffix="ELSE staffName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('staffName')) or (colPickMode==1 and !item.containsKey('staffName'))">
-                            when a.id=#{item.id} then #{item.staffName}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="workNum=(case" suffix="ELSE workNum end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('workNum')) or (colPickMode==1 and !item.containsKey('workNum'))">
-                            when a.id=#{item.id} then #{item.workNum}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="deptId=(case" suffix="ELSE deptId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
-                                        when a.id=#{item.id} then #{item.deptId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="deptName=(case" suffix="ELSE deptName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
-                            when a.id=#{item.id} then #{item.deptName}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="attendanceGroupId=(case" suffix="ELSE attendanceGroupId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('attendanceGroupId')) or (colPickMode==1 and !item.containsKey('attendanceGroupId'))">
-                                        when a.id=#{item.id} then #{item.attendanceGroupId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('attendanceGroupIdIncrement')) or (colPickMode==1 and !item.containsKey('attendanceGroupIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.attendanceGroupId,0) + #{item.attendanceGroupIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="attendanceGroupName=(case" suffix="ELSE attendanceGroupName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('attendanceGroupName')) or (colPickMode==1 and !item.containsKey('attendanceGroupName'))">
-                            when a.id=#{item.id} then #{item.attendanceGroupName}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="attendanceDate=(case" suffix="ELSE attendanceDate end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('attendanceDate')) or (colPickMode==1 and !item.containsKey('attendanceDate'))">
-                            when a.id=#{item.id} then #{item.attendanceDate}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="ruleId=(case" suffix="ELSE ruleId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('ruleId')) or (colPickMode==1 and !item.containsKey('ruleId'))">
-                                        when a.id=#{item.id} then #{item.ruleId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('ruleIdIncrement')) or (colPickMode==1 and !item.containsKey('ruleIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.ruleId,0) + #{item.ruleIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="ruleName=(case" suffix="ELSE ruleName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('ruleName')) or (colPickMode==1 and !item.containsKey('ruleName'))">
-                            when a.id=#{item.id} then #{item.ruleName}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
-                                        when a.id=#{item.id} then #{item.subAddType}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="score=(case" suffix="ELSE score end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('score')) or (colPickMode==1 and !item.containsKey('score'))">
-                                        when a.id=#{item.id} then #{item.score}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('scoreIncrement')) or (colPickMode==1 and !item.containsKey('scoreIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.score,0) + #{item.scoreIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="goOffTimeStr=(case" suffix="ELSE goOffTimeStr end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('goOffTimeStr')) or (colPickMode==1 and !item.containsKey('goOffTimeStr'))">
-                            when a.id=#{item.id} then #{item.goOffTimeStr}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="errorTime=(case" suffix="ELSE errorTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('errorTime')) or (colPickMode==1 and !item.containsKey('errorTime'))">
-                            when a.id=#{item.id} then #{item.errorTime}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="actualAttendTime=(case" suffix="ELSE actualAttendTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('actualAttendTime')) or (colPickMode==1 and !item.containsKey('actualAttendTime'))">
-                            when a.id=#{item.id} then #{item.actualAttendTime}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="errorResult=(case" suffix="ELSE errorResult end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('errorResult')) or (colPickMode==1 and !item.containsKey('errorResult'))">
-                            when a.id=#{item.id} then #{item.errorResult}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="checkPerson=(case" suffix="ELSE checkPerson end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('checkPerson')) or (colPickMode==1 and !item.containsKey('checkPerson'))">
-                            when a.id=#{item.id} then #{item.checkPerson}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="checkTime=(case" suffix="ELSE checkTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('checkTime')) or (colPickMode==1 and !item.containsKey('checkTime'))">
-                            when a.id=#{item.id} then #{item.checkTime}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="checkDesc=(case" suffix="ELSE checkDesc end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('checkDesc')) or (colPickMode==1 and !item.containsKey('checkDesc'))">
-                            when a.id=#{item.id} then #{item.checkDesc}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="checkResult=(case" suffix="ELSE checkResult end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('checkResult')) or (colPickMode==1 and !item.containsKey('checkResult'))">
-                            when a.id=#{item.id} then #{item.checkResult}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="checkStatus=(case" suffix="ELSE checkStatus end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('checkStatus')) or (colPickMode==1 and !item.containsKey('checkStatus'))">
-                                        when a.id=#{item.id} then #{item.checkStatus}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('checkStatusIncrement')) or (colPickMode==1 and !item.containsKey('checkStatusIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.checkStatus,0) + #{item.checkStatusIncrement}
-                                    </when>
-                                </choose>
-                            </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="updateUserId=(case" suffix="ELSE updateUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
-                                        when a.id=#{item.id} then #{item.updateUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </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 prefix="recordId=(case" suffix="ELSE recordId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
+                            when a.id=#{item.id} then #{item.recordId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="staffId=(case" suffix="ELSE staffId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
+                            when a.id=#{item.id} then #{item.staffId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="staffName=(case" suffix="ELSE staffName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('staffName')) or (colPickMode==1 and !item.containsKey('staffName'))">
+                        when a.id=#{item.id} then #{item.staffName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="workNum=(case" suffix="ELSE workNum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('workNum')) or (colPickMode==1 and !item.containsKey('workNum'))">
+                        when a.id=#{item.id} then #{item.workNum}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="deptId=(case" suffix="ELSE deptId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
+                            when a.id=#{item.id} then #{item.deptId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="deptName=(case" suffix="ELSE deptName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
+                        when a.id=#{item.id} then #{item.deptName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="attendanceGroupId=(case" suffix="ELSE attendanceGroupId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('attendanceGroupId')) or (colPickMode==1 and !item.containsKey('attendanceGroupId'))">
+                            when a.id=#{item.id} then #{item.attendanceGroupId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('attendanceGroupIdIncrement')) or (colPickMode==1 and !item.containsKey('attendanceGroupIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.attendanceGroupId,0) + #{item.attendanceGroupIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="attendanceGroupName=(case" suffix="ELSE attendanceGroupName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('attendanceGroupName')) or (colPickMode==1 and !item.containsKey('attendanceGroupName'))">
+                        when a.id=#{item.id} then #{item.attendanceGroupName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="attendanceDate=(case" suffix="ELSE attendanceDate end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('attendanceDate')) or (colPickMode==1 and !item.containsKey('attendanceDate'))">
+                        when a.id=#{item.id} then #{item.attendanceDate}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="ruleId=(case" suffix="ELSE ruleId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('ruleId')) or (colPickMode==1 and !item.containsKey('ruleId'))">
+                            when a.id=#{item.id} then #{item.ruleId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('ruleIdIncrement')) or (colPickMode==1 and !item.containsKey('ruleIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.ruleId,0) + #{item.ruleIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="ruleName=(case" suffix="ELSE ruleName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('ruleName')) or (colPickMode==1 and !item.containsKey('ruleName'))">
+                        when a.id=#{item.id} then #{item.ruleName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
+                            when a.id=#{item.id} then #{item.subAddType}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="score=(case" suffix="ELSE score end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('score')) or (colPickMode==1 and !item.containsKey('score'))">
+                            when a.id=#{item.id} then #{item.score}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('scoreIncrement')) or (colPickMode==1 and !item.containsKey('scoreIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.score,0) + #{item.scoreIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="goOffTimeStr=(case" suffix="ELSE goOffTimeStr end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('goOffTimeStr')) or (colPickMode==1 and !item.containsKey('goOffTimeStr'))">
+                        when a.id=#{item.id} then #{item.goOffTimeStr}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="errorTime=(case" suffix="ELSE errorTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('errorTime')) or (colPickMode==1 and !item.containsKey('errorTime'))">
+                        when a.id=#{item.id} then #{item.errorTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="actualAttendTime=(case" suffix="ELSE actualAttendTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('actualAttendTime')) or (colPickMode==1 and !item.containsKey('actualAttendTime'))">
+                        when a.id=#{item.id} then #{item.actualAttendTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="errorResult=(case" suffix="ELSE errorResult end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('errorResult')) or (colPickMode==1 and !item.containsKey('errorResult'))">
+                        when a.id=#{item.id} then #{item.errorResult}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="checkPerson=(case" suffix="ELSE checkPerson end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('checkPerson')) or (colPickMode==1 and !item.containsKey('checkPerson'))">
+                        when a.id=#{item.id} then #{item.checkPerson}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="checkTime=(case" suffix="ELSE checkTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('checkTime')) or (colPickMode==1 and !item.containsKey('checkTime'))">
+                        when a.id=#{item.id} then #{item.checkTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="checkDesc=(case" suffix="ELSE checkDesc end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('checkDesc')) or (colPickMode==1 and !item.containsKey('checkDesc'))">
+                        when a.id=#{item.id} then #{item.checkDesc}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="checkResult=(case" suffix="ELSE checkResult end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('checkResult')) or (colPickMode==1 and !item.containsKey('checkResult'))">
+                        when a.id=#{item.id} then #{item.checkResult}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="checkStatus=(case" suffix="ELSE checkStatus end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('checkStatus')) or (colPickMode==1 and !item.containsKey('checkStatus'))">
+                            when a.id=#{item.id} then #{item.checkStatus}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('checkStatusIncrement')) or (colPickMode==1 and !item.containsKey('checkStatusIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.checkStatus,0) + #{item.checkStatusIncrement}
+                        </when>
+                    </choose>
+                </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="updateUserId=(case" suffix="ELSE updateUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                            when a.id=#{item.id} then #{item.updateUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                        </when>
+                    </choose>
+                </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 prefix="subMethod=(case" suffix="ELSE subMethod end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('subMethod')) or (colPickMode==1 and !item.containsKey('subMethod'))">
+                            when a.id=#{item.id} then #{item.subMethod}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('subMethodIncrement')) or (colPickMode==1 and !item.containsKey('subMethodIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.subMethod,0) + #{item.subMethodIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -614,751 +636,783 @@
                 ${_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>
-            <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 test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
+        </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('recordId')">
-                <if test="conditionParamRef.recordId != null ">
-                    ${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
-                </if>
-                <if test="conditionParamRef.recordId == null">
-                    ${_conditionType_} a.recordId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
-                ${_conditionType_} a.recordId in
-                <foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('recordId')">
+            <if test="conditionParamRef.recordId != null ">
+                ${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
             </if>
-            <if test="conditionParamRef.containsKey('recordIdNotList') and conditionParamRef.recordIdNotList.size() > 0">
-                ${_conditionType_} a.recordId not in
-                <foreach collection="conditionParamRef.recordIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
-                ${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
-            </if>
-            <if test="conditionParamRef.containsKey('recordIdEnd') and conditionParamRef.recordIdEnd != null">
-                ${_conditionType_} a.recordId <![CDATA[ <= ]]> #{${_conditionParam_}.recordIdEnd}
+            <if test="conditionParamRef.recordId == null">
+                ${_conditionType_} a.recordId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
+            ${_conditionType_} a.recordId in
+            <foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('recordIdNotList') and conditionParamRef.recordIdNotList.size() > 0">
+            ${_conditionType_} a.recordId not in
+            <foreach collection="conditionParamRef.recordIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
+            ${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('recordIdEnd') and conditionParamRef.recordIdEnd != null">
+            ${_conditionType_} a.recordId <![CDATA[ <= ]]> #{${_conditionParam_}.recordIdEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('staffId')">
-                <if test="conditionParamRef.staffId != null ">
-                    ${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
-                </if>
-                <if test="conditionParamRef.staffId == null">
-                    ${_conditionType_} a.staffId is null
-                </if>
+        <if test="conditionParamRef.containsKey('staffId')">
+            <if test="conditionParamRef.staffId != null ">
+                ${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
             </if>
-            <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
-                ${_conditionType_} a.staffId in
-                <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
-                ${_conditionType_} a.staffId not in
-                <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
-                ${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
-            </if>
-            <if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
-                ${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
+            <if test="conditionParamRef.staffId == null">
+                ${_conditionType_} a.staffId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
+            ${_conditionType_} a.staffId in
+            <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
+            ${_conditionType_} a.staffId not in
+            <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
+            ${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
+            ${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('staffName')">
-                <if test="conditionParamRef.staffName != null and conditionParamRef.staffName != ''">
-                    ${_conditionType_} a.staffName like #{${_conditionParam_}.staffName}
-                </if>
-                <if test="conditionParamRef.staffName == null">
-                    ${_conditionType_} a.staffName is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
-                ${_conditionType_} a.staffName in
-                <foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('staffName')">
+            <if test="conditionParamRef.staffName != null and conditionParamRef.staffName != ''">
+                ${_conditionType_} a.staffName like #{${_conditionParam_}.staffName}
             </if>
-            <if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
-                ${_conditionType_} a.staffName not in
-                <foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.staffName == null">
+                ${_conditionType_} a.staffName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
+            ${_conditionType_} a.staffName in
+            <foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
+            ${_conditionType_} a.staffName not in
+            <foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('workNum')">
-                <if test="conditionParamRef.workNum != null and conditionParamRef.workNum != ''">
-                    ${_conditionType_} a.workNum like #{${_conditionParam_}.workNum}
-                </if>
-                <if test="conditionParamRef.workNum == null">
-                    ${_conditionType_} a.workNum is null
-                </if>
+        <if test="conditionParamRef.containsKey('workNum')">
+            <if test="conditionParamRef.workNum != null and conditionParamRef.workNum != ''">
+                ${_conditionType_} a.workNum like #{${_conditionParam_}.workNum}
             </if>
-            <if test="conditionParamRef.containsKey('workNumList') and conditionParamRef.workNumList.size() > 0">
-                ${_conditionType_} a.workNum in
-                <foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('workNumNotList') and conditionParamRef.workNumNotList.size() > 0">
-                ${_conditionType_} a.workNum not in
-                <foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('deptId')">
-                <if test="conditionParamRef.deptId != null ">
-                    ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
-                </if>
-                <if test="conditionParamRef.deptId == null">
-                    ${_conditionType_} a.deptId is null
-                </if>
+            <if test="conditionParamRef.workNum == null">
+                ${_conditionType_} a.workNum is null
             </if>
-            <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
-                ${_conditionType_} a.deptId in
-                <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
-                ${_conditionType_} a.deptId not in
-                <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
-                ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('workNumList') and conditionParamRef.workNumList.size() > 0">
+            ${_conditionType_} a.workNum in
+            <foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('workNumNotList') and conditionParamRef.workNumNotList.size() > 0">
+            ${_conditionType_} a.workNum not in
+            <foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptId')">
+            <if test="conditionParamRef.deptId != null ">
+                ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
             </if>
-            <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
-                ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+            <if test="conditionParamRef.deptId == null">
+                ${_conditionType_} a.deptId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+            ${_conditionType_} a.deptId in
+            <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
+            ${_conditionType_} a.deptId not in
+            <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
+            ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
+            ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('deptName')">
-                <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
-                    ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
-                </if>
-                <if test="conditionParamRef.deptName == null">
-                    ${_conditionType_} a.deptName is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
-                ${_conditionType_} a.deptName in
-                <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
-                ${_conditionType_} a.deptName not in
-                <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('attendanceGroupId')">
-                <if test="conditionParamRef.attendanceGroupId != null ">
-                    ${_conditionType_} a.attendanceGroupId = #{${_conditionParam_}.attendanceGroupId}
-                </if>
-                <if test="conditionParamRef.attendanceGroupId == null">
-                    ${_conditionType_} a.attendanceGroupId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
-                ${_conditionType_} a.attendanceGroupId in
-                <foreach collection="conditionParamRef.attendanceGroupIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('deptName')">
+            <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
+                ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
             </if>
-            <if test="conditionParamRef.containsKey('attendanceGroupIdNotList') and conditionParamRef.attendanceGroupIdNotList.size() > 0">
-                ${_conditionType_} a.attendanceGroupId not in
-                <foreach collection="conditionParamRef.attendanceGroupIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.deptName == null">
+                ${_conditionType_} a.deptName is null
             </if>
-            <if test="conditionParamRef.containsKey('attendanceGroupIdStart') and conditionParamRef.attendanceGroupIdStart != null">
-                ${_conditionType_} a.attendanceGroupId <![CDATA[ >= ]]> #{${_conditionParam_}.attendanceGroupIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
+            ${_conditionType_} a.deptName in
+            <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
+            ${_conditionType_} a.deptName not in
+            <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceGroupId')">
+            <if test="conditionParamRef.attendanceGroupId != null ">
+                ${_conditionType_} a.attendanceGroupId = #{${_conditionParam_}.attendanceGroupId}
             </if>
-            <if test="conditionParamRef.containsKey('attendanceGroupIdEnd') and conditionParamRef.attendanceGroupIdEnd != null">
-                ${_conditionType_} a.attendanceGroupId <![CDATA[ <= ]]> #{${_conditionParam_}.attendanceGroupIdEnd}
+            <if test="conditionParamRef.attendanceGroupId == null">
+                ${_conditionType_} a.attendanceGroupId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
+            ${_conditionType_} a.attendanceGroupId in
+            <foreach collection="conditionParamRef.attendanceGroupIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceGroupIdNotList') and conditionParamRef.attendanceGroupIdNotList.size() > 0">
+            ${_conditionType_} a.attendanceGroupId not in
+            <foreach collection="conditionParamRef.attendanceGroupIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceGroupIdStart') and conditionParamRef.attendanceGroupIdStart != null">
+            ${_conditionType_} a.attendanceGroupId <![CDATA[ >= ]]> #{${_conditionParam_}.attendanceGroupIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceGroupIdEnd') and conditionParamRef.attendanceGroupIdEnd != null">
+            ${_conditionType_} a.attendanceGroupId <![CDATA[ <= ]]> #{${_conditionParam_}.attendanceGroupIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('attendanceGroupName')">
-                <if test="conditionParamRef.attendanceGroupName != null and conditionParamRef.attendanceGroupName != ''">
-                    ${_conditionType_} a.attendanceGroupName like #{${_conditionParam_}.attendanceGroupName}
-                </if>
-                <if test="conditionParamRef.attendanceGroupName == null">
-                    ${_conditionType_} a.attendanceGroupName is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('attendanceGroupNameList') and conditionParamRef.attendanceGroupNameList.size() > 0">
-                ${_conditionType_} a.attendanceGroupName in
-                <foreach collection="conditionParamRef.attendanceGroupNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('attendanceGroupName')">
+            <if test="conditionParamRef.attendanceGroupName != null and conditionParamRef.attendanceGroupName != ''">
+                ${_conditionType_} a.attendanceGroupName like #{${_conditionParam_}.attendanceGroupName}
             </if>
-            <if test="conditionParamRef.containsKey('attendanceGroupNameNotList') and conditionParamRef.attendanceGroupNameNotList.size() > 0">
-                ${_conditionType_} a.attendanceGroupName not in
-                <foreach collection="conditionParamRef.attendanceGroupNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.attendanceGroupName == null">
+                ${_conditionType_} a.attendanceGroupName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceGroupNameList') and conditionParamRef.attendanceGroupNameList.size() > 0">
+            ${_conditionType_} a.attendanceGroupName in
+            <foreach collection="conditionParamRef.attendanceGroupNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceGroupNameNotList') and conditionParamRef.attendanceGroupNameNotList.size() > 0">
+            ${_conditionType_} a.attendanceGroupName not in
+            <foreach collection="conditionParamRef.attendanceGroupNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('attendanceDate')">
-                <if test="conditionParamRef.attendanceDate != null ">
-                    ${_conditionType_} a.attendanceDate = #{${_conditionParam_}.attendanceDate}
-                </if>
-                <if test="conditionParamRef.attendanceDate == null">
-                    ${_conditionType_} a.attendanceDate is null
-                </if>
+        <if test="conditionParamRef.containsKey('attendanceDate')">
+            <if test="conditionParamRef.attendanceDate != null ">
+                ${_conditionType_} a.attendanceDate = #{${_conditionParam_}.attendanceDate}
             </if>
-            <if test="conditionParamRef.containsKey('attendanceDateStart') and conditionParamRef.attendanceDateStart != null and conditionParamRef.attendanceDateStart!=''">
-                ${_conditionType_} a.attendanceDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.attendanceDate == null">
+                ${_conditionType_} a.attendanceDate is null
             </if>
-            <if test="conditionParamRef.containsKey('attendanceDateEnd') and conditionParamRef.attendanceDateEnd != null and conditionParamRef.attendanceDateEnd!=''">
-                ${_conditionType_} a.attendanceDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('ruleId')">
-                <if test="conditionParamRef.ruleId != null ">
-                    ${_conditionType_} a.ruleId = #{${_conditionParam_}.ruleId}
-                </if>
-                <if test="conditionParamRef.ruleId == null">
-                    ${_conditionType_} a.ruleId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('ruleIdList') and conditionParamRef.ruleIdList.size() > 0">
-                ${_conditionType_} a.ruleId in
-                <foreach collection="conditionParamRef.ruleIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('ruleIdNotList') and conditionParamRef.ruleIdNotList.size() > 0">
-                ${_conditionType_} a.ruleId not in
-                <foreach collection="conditionParamRef.ruleIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('ruleIdStart') and conditionParamRef.ruleIdStart != null">
-                ${_conditionType_} a.ruleId <![CDATA[ >= ]]> #{${_conditionParam_}.ruleIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceDateStart') and conditionParamRef.attendanceDateStart != null and conditionParamRef.attendanceDateStart!=''">
+            ${_conditionType_} a.attendanceDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('attendanceDateEnd') and conditionParamRef.attendanceDateEnd != null and conditionParamRef.attendanceDateEnd!=''">
+            ${_conditionType_} a.attendanceDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.attendanceDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('ruleId')">
+            <if test="conditionParamRef.ruleId != null ">
+                ${_conditionType_} a.ruleId = #{${_conditionParam_}.ruleId}
             </if>
-            <if test="conditionParamRef.containsKey('ruleIdEnd') and conditionParamRef.ruleIdEnd != null">
-                ${_conditionType_} a.ruleId <![CDATA[ <= ]]> #{${_conditionParam_}.ruleIdEnd}
+            <if test="conditionParamRef.ruleId == null">
+                ${_conditionType_} a.ruleId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('ruleIdList') and conditionParamRef.ruleIdList.size() > 0">
+            ${_conditionType_} a.ruleId in
+            <foreach collection="conditionParamRef.ruleIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('ruleIdNotList') and conditionParamRef.ruleIdNotList.size() > 0">
+            ${_conditionType_} a.ruleId not in
+            <foreach collection="conditionParamRef.ruleIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('ruleIdStart') and conditionParamRef.ruleIdStart != null">
+            ${_conditionType_} a.ruleId <![CDATA[ >= ]]> #{${_conditionParam_}.ruleIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('ruleIdEnd') and conditionParamRef.ruleIdEnd != null">
+            ${_conditionType_} a.ruleId <![CDATA[ <= ]]> #{${_conditionParam_}.ruleIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('ruleName')">
-                <if test="conditionParamRef.ruleName != null and conditionParamRef.ruleName != ''">
-                    ${_conditionType_} a.ruleName like #{${_conditionParam_}.ruleName}
-                </if>
-                <if test="conditionParamRef.ruleName == null">
-                    ${_conditionType_} a.ruleName is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('ruleNameList') and conditionParamRef.ruleNameList.size() > 0">
-                ${_conditionType_} a.ruleName in
-                <foreach collection="conditionParamRef.ruleNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('ruleNameNotList') and conditionParamRef.ruleNameNotList.size() > 0">
-                ${_conditionType_} a.ruleName not in
-                <foreach collection="conditionParamRef.ruleNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('ruleName')">
+            <if test="conditionParamRef.ruleName != null and conditionParamRef.ruleName != ''">
+                ${_conditionType_} a.ruleName like #{${_conditionParam_}.ruleName}
             </if>
-            <if test="conditionParamRef.containsKey('subAddType')">
-                <if test="conditionParamRef.subAddType != null ">
-                    ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
-                </if>
-                <if test="conditionParamRef.subAddType == null">
-                    ${_conditionType_} a.subAddType is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
-                ${_conditionType_} a.subAddType in
-                <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.ruleName == null">
+                ${_conditionType_} a.ruleName is null
             </if>
-            <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
-                ${_conditionType_} a.subAddType not in
-                <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
-                ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('ruleNameList') and conditionParamRef.ruleNameList.size() > 0">
+            ${_conditionType_} a.ruleName in
+            <foreach collection="conditionParamRef.ruleNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('ruleNameNotList') and conditionParamRef.ruleNameNotList.size() > 0">
+            ${_conditionType_} a.ruleName not in
+            <foreach collection="conditionParamRef.ruleNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('subAddType')">
+            <if test="conditionParamRef.subAddType != null ">
+                ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
             </if>
-            <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
-                ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
+            <if test="conditionParamRef.subAddType == null">
+                ${_conditionType_} a.subAddType is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
+            ${_conditionType_} a.subAddType in
+            <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
+            ${_conditionType_} a.subAddType not in
+            <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
+            ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
+            ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('score')">
-                <if test="conditionParamRef.score != null ">
-                    ${_conditionType_} a.score = #{${_conditionParam_}.score}
-                </if>
-                <if test="conditionParamRef.score == null">
-                    ${_conditionType_} a.score is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
-                ${_conditionType_} a.score in
-                <foreach collection="conditionParamRef.scoreList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('scoreNotList') and conditionParamRef.scoreNotList.size() > 0">
-                ${_conditionType_} a.score not in
-                <foreach collection="conditionParamRef.scoreNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('score')">
+            <if test="conditionParamRef.score != null ">
+                ${_conditionType_} a.score = #{${_conditionParam_}.score}
             </if>
-            <if test="conditionParamRef.containsKey('scoreStart') and conditionParamRef.scoreStart != null">
-                ${_conditionType_} a.score <![CDATA[ >= ]]> #{${_conditionParam_}.scoreStart}
-            </if>
-            <if test="conditionParamRef.containsKey('scoreEnd') and conditionParamRef.scoreEnd != null">
-                ${_conditionType_} a.score <![CDATA[ <= ]]> #{${_conditionParam_}.scoreEnd}
+            <if test="conditionParamRef.score == null">
+                ${_conditionType_} a.score is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
+            ${_conditionType_} a.score in
+            <foreach collection="conditionParamRef.scoreList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('scoreNotList') and conditionParamRef.scoreNotList.size() > 0">
+            ${_conditionType_} a.score not in
+            <foreach collection="conditionParamRef.scoreNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('scoreStart') and conditionParamRef.scoreStart != null">
+            ${_conditionType_} a.score <![CDATA[ >= ]]> #{${_conditionParam_}.scoreStart}
+        </if>
+        <if test="conditionParamRef.containsKey('scoreEnd') and conditionParamRef.scoreEnd != null">
+            ${_conditionType_} a.score <![CDATA[ <= ]]> #{${_conditionParam_}.scoreEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('goOffTimeStr')">
-                <if test="conditionParamRef.goOffTimeStr != null and conditionParamRef.goOffTimeStr != ''">
-                    ${_conditionType_} a.goOffTimeStr like #{${_conditionParam_}.goOffTimeStr}
-                </if>
-                <if test="conditionParamRef.goOffTimeStr == null">
-                    ${_conditionType_} a.goOffTimeStr is null
-                </if>
+        <if test="conditionParamRef.containsKey('goOffTimeStr')">
+            <if test="conditionParamRef.goOffTimeStr != null and conditionParamRef.goOffTimeStr != ''">
+                ${_conditionType_} a.goOffTimeStr like #{${_conditionParam_}.goOffTimeStr}
             </if>
-            <if test="conditionParamRef.containsKey('goOffTimeStrList') and conditionParamRef.goOffTimeStrList.size() > 0">
-                ${_conditionType_} a.goOffTimeStr in
-                <foreach collection="conditionParamRef.goOffTimeStrList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('goOffTimeStrNotList') and conditionParamRef.goOffTimeStrNotList.size() > 0">
-                ${_conditionType_} a.goOffTimeStr not in
-                <foreach collection="conditionParamRef.goOffTimeStrNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.goOffTimeStr == null">
+                ${_conditionType_} a.goOffTimeStr is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('goOffTimeStrList') and conditionParamRef.goOffTimeStrList.size() > 0">
+            ${_conditionType_} a.goOffTimeStr in
+            <foreach collection="conditionParamRef.goOffTimeStrList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('goOffTimeStrNotList') and conditionParamRef.goOffTimeStrNotList.size() > 0">
+            ${_conditionType_} a.goOffTimeStr not in
+            <foreach collection="conditionParamRef.goOffTimeStrNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('errorTime')">
-                <if test="conditionParamRef.errorTime != null ">
-                    ${_conditionType_} a.errorTime = #{${_conditionParam_}.errorTime}
-                </if>
-                <if test="conditionParamRef.errorTime == null">
-                    ${_conditionType_} a.errorTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('errorTime')">
+            <if test="conditionParamRef.errorTime != null ">
+                ${_conditionType_} a.errorTime = #{${_conditionParam_}.errorTime}
             </if>
-            <if test="conditionParamRef.containsKey('errorTimeStart') and conditionParamRef.errorTimeStart != null and conditionParamRef.errorTimeStart!=''">
-                ${_conditionType_} a.errorTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('errorTimeEnd') and conditionParamRef.errorTimeEnd != null and conditionParamRef.errorTimeEnd!=''">
-                ${_conditionType_} a.errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.errorTime == null">
+                ${_conditionType_} a.errorTime is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('errorTimeStart') and conditionParamRef.errorTimeStart != null and conditionParamRef.errorTimeStart!=''">
+            ${_conditionType_} a.errorTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('errorTimeEnd') and conditionParamRef.errorTimeEnd != null and conditionParamRef.errorTimeEnd!=''">
+            ${_conditionType_} a.errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.errorTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
 
-            <if test="conditionParamRef.containsKey('actualAttendTime')">
-                <if test="conditionParamRef.actualAttendTime != null ">
-                    ${_conditionType_} a.actualAttendTime = #{${_conditionParam_}.actualAttendTime}
-                </if>
-                <if test="conditionParamRef.actualAttendTime == null">
-                    ${_conditionType_} a.actualAttendTime is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('actualAttendTimeStart') and conditionParamRef.actualAttendTimeStart != null and conditionParamRef.actualAttendTimeStart!=''">
-                ${_conditionType_} a.actualAttendTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('actualAttendTime')">
+            <if test="conditionParamRef.actualAttendTime != null ">
+                ${_conditionType_} a.actualAttendTime = #{${_conditionParam_}.actualAttendTime}
             </if>
-            <if test="conditionParamRef.containsKey('actualAttendTimeEnd') and conditionParamRef.actualAttendTimeEnd != null and conditionParamRef.actualAttendTimeEnd!=''">
-                ${_conditionType_} a.actualAttendTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.actualAttendTime == null">
+                ${_conditionType_} a.actualAttendTime is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('actualAttendTimeStart') and conditionParamRef.actualAttendTimeStart != null and conditionParamRef.actualAttendTimeStart!=''">
+            ${_conditionType_} a.actualAttendTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('actualAttendTimeEnd') and conditionParamRef.actualAttendTimeEnd != null and conditionParamRef.actualAttendTimeEnd!=''">
+            ${_conditionType_} a.actualAttendTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.actualAttendTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
 
-            <if test="conditionParamRef.containsKey('errorResult')">
-                <if test="conditionParamRef.errorResult != null and conditionParamRef.errorResult != ''">
-                    ${_conditionType_} a.errorResult like #{${_conditionParam_}.errorResult}
-                </if>
-                <if test="conditionParamRef.errorResult == null">
-                    ${_conditionType_} a.errorResult is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('errorResultList') and conditionParamRef.errorResultList.size() > 0">
-                ${_conditionType_} a.errorResult in
-                <foreach collection="conditionParamRef.errorResultList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('errorResult')">
+            <if test="conditionParamRef.errorResult != null and conditionParamRef.errorResult != ''">
+                ${_conditionType_} a.errorResult like #{${_conditionParam_}.errorResult}
             </if>
-            <if test="conditionParamRef.containsKey('errorResultNotList') and conditionParamRef.errorResultNotList.size() > 0">
-                ${_conditionType_} a.errorResult not in
-                <foreach collection="conditionParamRef.errorResultNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.errorResult == null">
+                ${_conditionType_} a.errorResult is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('errorResultList') and conditionParamRef.errorResultList.size() > 0">
+            ${_conditionType_} a.errorResult in
+            <foreach collection="conditionParamRef.errorResultList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('errorResultNotList') and conditionParamRef.errorResultNotList.size() > 0">
+            ${_conditionType_} a.errorResult not in
+            <foreach collection="conditionParamRef.errorResultNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('checkPerson')">
-                <if test="conditionParamRef.checkPerson != null and conditionParamRef.checkPerson != ''">
-                    ${_conditionType_} a.checkPerson like #{${_conditionParam_}.checkPerson}
-                </if>
-                <if test="conditionParamRef.checkPerson == null">
-                    ${_conditionType_} a.checkPerson is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('checkPersonList') and conditionParamRef.checkPersonList.size() > 0">
-                ${_conditionType_} a.checkPerson in
-                <foreach collection="conditionParamRef.checkPersonList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('checkPerson')">
+            <if test="conditionParamRef.checkPerson != null and conditionParamRef.checkPerson != ''">
+                ${_conditionType_} a.checkPerson like #{${_conditionParam_}.checkPerson}
             </if>
-            <if test="conditionParamRef.containsKey('checkPersonNotList') and conditionParamRef.checkPersonNotList.size() > 0">
-                ${_conditionType_} a.checkPerson not in
-                <foreach collection="conditionParamRef.checkPersonNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.checkPerson == null">
+                ${_conditionType_} a.checkPerson is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('checkPersonList') and conditionParamRef.checkPersonList.size() > 0">
+            ${_conditionType_} a.checkPerson in
+            <foreach collection="conditionParamRef.checkPersonList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('checkPersonNotList') and conditionParamRef.checkPersonNotList.size() > 0">
+            ${_conditionType_} a.checkPerson not in
+            <foreach collection="conditionParamRef.checkPersonNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('checkTime')">
-                <if test="conditionParamRef.checkTime != null ">
-                    ${_conditionType_} a.checkTime = #{${_conditionParam_}.checkTime}
-                </if>
-                <if test="conditionParamRef.checkTime == null">
-                    ${_conditionType_} a.checkTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('checkTime')">
+            <if test="conditionParamRef.checkTime != null ">
+                ${_conditionType_} a.checkTime = #{${_conditionParam_}.checkTime}
             </if>
-            <if test="conditionParamRef.containsKey('checkTimeStart') and conditionParamRef.checkTimeStart != null and conditionParamRef.checkTimeStart!=''">
-                ${_conditionType_} a.checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('checkTimeEnd') and conditionParamRef.checkTimeEnd != null and conditionParamRef.checkTimeEnd!=''">
-                ${_conditionType_} a.checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.checkTime == null">
+                ${_conditionType_} a.checkTime is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('checkTimeStart') and conditionParamRef.checkTimeStart != null and conditionParamRef.checkTimeStart!=''">
+            ${_conditionType_} a.checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('checkTimeEnd') and conditionParamRef.checkTimeEnd != null and conditionParamRef.checkTimeEnd!=''">
+            ${_conditionType_} a.checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
 
-            <if test="conditionParamRef.containsKey('checkDesc')">
-                <if test="conditionParamRef.checkDesc != null and conditionParamRef.checkDesc != ''">
-                    ${_conditionType_} a.checkDesc like #{${_conditionParam_}.checkDesc}
-                </if>
-                <if test="conditionParamRef.checkDesc == null">
-                    ${_conditionType_} a.checkDesc is null
-                </if>
+        <if test="conditionParamRef.containsKey('checkDesc')">
+            <if test="conditionParamRef.checkDesc != null and conditionParamRef.checkDesc != ''">
+                ${_conditionType_} a.checkDesc like #{${_conditionParam_}.checkDesc}
             </if>
-            <if test="conditionParamRef.containsKey('checkDescList') and conditionParamRef.checkDescList.size() > 0">
-                ${_conditionType_} a.checkDesc in
-                <foreach collection="conditionParamRef.checkDescList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('checkDescNotList') and conditionParamRef.checkDescNotList.size() > 0">
-                ${_conditionType_} a.checkDesc not in
-                <foreach collection="conditionParamRef.checkDescNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.checkDesc == null">
+                ${_conditionType_} a.checkDesc is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('checkDescList') and conditionParamRef.checkDescList.size() > 0">
+            ${_conditionType_} a.checkDesc in
+            <foreach collection="conditionParamRef.checkDescList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('checkDescNotList') and conditionParamRef.checkDescNotList.size() > 0">
+            ${_conditionType_} a.checkDesc not in
+            <foreach collection="conditionParamRef.checkDescNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('checkResult')">
-                <if test="conditionParamRef.checkResult != null and conditionParamRef.checkResult != ''">
-                    ${_conditionType_} a.checkResult like #{${_conditionParam_}.checkResult}
-                </if>
-                <if test="conditionParamRef.checkResult == null">
-                    ${_conditionType_} a.checkResult is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('checkResultList') and conditionParamRef.checkResultList.size() > 0">
-                ${_conditionType_} a.checkResult in
-                <foreach collection="conditionParamRef.checkResultList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('checkResult')">
+            <if test="conditionParamRef.checkResult != null and conditionParamRef.checkResult != ''">
+                ${_conditionType_} a.checkResult like #{${_conditionParam_}.checkResult}
             </if>
-            <if test="conditionParamRef.containsKey('checkResultNotList') and conditionParamRef.checkResultNotList.size() > 0">
-                ${_conditionType_} a.checkResult not in
-                <foreach collection="conditionParamRef.checkResultNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('checkStatus')">
-                <if test="conditionParamRef.checkStatus != null ">
-                    ${_conditionType_} a.checkStatus = #{${_conditionParam_}.checkStatus}
-                </if>
-                <if test="conditionParamRef.checkStatus == null">
-                    ${_conditionType_} a.checkStatus is null
-                </if>
+            <if test="conditionParamRef.checkResult == null">
+                ${_conditionType_} a.checkResult is null
             </if>
-            <if test="conditionParamRef.containsKey('checkStatusList') and conditionParamRef.checkStatusList.size() > 0">
-                ${_conditionType_} a.checkStatus in
-                <foreach collection="conditionParamRef.checkStatusList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('checkStatusNotList') and conditionParamRef.checkStatusNotList.size() > 0">
-                ${_conditionType_} a.checkStatus not in
-                <foreach collection="conditionParamRef.checkStatusNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('checkStatusStart') and conditionParamRef.checkStatusStart != null">
-                ${_conditionType_} a.checkStatus <![CDATA[ >= ]]> #{${_conditionParam_}.checkStatusStart}
+        </if>
+        <if test="conditionParamRef.containsKey('checkResultList') and conditionParamRef.checkResultList.size() > 0">
+            ${_conditionType_} a.checkResult in
+            <foreach collection="conditionParamRef.checkResultList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('checkResultNotList') and conditionParamRef.checkResultNotList.size() > 0">
+            ${_conditionType_} a.checkResult not in
+            <foreach collection="conditionParamRef.checkResultNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('checkStatus')">
+            <if test="conditionParamRef.checkStatus != null ">
+                ${_conditionType_} a.checkStatus = #{${_conditionParam_}.checkStatus}
             </if>
-            <if test="conditionParamRef.containsKey('checkStatusEnd') and conditionParamRef.checkStatusEnd != null">
-                ${_conditionType_} a.checkStatus <![CDATA[ <= ]]> #{${_conditionParam_}.checkStatusEnd}
+            <if test="conditionParamRef.checkStatus == null">
+                ${_conditionType_} a.checkStatus is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('checkStatusList') and conditionParamRef.checkStatusList.size() > 0">
+            ${_conditionType_} a.checkStatus in
+            <foreach collection="conditionParamRef.checkStatusList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('checkStatusNotList') and conditionParamRef.checkStatusNotList.size() > 0">
+            ${_conditionType_} a.checkStatus not in
+            <foreach collection="conditionParamRef.checkStatusNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('checkStatusStart') and conditionParamRef.checkStatusStart != null">
+            ${_conditionType_} a.checkStatus <![CDATA[ >= ]]> #{${_conditionParam_}.checkStatusStart}
+        </if>
+        <if test="conditionParamRef.containsKey('checkStatusEnd') and conditionParamRef.checkStatusEnd != null">
+            ${_conditionType_} a.checkStatus <![CDATA[ <= ]]> #{${_conditionParam_}.checkStatusEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
-                </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
-                </if>
-            </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 test="conditionParamRef.containsKey('createUserId')">
+            <if test="conditionParamRef.createUserId != null ">
+                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
+        </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.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>
-                <if test="conditionParamRef.updateUserId == null">
-                    ${_conditionType_} a.updateUserId is null
-                </if>
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </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('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 test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+        </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>
-            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            <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('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('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
-                </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </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.updateTime == null">
+                ${_conditionType_} a.updateTime is null
             </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('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('subMethod')">
+            <if test="conditionParamRef.subMethod != null ">
+                ${_conditionType_} a.subMethod = #{${_conditionParam_}.subMethod}
+            </if>
+            <if test="conditionParamRef.subMethod == null">
+                ${_conditionType_} a.subMethod is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodList') and conditionParamRef.subMethodList.size() > 0">
+            ${_conditionType_} a.subMethod in
+            <foreach collection="conditionParamRef.subMethodList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodNotList') and conditionParamRef.subMethodNotList.size() > 0">
+            ${_conditionType_} a.subMethod not in
+            <foreach collection="conditionParamRef.subMethodNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodStart') and conditionParamRef.subMethodStart != null">
+            ${_conditionType_} a.subMethod <![CDATA[ >= ]]> #{${_conditionParam_}.subMethodStart}
+        </if>
+        <if test="conditionParamRef.containsKey('subMethodEnd') and conditionParamRef.subMethodEnd != null">
+            ${_conditionType_} a.subMethod <![CDATA[ <= ]]> #{${_conditionParam_}.subMethodEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <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('recordId')">
-                        a.recordId
-                        <if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('staffId')">
-                        a.staffId
-                        <if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('staffName')">
-                        a.staffName
-                        <if test='orderCol.staffName != null and "DESC".equalsIgnoreCase(orderCol.staffName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('workNum')">
-                        a.workNum
-                        <if test='orderCol.workNum != null and "DESC".equalsIgnoreCase(orderCol.workNum)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('deptId')">
-                        a.deptId
-                        <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('deptName')">
-                        a.deptName
-                        <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('attendanceGroupId')">
-                        a.attendanceGroupId
-                        <if test='orderCol.attendanceGroupId != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('attendanceGroupName')">
-                        a.attendanceGroupName
-                        <if test='orderCol.attendanceGroupName != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('attendanceDate')">
-                        a.attendanceDate
-                        <if test='orderCol.attendanceDate != null and "DESC".equalsIgnoreCase(orderCol.attendanceDate)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('ruleId')">
-                        a.ruleId
-                        <if test='orderCol.ruleId != null and "DESC".equalsIgnoreCase(orderCol.ruleId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('ruleName')">
-                        a.ruleName
-                        <if test='orderCol.ruleName != null and "DESC".equalsIgnoreCase(orderCol.ruleName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('subAddType')">
-                        a.subAddType
-                        <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('score')">
-                        a.score
-                        <if test='orderCol.score != null and "DESC".equalsIgnoreCase(orderCol.score)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('goOffTimeStr')">
-                        a.goOffTimeStr
-                        <if test='orderCol.goOffTimeStr != null and "DESC".equalsIgnoreCase(orderCol.goOffTimeStr)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('errorTime')">
-                        a.errorTime
-                        <if test='orderCol.errorTime != null and "DESC".equalsIgnoreCase(orderCol.errorTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('actualAttendTime')">
-                        a.actualAttendTime
-                        <if test='orderCol.actualAttendTime != null and "DESC".equalsIgnoreCase(orderCol.actualAttendTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('errorResult')">
-                        a.errorResult
-                        <if test='orderCol.errorResult != null and "DESC".equalsIgnoreCase(orderCol.errorResult)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('checkPerson')">
-                        a.checkPerson
-                        <if test='orderCol.checkPerson != null and "DESC".equalsIgnoreCase(orderCol.checkPerson)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('checkTime')">
-                        a.checkTime
-                        <if test='orderCol.checkTime != null and "DESC".equalsIgnoreCase(orderCol.checkTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('checkDesc')">
-                        a.checkDesc
-                        <if test='orderCol.checkDesc != null and "DESC".equalsIgnoreCase(orderCol.checkDesc)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('checkResult')">
-                        a.checkResult
-                        <if test='orderCol.checkResult != null and "DESC".equalsIgnoreCase(orderCol.checkResult)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('checkStatus')">
-                        a.checkStatus
-                        <if test='orderCol.checkStatus != null and "DESC".equalsIgnoreCase(orderCol.checkStatus)'>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('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('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('recordId')">
+                    a.recordId
+                    <if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('staffId')">
+                    a.staffId
+                    <if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('staffName')">
+                    a.staffName
+                    <if test='orderCol.staffName != null and "DESC".equalsIgnoreCase(orderCol.staffName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('workNum')">
+                    a.workNum
+                    <if test='orderCol.workNum != null and "DESC".equalsIgnoreCase(orderCol.workNum)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('deptId')">
+                    a.deptId
+                    <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('deptName')">
+                    a.deptName
+                    <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('attendanceGroupId')">
+                    a.attendanceGroupId
+                    <if test='orderCol.attendanceGroupId != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('attendanceGroupName')">
+                    a.attendanceGroupName
+                    <if test='orderCol.attendanceGroupName != null and "DESC".equalsIgnoreCase(orderCol.attendanceGroupName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('attendanceDate')">
+                    a.attendanceDate
+                    <if test='orderCol.attendanceDate != null and "DESC".equalsIgnoreCase(orderCol.attendanceDate)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('ruleId')">
+                    a.ruleId
+                    <if test='orderCol.ruleId != null and "DESC".equalsIgnoreCase(orderCol.ruleId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('ruleName')">
+                    a.ruleName
+                    <if test='orderCol.ruleName != null and "DESC".equalsIgnoreCase(orderCol.ruleName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('subAddType')">
+                    a.subAddType
+                    <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('score')">
+                    a.score
+                    <if test='orderCol.score != null and "DESC".equalsIgnoreCase(orderCol.score)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('goOffTimeStr')">
+                    a.goOffTimeStr
+                    <if test='orderCol.goOffTimeStr != null and "DESC".equalsIgnoreCase(orderCol.goOffTimeStr)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('errorTime')">
+                    a.errorTime
+                    <if test='orderCol.errorTime != null and "DESC".equalsIgnoreCase(orderCol.errorTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('actualAttendTime')">
+                    a.actualAttendTime
+                    <if test='orderCol.actualAttendTime != null and "DESC".equalsIgnoreCase(orderCol.actualAttendTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('errorResult')">
+                    a.errorResult
+                    <if test='orderCol.errorResult != null and "DESC".equalsIgnoreCase(orderCol.errorResult)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('checkPerson')">
+                    a.checkPerson
+                    <if test='orderCol.checkPerson != null and "DESC".equalsIgnoreCase(orderCol.checkPerson)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('checkTime')">
+                    a.checkTime
+                    <if test='orderCol.checkTime != null and "DESC".equalsIgnoreCase(orderCol.checkTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('checkDesc')">
+                    a.checkDesc
+                    <if test='orderCol.checkDesc != null and "DESC".equalsIgnoreCase(orderCol.checkDesc)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('checkResult')">
+                    a.checkResult
+                    <if test='orderCol.checkResult != null and "DESC".equalsIgnoreCase(orderCol.checkResult)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('checkStatus')">
+                    a.checkStatus
+                    <if test='orderCol.checkStatus != null and "DESC".equalsIgnoreCase(orderCol.checkStatus)'>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('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('subMethod')">
+                    a.subMethod
+                    <if test='orderCol.subMethod != null and "DESC".equalsIgnoreCase(orderCol.subMethod)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapper.xml
index 520bc353ac7e4ad95d1bf40eaf06e2f0bb843844..599a8e1ba7e54086e84645d006eb69aeeef005c5 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapper.xml
@@ -1,86 +1,90 @@
 <?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.feedback.dao.ibatis.FeedbackDaoImpl">
 
     <!-- 瀛楁鍜屽睘鎬ф槧灏� -->
     <resultMap type="FeedbackEntity" id="FeedbackEntity-Map">
-            <id  property="id" column="id" />
-            <result property="title" column="title" />
-            <result property="feedbackTimeStart" column="feedbackTimeStart" />
-            <result property="feedbackTimeEnd" column="feedbackTimeEnd" />
-            <result property="inviteNum" column="inviteNum" />
-            <result property="feedbackNum" column="feedbackNum" />
-            <result property="processStatus" column="processStatus" />
-            <result property="weblink" column="weblink" />
-            <result property="webUrl" column="webUrl" />
-            <result property="remark" column="remark" />
-            <result property="createUserId" column="createUserId" />
-            <result property="createTime" column="createTime" />
-            <result property="updateUserId" column="updateUserId" />
-            <result property="updateTime" column="updateTime" />
-            <collection property="feedbackQuestionList" column="id" ofType="FeedbackQuestionEntity" javaType="ArrayList" select="getFeedbackQuestionByFeedbackId"></collection>
+        <id  property="id" column="id" />
+        <result property="title" column="title" />
+        <result property="feedbackTimeStart" column="feedbackTimeStart" />
+        <result property="feedbackTimeEnd" column="feedbackTimeEnd" />
+        <result property="inviteNum" column="inviteNum" />
+        <result property="feedbackNum" column="feedbackNum" />
+        <result property="processStatus" column="processStatus" />
+        <result property="weblink" column="weblink" />
+        <result property="webUrl" column="webUrl" />
+        <result property="remark" column="remark" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createTime" column="createTime" />
+        <result property="updateUserId" column="updateUserId" />
+        <result property="updateTime" column="updateTime" />
+        <result property="formContent" column="formContent" />
+        <collection property="feedbackQuestionList" column="id" ofType="FeedbackQuestionEntity" javaType="ArrayList" select="getFeedbackQuestionByFeedbackId"></collection>
     </resultMap>
     <resultMap type="FeedbackQuestionEntity" id="FeedbackQuestionEntity-Map">
-            <result property="id" column="id" />
-            <result property="feedbackId" column="feedbackId" />
-            <result property="content" column="content" />
-            <result property="questionType" column="questionType" />
-            <result property="require" column="require" />
-            <result property="style" column="style" />
-            <result property="remark" column="remark" />
-            <result property="createUserId" column="createUserId" />
-            <result property="createTime" column="createTime" />
-            <result property="updateUserId" column="updateUserId" />
-            <result property="updateTime" column="updateTime" />
+        <result property="id" column="id" />
+        <result property="feedbackId" column="feedbackId" />
+        <result property="content" column="content" />
+        <result property="questionType" column="questionType" />
+        <result property="require" column="require" />
+        <result property="style" column="style" />
+        <result property="remark" column="remark" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createTime" column="createTime" />
+        <result property="updateUserId" column="updateUserId" />
+        <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('title') or colPickMode == 1 and data.containsKey('title')))">
-                    a.title,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackTimeStart') or colPickMode == 1 and data.containsKey('feedbackTimeStart')))">
-                    a.feedbackTimeStart,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackTimeEnd') or colPickMode == 1 and data.containsKey('feedbackTimeEnd')))">
-                    a.feedbackTimeEnd,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('inviteNum') or colPickMode == 1 and data.containsKey('inviteNum')))">
-                    a.inviteNum,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackNum') or colPickMode == 1 and data.containsKey('feedbackNum')))">
-                    a.feedbackNum,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('processStatus') or colPickMode == 1 and data.containsKey('processStatus')))">
-                    a.processStatus,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('weblink') or colPickMode == 1 and data.containsKey('weblink')))">
-                    a.weblink,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('webUrl') or colPickMode == 1 and data.containsKey('webUrl')))">
-                    a.webUrl,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
-                    a.remark,
-                </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('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
-                    a.updateUserId,
-                </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>
+            <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('title') or colPickMode == 1 and data.containsKey('title')))">
+                a.title,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackTimeStart') or colPickMode == 1 and data.containsKey('feedbackTimeStart')))">
+                a.feedbackTimeStart,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackTimeEnd') or colPickMode == 1 and data.containsKey('feedbackTimeEnd')))">
+                a.feedbackTimeEnd,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('inviteNum') or colPickMode == 1 and data.containsKey('inviteNum')))">
+                a.inviteNum,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('feedbackNum') or colPickMode == 1 and data.containsKey('feedbackNum')))">
+                a.feedbackNum,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('processStatus') or colPickMode == 1 and data.containsKey('processStatus')))">
+                a.processStatus,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('weblink') or colPickMode == 1 and data.containsKey('weblink')))">
+                a.weblink,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('webUrl') or colPickMode == 1 and data.containsKey('webUrl')))">
+                a.webUrl,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                a.remark,
+            </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('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                a.updateUserId,
+            </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>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
+                a.formContent,
+            </if>
         </trim>
     </sql>
     <!-- 瀛愯〃鎵€鏈夊垪 -->
@@ -92,18 +96,18 @@
     <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
     <insert id="insert" parameterType="FeedbackEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_feedback
-        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime)
+        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent)
         VALUES
-        (#{title},#{feedbackTimeStart},#{feedbackTimeEnd},#{inviteNum},#{feedbackNum},#{processStatus},#{weblink},#{webUrl},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{title},#{feedbackTimeStart},#{feedbackTimeEnd},#{inviteNum},#{feedbackNum},#{processStatus},#{weblink},#{webUrl},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{formContent})
     </insert>
 
     <!-- 鎵归噺鏂板 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_feedback
-        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime)
+        (title,feedbackTimeStart,feedbackTimeEnd,inviteNum,feedbackNum,processStatus,weblink,webUrl,remark,createUserId,createTime,updateUserId,updateTime,formContent)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.title},#{item.feedbackTimeStart},#{item.feedbackTimeEnd},#{item.inviteNum},#{item.feedbackNum},#{item.processStatus},#{item.weblink},#{item.webUrl},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.title},#{item.feedbackTimeStart},#{item.feedbackTimeEnd},#{item.inviteNum},#{item.feedbackNum},#{item.processStatus},#{item.weblink},#{item.webUrl},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.formContent})
         </foreach>
     </insert>
 
@@ -170,6 +174,9 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
+                a.formContent=#{data.formContent},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -182,127 +189,134 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_feedback as a
         <trim prefix="set" suffixOverrides=",">
-                <trim prefix="title=(case" suffix="ELSE title end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('title')) or (colPickMode==1 and !item.containsKey('title'))">
-                            when a.id=#{item.id} then #{item.title}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="feedbackTimeStart=(case" suffix="ELSE feedbackTimeStart end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('feedbackTimeStart')) or (colPickMode==1 and !item.containsKey('feedbackTimeStart'))">
-                            when a.id=#{item.id} then #{item.feedbackTimeStart}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="feedbackTimeEnd=(case" suffix="ELSE feedbackTimeEnd end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('feedbackTimeEnd')) or (colPickMode==1 and !item.containsKey('feedbackTimeEnd'))">
-                            when a.id=#{item.id} then #{item.feedbackTimeEnd}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="inviteNum=(case" suffix="ELSE inviteNum end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('inviteNum')) or (colPickMode==1 and !item.containsKey('inviteNum'))">
-                                        when a.id=#{item.id} then #{item.inviteNum}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('inviteNumIncrement')) or (colPickMode==1 and !item.containsKey('inviteNumIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.inviteNum,0) + #{item.inviteNumIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="feedbackNum=(case" suffix="ELSE feedbackNum end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('feedbackNum')) or (colPickMode==1 and !item.containsKey('feedbackNum'))">
-                                        when a.id=#{item.id} then #{item.feedbackNum}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('feedbackNumIncrement')) or (colPickMode==1 and !item.containsKey('feedbackNumIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.feedbackNum,0) + #{item.feedbackNumIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="processStatus=(case" suffix="ELSE processStatus end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('processStatus')) or (colPickMode==1 and !item.containsKey('processStatus'))">
-                                        when a.id=#{item.id} then #{item.processStatus}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('processStatusIncrement')) or (colPickMode==1 and !item.containsKey('processStatusIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.processStatus,0) + #{item.processStatusIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="weblink=(case" suffix="ELSE weblink end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('weblink')) or (colPickMode==1 and !item.containsKey('weblink'))">
-                                        when a.id=#{item.id} then #{item.weblink}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('weblinkIncrement')) or (colPickMode==1 and !item.containsKey('weblinkIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.weblink,0) + #{item.weblinkIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="webUrl=(case" suffix="ELSE webUrl end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('webUrl')) or (colPickMode==1 and !item.containsKey('webUrl'))">
-                            when a.id=#{item.id} then #{item.webUrl}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="remark=(case" suffix="ELSE remark end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
-                            when a.id=#{item.id} then #{item.remark}
-                        </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="updateUserId=(case" suffix="ELSE updateUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
-                                        when a.id=#{item.id} then #{item.updateUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </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 prefix="title=(case" suffix="ELSE title end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('title')) or (colPickMode==1 and !item.containsKey('title'))">
+                        when a.id=#{item.id} then #{item.title}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="feedbackTimeStart=(case" suffix="ELSE feedbackTimeStart end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('feedbackTimeStart')) or (colPickMode==1 and !item.containsKey('feedbackTimeStart'))">
+                        when a.id=#{item.id} then #{item.feedbackTimeStart}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="feedbackTimeEnd=(case" suffix="ELSE feedbackTimeEnd end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('feedbackTimeEnd')) or (colPickMode==1 and !item.containsKey('feedbackTimeEnd'))">
+                        when a.id=#{item.id} then #{item.feedbackTimeEnd}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="inviteNum=(case" suffix="ELSE inviteNum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('inviteNum')) or (colPickMode==1 and !item.containsKey('inviteNum'))">
+                            when a.id=#{item.id} then #{item.inviteNum}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('inviteNumIncrement')) or (colPickMode==1 and !item.containsKey('inviteNumIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.inviteNum,0) + #{item.inviteNumIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="feedbackNum=(case" suffix="ELSE feedbackNum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('feedbackNum')) or (colPickMode==1 and !item.containsKey('feedbackNum'))">
+                            when a.id=#{item.id} then #{item.feedbackNum}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('feedbackNumIncrement')) or (colPickMode==1 and !item.containsKey('feedbackNumIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.feedbackNum,0) + #{item.feedbackNumIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="processStatus=(case" suffix="ELSE processStatus end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('processStatus')) or (colPickMode==1 and !item.containsKey('processStatus'))">
+                            when a.id=#{item.id} then #{item.processStatus}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('processStatusIncrement')) or (colPickMode==1 and !item.containsKey('processStatusIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.processStatus,0) + #{item.processStatusIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="weblink=(case" suffix="ELSE weblink end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('weblink')) or (colPickMode==1 and !item.containsKey('weblink'))">
+                            when a.id=#{item.id} then #{item.weblink}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('weblinkIncrement')) or (colPickMode==1 and !item.containsKey('weblinkIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.weblink,0) + #{item.weblinkIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="webUrl=(case" suffix="ELSE webUrl end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('webUrl')) or (colPickMode==1 and !item.containsKey('webUrl'))">
+                        when a.id=#{item.id} then #{item.webUrl}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="remark=(case" suffix="ELSE remark end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                        when a.id=#{item.id} then #{item.remark}
+                    </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="updateUserId=(case" suffix="ELSE updateUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                            when a.id=#{item.id} then #{item.updateUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                        </when>
+                    </choose>
+                </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 prefix="formContent=(case" suffix="ELSE formContent end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
+                        when a.id=#{item.id} then #{item.formContent}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -427,401 +441,427 @@
                 ${_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>
-            <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 test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
+        </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('title')">
-                <if test="conditionParamRef.title != null and conditionParamRef.title != ''">
-                    ${_conditionType_} a.title like #{${_conditionParam_}.title}
-                </if>
-                <if test="conditionParamRef.title == null">
-                    ${_conditionType_} a.title is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('titleList') and conditionParamRef.titleList.size() > 0">
-                ${_conditionType_} a.title in
-                <foreach collection="conditionParamRef.titleList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('title')">
+            <if test="conditionParamRef.title != null and conditionParamRef.title != ''">
+                ${_conditionType_} a.title like #{${_conditionParam_}.title}
             </if>
-            <if test="conditionParamRef.containsKey('titleNotList') and conditionParamRef.titleNotList.size() > 0">
-                ${_conditionType_} a.title not in
-                <foreach collection="conditionParamRef.titleNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.title == null">
+                ${_conditionType_} a.title is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('titleList') and conditionParamRef.titleList.size() > 0">
+            ${_conditionType_} a.title in
+            <foreach collection="conditionParamRef.titleList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('titleNotList') and conditionParamRef.titleNotList.size() > 0">
+            ${_conditionType_} a.title not in
+            <foreach collection="conditionParamRef.titleNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('feedbackTimeStart')">
-                <if test="conditionParamRef.feedbackTimeStart != null ">
-                    ${_conditionType_} a.feedbackTimeStart = #{${_conditionParam_}.feedbackTimeStart}
-                </if>
-                <if test="conditionParamRef.feedbackTimeStart == null">
-                    ${_conditionType_} a.feedbackTimeStart is null
-                </if>
+        <if test="conditionParamRef.containsKey('feedbackTimeStart')">
+            <if test="conditionParamRef.feedbackTimeStart != null ">
+                ${_conditionType_} a.feedbackTimeStart = #{${_conditionParam_}.feedbackTimeStart}
             </if>
-            <if test="conditionParamRef.containsKey('feedbackTimeStartStart') and conditionParamRef.feedbackTimeStartStart != null and conditionParamRef.feedbackTimeStartStart!=''">
-                ${_conditionType_} a.feedbackTimeStart <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeStartStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('feedbackTimeStartEnd') and conditionParamRef.feedbackTimeStartEnd != null and conditionParamRef.feedbackTimeStartEnd!=''">
-                ${_conditionType_} a.feedbackTimeStart <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeStartEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.feedbackTimeStart == null">
+                ${_conditionType_} a.feedbackTimeStart is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackTimeStartStart') and conditionParamRef.feedbackTimeStartStart != null and conditionParamRef.feedbackTimeStartStart!=''">
+            ${_conditionType_} a.feedbackTimeStart <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeStartStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackTimeStartEnd') and conditionParamRef.feedbackTimeStartEnd != null and conditionParamRef.feedbackTimeStartEnd!=''">
+            ${_conditionType_} a.feedbackTimeStart <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeStartEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
 
-            <if test="conditionParamRef.containsKey('feedbackTimeEnd')">
-                <if test="conditionParamRef.feedbackTimeEnd != null ">
-                    ${_conditionType_} a.feedbackTimeEnd = #{${_conditionParam_}.feedbackTimeEnd}
-                </if>
-                <if test="conditionParamRef.feedbackTimeEnd == null">
-                    ${_conditionType_} a.feedbackTimeEnd is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('feedbackTimeEndStart') and conditionParamRef.feedbackTimeEndStart != null and conditionParamRef.feedbackTimeEndStart!=''">
-                ${_conditionType_} a.feedbackTimeEnd <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeEndStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('feedbackTimeEnd')">
+            <if test="conditionParamRef.feedbackTimeEnd != null ">
+                ${_conditionType_} a.feedbackTimeEnd = #{${_conditionParam_}.feedbackTimeEnd}
             </if>
-            <if test="conditionParamRef.containsKey('feedbackTimeEndEnd') and conditionParamRef.feedbackTimeEndEnd != null and conditionParamRef.feedbackTimeEndEnd!=''">
-                ${_conditionType_} a.feedbackTimeEnd <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeEndEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.feedbackTimeEnd == null">
+                ${_conditionType_} a.feedbackTimeEnd is null
             </if>
-            <if test="conditionParamRef.containsKey('inviteNum')">
-                <if test="conditionParamRef.inviteNum != null ">
-                    ${_conditionType_} a.inviteNum = #{${_conditionParam_}.inviteNum}
-                </if>
-                <if test="conditionParamRef.inviteNum == null">
-                    ${_conditionType_} a.inviteNum is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('inviteNumList') and conditionParamRef.inviteNumList.size() > 0">
-                ${_conditionType_} a.inviteNum in
-                <foreach collection="conditionParamRef.inviteNumList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('inviteNumNotList') and conditionParamRef.inviteNumNotList.size() > 0">
-                ${_conditionType_} a.inviteNum not in
-                <foreach collection="conditionParamRef.inviteNumNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('inviteNumStart') and conditionParamRef.inviteNumStart != null">
-                ${_conditionType_} a.inviteNum <![CDATA[ >= ]]> #{${_conditionParam_}.inviteNumStart}
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackTimeEndStart') and conditionParamRef.feedbackTimeEndStart != null and conditionParamRef.feedbackTimeEndStart!=''">
+            ${_conditionType_} a.feedbackTimeEnd <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeEndStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackTimeEndEnd') and conditionParamRef.feedbackTimeEndEnd != null and conditionParamRef.feedbackTimeEndEnd!=''">
+            ${_conditionType_} a.feedbackTimeEnd <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.feedbackTimeEndEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('inviteNum')">
+            <if test="conditionParamRef.inviteNum != null ">
+                ${_conditionType_} a.inviteNum = #{${_conditionParam_}.inviteNum}
             </if>
-            <if test="conditionParamRef.containsKey('inviteNumEnd') and conditionParamRef.inviteNumEnd != null">
-                ${_conditionType_} a.inviteNum <![CDATA[ <= ]]> #{${_conditionParam_}.inviteNumEnd}
+            <if test="conditionParamRef.inviteNum == null">
+                ${_conditionType_} a.inviteNum is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('inviteNumList') and conditionParamRef.inviteNumList.size() > 0">
+            ${_conditionType_} a.inviteNum in
+            <foreach collection="conditionParamRef.inviteNumList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('inviteNumNotList') and conditionParamRef.inviteNumNotList.size() > 0">
+            ${_conditionType_} a.inviteNum not in
+            <foreach collection="conditionParamRef.inviteNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('inviteNumStart') and conditionParamRef.inviteNumStart != null">
+            ${_conditionType_} a.inviteNum <![CDATA[ >= ]]> #{${_conditionParam_}.inviteNumStart}
+        </if>
+        <if test="conditionParamRef.containsKey('inviteNumEnd') and conditionParamRef.inviteNumEnd != null">
+            ${_conditionType_} a.inviteNum <![CDATA[ <= ]]> #{${_conditionParam_}.inviteNumEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('feedbackNum')">
-                <if test="conditionParamRef.feedbackNum != null ">
-                    ${_conditionType_} a.feedbackNum = #{${_conditionParam_}.feedbackNum}
-                </if>
-                <if test="conditionParamRef.feedbackNum == null">
-                    ${_conditionType_} a.feedbackNum is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('feedbackNumList') and conditionParamRef.feedbackNumList.size() > 0">
-                ${_conditionType_} a.feedbackNum in
-                <foreach collection="conditionParamRef.feedbackNumList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('feedbackNumNotList') and conditionParamRef.feedbackNumNotList.size() > 0">
-                ${_conditionType_} a.feedbackNum not in
-                <foreach collection="conditionParamRef.feedbackNumNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('feedbackNumStart') and conditionParamRef.feedbackNumStart != null">
-                ${_conditionType_} a.feedbackNum <![CDATA[ >= ]]> #{${_conditionParam_}.feedbackNumStart}
+        <if test="conditionParamRef.containsKey('feedbackNum')">
+            <if test="conditionParamRef.feedbackNum != null ">
+                ${_conditionType_} a.feedbackNum = #{${_conditionParam_}.feedbackNum}
             </if>
-            <if test="conditionParamRef.containsKey('feedbackNumEnd') and conditionParamRef.feedbackNumEnd != null">
-                ${_conditionType_} a.feedbackNum <![CDATA[ <= ]]> #{${_conditionParam_}.feedbackNumEnd}
+            <if test="conditionParamRef.feedbackNum == null">
+                ${_conditionType_} a.feedbackNum is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackNumList') and conditionParamRef.feedbackNumList.size() > 0">
+            ${_conditionType_} a.feedbackNum in
+            <foreach collection="conditionParamRef.feedbackNumList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackNumNotList') and conditionParamRef.feedbackNumNotList.size() > 0">
+            ${_conditionType_} a.feedbackNum not in
+            <foreach collection="conditionParamRef.feedbackNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackNumStart') and conditionParamRef.feedbackNumStart != null">
+            ${_conditionType_} a.feedbackNum <![CDATA[ >= ]]> #{${_conditionParam_}.feedbackNumStart}
+        </if>
+        <if test="conditionParamRef.containsKey('feedbackNumEnd') and conditionParamRef.feedbackNumEnd != null">
+            ${_conditionType_} a.feedbackNum <![CDATA[ <= ]]> #{${_conditionParam_}.feedbackNumEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('processStatus')">
-                <if test="conditionParamRef.processStatus != null ">
-                    ${_conditionType_} a.processStatus = #{${_conditionParam_}.processStatus}
-                </if>
-                <if test="conditionParamRef.processStatus == null">
-                    ${_conditionType_} a.processStatus is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('processStatusList') and conditionParamRef.processStatusList.size() > 0">
-                ${_conditionType_} a.processStatus in
-                <foreach collection="conditionParamRef.processStatusList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('processStatusNotList') and conditionParamRef.processStatusNotList.size() > 0">
-                ${_conditionType_} a.processStatus not in
-                <foreach collection="conditionParamRef.processStatusNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('processStatusStart') and conditionParamRef.processStatusStart != null">
-                ${_conditionType_} a.processStatus <![CDATA[ >= ]]> #{${_conditionParam_}.processStatusStart}
+        <if test="conditionParamRef.containsKey('processStatus')">
+            <if test="conditionParamRef.processStatus != null ">
+                ${_conditionType_} a.processStatus = #{${_conditionParam_}.processStatus}
             </if>
-            <if test="conditionParamRef.containsKey('processStatusEnd') and conditionParamRef.processStatusEnd != null">
-                ${_conditionType_} a.processStatus <![CDATA[ <= ]]> #{${_conditionParam_}.processStatusEnd}
+            <if test="conditionParamRef.processStatus == null">
+                ${_conditionType_} a.processStatus is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('processStatusList') and conditionParamRef.processStatusList.size() > 0">
+            ${_conditionType_} a.processStatus in
+            <foreach collection="conditionParamRef.processStatusList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('processStatusNotList') and conditionParamRef.processStatusNotList.size() > 0">
+            ${_conditionType_} a.processStatus not in
+            <foreach collection="conditionParamRef.processStatusNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('processStatusStart') and conditionParamRef.processStatusStart != null">
+            ${_conditionType_} a.processStatus <![CDATA[ >= ]]> #{${_conditionParam_}.processStatusStart}
+        </if>
+        <if test="conditionParamRef.containsKey('processStatusEnd') and conditionParamRef.processStatusEnd != null">
+            ${_conditionType_} a.processStatus <![CDATA[ <= ]]> #{${_conditionParam_}.processStatusEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('weblink')">
-                <if test="conditionParamRef.weblink != null ">
-                    ${_conditionType_} a.weblink = #{${_conditionParam_}.weblink}
-                </if>
-                <if test="conditionParamRef.weblink == null">
-                    ${_conditionType_} a.weblink is null
-                </if>
+        <if test="conditionParamRef.containsKey('weblink')">
+            <if test="conditionParamRef.weblink != null ">
+                ${_conditionType_} a.weblink = #{${_conditionParam_}.weblink}
             </if>
-            <if test="conditionParamRef.containsKey('weblinkList') and conditionParamRef.weblinkList.size() > 0">
-                ${_conditionType_} a.weblink in
-                <foreach collection="conditionParamRef.weblinkList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('weblinkNotList') and conditionParamRef.weblinkNotList.size() > 0">
-                ${_conditionType_} a.weblink not in
-                <foreach collection="conditionParamRef.weblinkNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('weblinkStart') and conditionParamRef.weblinkStart != null">
-                ${_conditionType_} a.weblink <![CDATA[ >= ]]> #{${_conditionParam_}.weblinkStart}
-            </if>
-            <if test="conditionParamRef.containsKey('weblinkEnd') and conditionParamRef.weblinkEnd != null">
-                ${_conditionType_} a.weblink <![CDATA[ <= ]]> #{${_conditionParam_}.weblinkEnd}
+            <if test="conditionParamRef.weblink == null">
+                ${_conditionType_} a.weblink is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('weblinkList') and conditionParamRef.weblinkList.size() > 0">
+            ${_conditionType_} a.weblink in
+            <foreach collection="conditionParamRef.weblinkList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('weblinkNotList') and conditionParamRef.weblinkNotList.size() > 0">
+            ${_conditionType_} a.weblink not in
+            <foreach collection="conditionParamRef.weblinkNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('weblinkStart') and conditionParamRef.weblinkStart != null">
+            ${_conditionType_} a.weblink <![CDATA[ >= ]]> #{${_conditionParam_}.weblinkStart}
+        </if>
+        <if test="conditionParamRef.containsKey('weblinkEnd') and conditionParamRef.weblinkEnd != null">
+            ${_conditionType_} a.weblink <![CDATA[ <= ]]> #{${_conditionParam_}.weblinkEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('webUrl')">
-                <if test="conditionParamRef.webUrl != null and conditionParamRef.webUrl != ''">
-                    ${_conditionType_} a.webUrl like #{${_conditionParam_}.webUrl}
-                </if>
-                <if test="conditionParamRef.webUrl == null">
-                    ${_conditionType_} a.webUrl is null
-                </if>
+        <if test="conditionParamRef.containsKey('webUrl')">
+            <if test="conditionParamRef.webUrl != null and conditionParamRef.webUrl != ''">
+                ${_conditionType_} a.webUrl like #{${_conditionParam_}.webUrl}
             </if>
-            <if test="conditionParamRef.containsKey('webUrlList') and conditionParamRef.webUrlList.size() > 0">
-                ${_conditionType_} a.webUrl in
-                <foreach collection="conditionParamRef.webUrlList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('webUrlNotList') and conditionParamRef.webUrlNotList.size() > 0">
-                ${_conditionType_} a.webUrl not in
-                <foreach collection="conditionParamRef.webUrlNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.webUrl == null">
+                ${_conditionType_} a.webUrl is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('webUrlList') and conditionParamRef.webUrlList.size() > 0">
+            ${_conditionType_} a.webUrl in
+            <foreach collection="conditionParamRef.webUrlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('webUrlNotList') and conditionParamRef.webUrlNotList.size() > 0">
+            ${_conditionType_} a.webUrl not in
+            <foreach collection="conditionParamRef.webUrlNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('remark')">
-                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
-                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
-                </if>
-                <if test="conditionParamRef.remark == null">
-                    ${_conditionType_} a.remark is null
-                </if>
+        <if test="conditionParamRef.containsKey('remark')">
+            <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
             </if>
-            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
-                ${_conditionType_} a.remark in
-                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.remark == null">
+                ${_conditionType_} a.remark is null
             </if>
-            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
-                ${_conditionType_} a.remark not in
-                <foreach collection="conditionParamRef.remarkNotList" 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.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
-                </if>
-            </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('remarkList') and conditionParamRef.remarkList.size() > 0">
+            ${_conditionType_} a.remark in
+            <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+            ${_conditionType_} a.remark not in
+            <foreach collection="conditionParamRef.remarkNotList" 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('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
+        </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.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 test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </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.createTime == null">
+                ${_conditionType_} a.createTime is null
             </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('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('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.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            <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('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('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
-                </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </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.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>
+
+        <if test="conditionParamRef.containsKey('formContent')">
+            <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
+                ${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
             </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.formContent == null">
+                ${_conditionType_} a.formContent is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('formContentList') and conditionParamRef.formContentList.size() > 0">
+            ${_conditionType_} a.formContent in
+            <foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('formContentNotList') and conditionParamRef.formContentNotList.size() > 0">
+            ${_conditionType_} a.formContent not in
+            <foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <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('title')">
-                        a.title
-                        <if test='orderCol.title != null and "DESC".equalsIgnoreCase(orderCol.title)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('feedbackTimeStart')">
-                        a.feedbackTimeStart
-                        <if test='orderCol.feedbackTimeStart != null and "DESC".equalsIgnoreCase(orderCol.feedbackTimeStart)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('feedbackTimeEnd')">
-                        a.feedbackTimeEnd
-                        <if test='orderCol.feedbackTimeEnd != null and "DESC".equalsIgnoreCase(orderCol.feedbackTimeEnd)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('inviteNum')">
-                        a.inviteNum
-                        <if test='orderCol.inviteNum != null and "DESC".equalsIgnoreCase(orderCol.inviteNum)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('feedbackNum')">
-                        a.feedbackNum
-                        <if test='orderCol.feedbackNum != null and "DESC".equalsIgnoreCase(orderCol.feedbackNum)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('processStatus')">
-                        a.processStatus
-                        <if test='orderCol.processStatus != null and "DESC".equalsIgnoreCase(orderCol.processStatus)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('weblink')">
-                        a.weblink
-                        <if test='orderCol.weblink != null and "DESC".equalsIgnoreCase(orderCol.weblink)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('webUrl')">
-                        a.webUrl
-                        <if test='orderCol.webUrl != null and "DESC".equalsIgnoreCase(orderCol.webUrl)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('remark')">
-                        a.remark
-                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>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('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('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('title')">
+                    a.title
+                    <if test='orderCol.title != null and "DESC".equalsIgnoreCase(orderCol.title)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('feedbackTimeStart')">
+                    a.feedbackTimeStart
+                    <if test='orderCol.feedbackTimeStart != null and "DESC".equalsIgnoreCase(orderCol.feedbackTimeStart)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('feedbackTimeEnd')">
+                    a.feedbackTimeEnd
+                    <if test='orderCol.feedbackTimeEnd != null and "DESC".equalsIgnoreCase(orderCol.feedbackTimeEnd)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('inviteNum')">
+                    a.inviteNum
+                    <if test='orderCol.inviteNum != null and "DESC".equalsIgnoreCase(orderCol.inviteNum)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('feedbackNum')">
+                    a.feedbackNum
+                    <if test='orderCol.feedbackNum != null and "DESC".equalsIgnoreCase(orderCol.feedbackNum)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('processStatus')">
+                    a.processStatus
+                    <if test='orderCol.processStatus != null and "DESC".equalsIgnoreCase(orderCol.processStatus)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('weblink')">
+                    a.weblink
+                    <if test='orderCol.weblink != null and "DESC".equalsIgnoreCase(orderCol.weblink)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('webUrl')">
+                    a.webUrl
+                    <if test='orderCol.webUrl != null and "DESC".equalsIgnoreCase(orderCol.webUrl)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('remark')">
+                    a.remark
+                    <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>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('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('formContent')">
+                    a.formContent
+                    <if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>
diff --git a/db/add.sql b/db/add.sql
index 65720812dcb66e2a4f10b80c6064d16a14bd1b1f..7bb2232fa820500816d07402f36304be1738ec4c 100644
--- a/db/add.sql
+++ b/db/add.sql
@@ -74,6 +74,7 @@ CREATE TABLE mortals_xhx_feedback(
     `processStatus` tinyint(2)    DEFAULT '0'  COMMENT '鐘舵€� (0.鏈紑濮�,1.杩涜涓�,2.宸茬粨鏉�)',
     `weblink` tinyint(2)    DEFAULT '0'  COMMENT '闂嵎鏄惁澶栭摼(0.鍚�,1.鏄�)',
     `webUrl` varchar(255)      COMMENT '闂澶栭摼鍦板潃',
+    `formContent` mediumtext      COMMENT '琛ㄥ崟鍐呭',
     `remark` varchar(255)      COMMENT '澶囨敞璇存槑',
     `createUserId` bigint(20)      COMMENT '鍒涘缓鐢ㄦ埛',
     `createTime` datetime      COMMENT '鍒涘缓鏃堕棿',
@@ -81,6 +82,7 @@ CREATE TABLE mortals_xhx_feedback(
     `updateTime` datetime      COMMENT '鏇存柊鏃堕棿',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='缁╂晥鍙嶉璁板綍淇℃伅';
+
 -- ----------------------------
 -- 缁╂晥鍙嶉闂琛�
 -- ----------------------------
diff --git a/db/module.sql b/db/module.sql
index bac005f2cd171cc378a93af3cd629d386da0dd2d..7baf53fc84177e509e1d9ce5aa898548a6f9f17f 100644
--- a/db/module.sql
+++ b/db/module.sql
@@ -1484,6 +1484,7 @@ CREATE TABLE mortals_xhx_perform_review_record(
     `updateTime` datetime      COMMENT '鏇存柊鏃堕棿',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='璇勪环宸瘎缁╂晥璁板綍淇℃伅';
+
 -- ----------------------------
 -- 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅琛�
 -- ----------------------------
@@ -1516,8 +1517,10 @@ CREATE TABLE mortals_xhx_check_attend_record(
     `createTime` datetime NOT NULL     COMMENT '鍒涘缓鏃堕棿',
     `updateUserId` bigint(20)      COMMENT '鏇存柊鐢ㄦ埛',
     `updateTime` datetime      COMMENT '鏇存柊鏃堕棿',
+    `subMethod` tinyint(1)    DEFAULT '1'  COMMENT '鎵e垎鏂瑰紡(1.绯荤粺鑷姩,2.浜哄伐娣诲姞,3.澶у巺宸℃煡)',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅';
+
 -- ----------------------------
 -- 鑰冨嫟缁╂晥璁板綍淇℃伅琛�
 -- ----------------------------
diff --git "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx"
index 3b20f1129ff2600cdfeacb2b0e36910eb47de4fc..4781482f4b386962beca4ee22951dc1bf4905f5a 100644
Binary files "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" and "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" differ