修改特殊配置字段实体类

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFixedworkSpecialEntity.java

@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceGroupFixedworkSpecialVo;
 /**
-* 考勤组考勤固定班制特殊日期配置实体对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤固定班制特殊日期配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */
 
 public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedworkSpecialVo {
     private static final long serialVersionUID = 1L;
@@ -42,17 +42,17 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw
      */
     private Date specialTime;
     /**
-    * 时间段时候开始时间
+     * 备注
      */
-    private Date specialTimeStart;
+    private String remark;
     /**
-    * 时间段结束时间
+     * 时间段时候开始时间
      */
-    private Date specialTimeEnd;
+    private Date specialStartTime;
     /**
-    * 备注
+     * 时间段结束时间
      */
-    private String remark;
+    private Date specialEndTime;
 
 
 
@@ -142,46 +142,46 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw
         this.specialTime = specialTime;
     }
     /**
-    * 获取 时间段时候开始时间
-    * @return Date
+     * 获取 备注
+     * @return String
      */
-    public Date getSpecialTimeStart(){
-        return specialTimeStart;
+    public String getRemark(){
+        return remark;
     }
     /**
-    * 设置 时间段时候开始时间
-    * @param specialTimeStart
+     * 设置 备注
+     * @param remark
      */
-    public void setSpecialTimeStart(Date specialTimeStart){
-        this.specialTimeStart = specialTimeStart;
+    public void setRemark(String remark){
+        this.remark = remark;
     }
     /**
-    * 获取 时间段结束时间
+     * 获取 时间段时候开始时间
      * @return Date
      */
-    public Date getSpecialTimeEnd(){
-        return specialTimeEnd;
+    public Date getSpecialStartTime(){
+        return specialStartTime;
     }
     /**
-    * 设置 时间段结束时间
-    * @param specialTimeEnd
+     * 设置 时间段时候开始时间
+     * @param specialStartTime
      */
-    public void setSpecialTimeEnd(Date specialTimeEnd){
-        this.specialTimeEnd = specialTimeEnd;
+    public void setSpecialStartTime(Date specialStartTime){
+        this.specialStartTime = specialStartTime;
     }
     /**
-    * 获取 备注
-    * @return String
+     * 获取 时间段结束时间
+     * @return Date
      */
-    public String getRemark(){
-        return remark;
+    public Date getSpecialEndTime(){
+        return specialEndTime;
     }
     /**
-    * 设置 备注
-    * @param remark
+     * 设置 时间段结束时间
+     * @param specialEndTime
      */
-    public void setRemark(String remark){
-        this.remark = remark;
+    public void setSpecialEndTime(Date specialEndTime){
+        this.specialEndTime = specialEndTime;
     }
 
 
@@ -211,9 +211,9 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw
         sb.append(",className:").append(getClassName());
         sb.append(",addWay:").append(getAddWay());
         sb.append(",specialTime:").append(getSpecialTime());
-        sb.append(",specialTimeStart:").append(getSpecialTimeStart());
-        sb.append(",specialTimeEnd:").append(getSpecialTimeEnd());
         sb.append(",remark:").append(getRemark());
+        sb.append(",specialStartTime:").append(getSpecialStartTime());
+        sb.append(",specialEndTime:").append(getSpecialEndTime());
         return sb.toString();
     }
 
@@ -231,10 +231,10 @@ public class AttendanceGroupFixedworkSpecialEntity extends AttendanceGroupFixedw
 
         this.specialTime = null;
 
-            this.specialTimeStart = null;
+        this.remark = "";
 
-            this.specialTimeEnd = null;
+        this.specialStartTime = null;
 
-            this.remark = "";
+        this.specialEndTime = null;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFixedworkSpecialQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.attendance.model.AttendanceGroupFixedworkSpecialEntity;
 /**
-* 考勤组考勤固定班制特殊日期配置查询对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤固定班制特殊日期配置查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */
 public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedworkSpecialEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -96,18 +96,6 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
     /** 结束 特殊时间 */
     private String specialTimeEnd;
 
-    /** 开始 时间段时候开始时间 */
-    private String specialTimeStartStart;
-
-    /** 结束 时间段时候开始时间 */
-    private String specialTimeStartEnd;
-
-    /** 开始 时间段结束时间 */
-    private String specialTimeEndStart;
-
-    /** 结束 时间段结束时间 */
-    private String specialTimeEndEnd;
-
     /** 备注 */
     private List<String> remarkList;
 
@@ -155,6 +143,18 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 时间段时候开始时间 */
+    private String specialStartTimeStart;
+
+    /** 结束 时间段时候开始时间 */
+    private String specialStartTimeEnd;
+
+    /** 开始 时间段结束时间 */
+    private String specialEndTimeStart;
+
+    /** 结束 时间段结束时间 */
+    private String specialEndTimeEnd;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<AttendanceGroupFixedworkSpecialQuery> orConditionList;
 
@@ -632,70 +632,6 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
         this.specialTimeEnd = specialTimeEnd;
     }
 
-    /**
-    * 获取 开始 时间段时候开始时间
-    * @return specialTimeStartStart
-    */
-    public String getSpecialTimeStartStart(){
-        return this.specialTimeStartStart;
-    }
-
-    /**
-    * 设置 开始 时间段时候开始时间
-    * @param specialTimeStartStart
-    */
-    public void setSpecialTimeStartStart(String specialTimeStartStart){
-        this.specialTimeStartStart = specialTimeStartStart;
-    }
-
-    /**
-    * 获取 结束 时间段时候开始时间
-    * @return specialTimeStartEnd
-    */
-    public String getSpecialTimeStartEnd(){
-        return this.specialTimeStartEnd;
-    }
-
-    /**
-    * 设置 结束 时间段时候开始时间
-    * @param specialTimeStartEnd
-    */
-    public void setSpecialTimeStartEnd(String specialTimeStartEnd){
-        this.specialTimeStartEnd = specialTimeStartEnd;
-    }
-
-    /**
-    * 获取 开始 时间段结束时间
-    * @return specialTimeEndStart
-    */
-    public String getSpecialTimeEndStart(){
-        return this.specialTimeEndStart;
-    }
-
-    /**
-    * 设置 开始 时间段结束时间
-    * @param specialTimeEndStart
-    */
-    public void setSpecialTimeEndStart(String specialTimeEndStart){
-        this.specialTimeEndStart = specialTimeEndStart;
-    }
-
-    /**
-    * 获取 结束 时间段结束时间
-    * @return specialTimeEndEnd
-    */
-    public String getSpecialTimeEndEnd(){
-        return this.specialTimeEndEnd;
-    }
-
-    /**
-    * 设置 结束 时间段结束时间
-    * @param specialTimeEndEnd
-    */
-    public void setSpecialTimeEndEnd(String specialTimeEndEnd){
-        this.specialTimeEndEnd = specialTimeEndEnd;
-    }
-
     /**
      * 获取 备注
      * @return remarkList
@@ -954,6 +890,70 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 时间段时候开始时间
+     * @return specialStartTimeStart
+     */
+    public String getSpecialStartTimeStart(){
+        return this.specialStartTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段时候开始时间
+     * @param specialStartTimeStart
+     */
+    public void setSpecialStartTimeStart(String specialStartTimeStart){
+        this.specialStartTimeStart = specialStartTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段时候开始时间
+     * @return specialStartTimeEnd
+     */
+    public String getSpecialStartTimeEnd(){
+        return this.specialStartTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段时候开始时间
+     * @param specialStartTimeEnd
+     */
+    public void setSpecialStartTimeEnd(String specialStartTimeEnd){
+        this.specialStartTimeEnd = specialStartTimeEnd;
+    }
+
+    /**
+     * 获取 开始 时间段结束时间
+     * @return specialEndTimeStart
+     */
+    public String getSpecialEndTimeStart(){
+        return this.specialEndTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段结束时间
+     * @param specialEndTimeStart
+     */
+    public void setSpecialEndTimeStart(String specialEndTimeStart){
+        this.specialEndTimeStart = specialEndTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段结束时间
+     * @return specialEndTimeEnd
+     */
+    public String getSpecialEndTimeEnd(){
+        return this.specialEndTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段结束时间
+     * @param specialEndTimeEnd
+     */
+    public void setSpecialEndTimeEnd(String specialEndTimeEnd){
+        this.specialEndTimeEnd = specialEndTimeEnd;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1245,8 +1245,6 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
 
 
 
-
-
     /**
      * 设置 备注
      * @param remark
@@ -1375,6 +1373,8 @@ public class AttendanceGroupFixedworkSpecialQuery extends AttendanceGroupFixedwo
     }
 
 
+
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFreeworkSpecialEntity.java

@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceGroupFreeworkSpecialVo;
 /**
-* 考勤组考勤自由工时特殊日期配置实体对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤自由工时特殊日期配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */
 
 public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreeworkSpecialVo {
     private static final long serialVersionUID = 1L;
@@ -42,17 +42,17 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
      */
     private Date specialTime;
     /**
-    * 时间段时候开始时间
+     * 备注
      */
-    private Date specialTimeStart;
+    private String remark;
     /**
-    * 时间段结束时间
+     * 时间段时候开始时间
      */
-    private Date specialTimeEnd;
+    private Date specialStartTime;
     /**
-    * 备注
+     * 时间段结束时间
      */
-    private String remark;
+    private Date specialEndTime;
 
 
 
@@ -142,46 +142,46 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
         this.specialTime = specialTime;
     }
     /**
-    * 获取 时间段时候开始时间
-    * @return Date
+     * 获取 备注
+     * @return String
      */
-    public Date getSpecialTimeStart(){
-        return specialTimeStart;
+    public String getRemark(){
+        return remark;
     }
     /**
-    * 设置 时间段时候开始时间
-    * @param specialTimeStart
+     * 设置 备注
+     * @param remark
      */
-    public void setSpecialTimeStart(Date specialTimeStart){
-        this.specialTimeStart = specialTimeStart;
+    public void setRemark(String remark){
+        this.remark = remark;
     }
     /**
-    * 获取 时间段结束时间
+     * 获取 时间段时候开始时间
      * @return Date
      */
-    public Date getSpecialTimeEnd(){
-        return specialTimeEnd;
+    public Date getSpecialStartTime(){
+        return specialStartTime;
     }
     /**
-    * 设置 时间段结束时间
-    * @param specialTimeEnd
+     * 设置 时间段时候开始时间
+     * @param specialStartTime
      */
-    public void setSpecialTimeEnd(Date specialTimeEnd){
-        this.specialTimeEnd = specialTimeEnd;
+    public void setSpecialStartTime(Date specialStartTime){
+        this.specialStartTime = specialStartTime;
     }
     /**
-    * 获取 备注
-    * @return String
+     * 获取 时间段结束时间
+     * @return Date
      */
-    public String getRemark(){
-        return remark;
+    public Date getSpecialEndTime(){
+        return specialEndTime;
     }
     /**
-    * 设置 备注
-    * @param remark
+     * 设置 时间段结束时间
+     * @param specialEndTime
      */
-    public void setRemark(String remark){
-        this.remark = remark;
+    public void setSpecialEndTime(Date specialEndTime){
+        this.specialEndTime = specialEndTime;
     }
 
 
@@ -211,9 +211,9 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
         sb.append(",className:").append(getClassName());
         sb.append(",addWay:").append(getAddWay());
         sb.append(",specialTime:").append(getSpecialTime());
-        sb.append(",specialTimeStart:").append(getSpecialTimeStart());
-        sb.append(",specialTimeEnd:").append(getSpecialTimeEnd());
         sb.append(",remark:").append(getRemark());
+        sb.append(",specialStartTime:").append(getSpecialStartTime());
+        sb.append(",specialEndTime:").append(getSpecialEndTime());
         return sb.toString();
     }
 
@@ -231,10 +231,10 @@ public class AttendanceGroupFreeworkSpecialEntity extends AttendanceGroupFreewor
 
         this.specialTime = null;
 
-            this.specialTimeStart = null;
+        this.remark = "";
 
-            this.specialTimeEnd = null;
+        this.specialStartTime = null;
 
-            this.remark = "";
+        this.specialEndTime = null;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceGroupFreeworkSpecialQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.attendance.model.AttendanceGroupFreeworkSpecialEntity;
 /**
-* 考勤组考勤自由工时特殊日期配置查询对象
-*
-* @author zxfei
-* @date 2023-04-08
-*/
+ * 考勤组考勤自由工时特殊日期配置查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-10
+ */
 public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreeworkSpecialEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -96,18 +96,6 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
     /** 结束 特殊时间 */
     private String specialTimeEnd;
 
-    /** 开始 时间段时候开始时间 */
-    private String specialTimeStartStart;
-
-    /** 结束 时间段时候开始时间 */
-    private String specialTimeStartEnd;
-
-    /** 开始 时间段结束时间 */
-    private String specialTimeEndStart;
-
-    /** 结束 时间段结束时间 */
-    private String specialTimeEndEnd;
-
     /** 备注 */
     private List<String> remarkList;
 
@@ -155,6 +143,18 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 时间段时候开始时间 */
+    private String specialStartTimeStart;
+
+    /** 结束 时间段时候开始时间 */
+    private String specialStartTimeEnd;
+
+    /** 开始 时间段结束时间 */
+    private String specialEndTimeStart;
+
+    /** 结束 时间段结束时间 */
+    private String specialEndTimeEnd;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<AttendanceGroupFreeworkSpecialQuery> orConditionList;
 
@@ -632,70 +632,6 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
         this.specialTimeEnd = specialTimeEnd;
     }
 
-    /**
-    * 获取 开始 时间段时候开始时间
-    * @return specialTimeStartStart
-    */
-    public String getSpecialTimeStartStart(){
-        return this.specialTimeStartStart;
-    }
-
-    /**
-    * 设置 开始 时间段时候开始时间
-    * @param specialTimeStartStart
-    */
-    public void setSpecialTimeStartStart(String specialTimeStartStart){
-        this.specialTimeStartStart = specialTimeStartStart;
-    }
-
-    /**
-    * 获取 结束 时间段时候开始时间
-    * @return specialTimeStartEnd
-    */
-    public String getSpecialTimeStartEnd(){
-        return this.specialTimeStartEnd;
-    }
-
-    /**
-    * 设置 结束 时间段时候开始时间
-    * @param specialTimeStartEnd
-    */
-    public void setSpecialTimeStartEnd(String specialTimeStartEnd){
-        this.specialTimeStartEnd = specialTimeStartEnd;
-    }
-
-    /**
-    * 获取 开始 时间段结束时间
-    * @return specialTimeEndStart
-    */
-    public String getSpecialTimeEndStart(){
-        return this.specialTimeEndStart;
-    }
-
-    /**
-    * 设置 开始 时间段结束时间
-    * @param specialTimeEndStart
-    */
-    public void setSpecialTimeEndStart(String specialTimeEndStart){
-        this.specialTimeEndStart = specialTimeEndStart;
-    }
-
-    /**
-    * 获取 结束 时间段结束时间
-    * @return specialTimeEndEnd
-    */
-    public String getSpecialTimeEndEnd(){
-        return this.specialTimeEndEnd;
-    }
-
-    /**
-    * 设置 结束 时间段结束时间
-    * @param specialTimeEndEnd
-    */
-    public void setSpecialTimeEndEnd(String specialTimeEndEnd){
-        this.specialTimeEndEnd = specialTimeEndEnd;
-    }
-
     /**
      * 获取 备注
      * @return remarkList
@@ -954,6 +890,70 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 时间段时候开始时间
+     * @return specialStartTimeStart
+     */
+    public String getSpecialStartTimeStart(){
+        return this.specialStartTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段时候开始时间
+     * @param specialStartTimeStart
+     */
+    public void setSpecialStartTimeStart(String specialStartTimeStart){
+        this.specialStartTimeStart = specialStartTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段时候开始时间
+     * @return specialStartTimeEnd
+     */
+    public String getSpecialStartTimeEnd(){
+        return this.specialStartTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段时候开始时间
+     * @param specialStartTimeEnd
+     */
+    public void setSpecialStartTimeEnd(String specialStartTimeEnd){
+        this.specialStartTimeEnd = specialStartTimeEnd;
+    }
+
+    /**
+     * 获取 开始 时间段结束时间
+     * @return specialEndTimeStart
+     */
+    public String getSpecialEndTimeStart(){
+        return this.specialEndTimeStart;
+    }
+
+    /**
+     * 设置 开始 时间段结束时间
+     * @param specialEndTimeStart
+     */
+    public void setSpecialEndTimeStart(String specialEndTimeStart){
+        this.specialEndTimeStart = specialEndTimeStart;
+    }
+
+    /**
+     * 获取 结束 时间段结束时间
+     * @return specialEndTimeEnd
+     */
+    public String getSpecialEndTimeEnd(){
+        return this.specialEndTimeEnd;
+    }
+
+    /**
+     * 设置 结束 时间段结束时间
+     * @param specialEndTimeEnd
+     */
+    public void setSpecialEndTimeEnd(String specialEndTimeEnd){
+        this.specialEndTimeEnd = specialEndTimeEnd;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1245,8 +1245,6 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
 
 
 
-
-
     /**
      * 设置 备注
      * @param remark
@@ -1375,6 +1373,8 @@ public class AttendanceGroupFreeworkSpecialQuery extends AttendanceGroupFreework
     }
 
 
+
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceClassServiceImpl.java

@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceClassService
 * 考勤班次信息 service实现

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupFixedworkServiceImpl.java

@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceGroupFixedworkSpecial
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceGroupFixedworkService
 * 考勤组考勤固定工时 service实现

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupFreeworkServiceImpl.java

@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceGroupFreeworkSpecialS
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceGroupFreeworkService
 * 考勤组考勤自由工时配置 service实现

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceGroupServiceImpl.java

@@ -13,6 +13,8 @@ import com.mortals.xhx.module.attendance.service.AttendanceGroupStaffService;
 import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
+import java.util.List;
+
 /**
 * AttendanceGroupService
 * 考勤组信息 service实现

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFixedworkMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceGroupFixedworkDaoImpl">
 
     <!-- 字段和属性映射 -->

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFixedworkSpecialMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceGroupFixedworkSpecialDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -12,13 +12,13 @@
         <result property="className" column="className" />
         <result property="addWay" column="addWay" />
         <result property="specialTime" column="specialTime" />
-            <result property="specialTimeStart" column="specialTimeStart" />
-            <result property="specialTimeEnd" column="specialTimeEnd" />
         <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="specialStartTime" column="specialStartTime" />
+        <result property="specialEndTime" column="specialEndTime" />
 
     </resultMap>
 
@@ -47,12 +47,6 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialTime') or colPickMode == 1 and data.containsKey('specialTime')))">
                 a.specialTime,
             </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialTimeStart') or colPickMode == 1 and data.containsKey('specialTimeStart')))">
-                    a.specialTimeStart,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialTimeEnd') or colPickMode == 1 and data.containsKey('specialTimeEnd')))">
-                    a.specialTimeEnd,
-                </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>
@@ -68,23 +62,29 @@
             <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('specialStartTime') or colPickMode == 1 and data.containsKey('specialStartTime')))">
+                a.specialStartTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialEndTime') or colPickMode == 1 and data.containsKey('specialEndTime')))">
+                a.specialEndTime,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AttendanceGroupFixedworkSpecialEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_attendance_group_fixedwork_special
-        (fixedWorkId,must,classId,className,addWay,specialTime,specialTimeStart,specialTimeEnd,remark,createUserId,createTime,updateUserId,updateTime)
+        (fixedWorkId,must,classId,className,addWay,specialTime,remark,createUserId,createTime,updateUserId,updateTime,specialStartTime,specialEndTime)
         VALUES
-        (#{fixedWorkId},#{must},#{classId},#{className},#{addWay},#{specialTime},#{specialTimeStart},#{specialTimeEnd},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{fixedWorkId},#{must},#{classId},#{className},#{addWay},#{specialTime},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{specialStartTime},#{specialEndTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_attendance_group_fixedwork_special
-        (fixedWorkId,must,classId,className,addWay,specialTime,specialTimeStart,specialTimeEnd,remark,createUserId,createTime,updateUserId,updateTime)
+        (fixedWorkId,must,classId,className,addWay,specialTime,remark,createUserId,createTime,updateUserId,updateTime,specialStartTime,specialEndTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.fixedWorkId},#{item.must},#{item.classId},#{item.className},#{item.addWay},#{item.specialTime},#{item.specialTimeStart},#{item.specialTimeEnd},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.fixedWorkId},#{item.must},#{item.classId},#{item.className},#{item.addWay},#{item.specialTime},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.specialStartTime},#{item.specialEndTime})
         </foreach>
     </insert>
 
@@ -124,12 +124,6 @@
             <if test="(colPickMode==0 and data.containsKey('specialTime')) or (colPickMode==1 and !data.containsKey('specialTime'))">
                 a.specialTime=#{data.specialTime},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('specialTimeStart')) or (colPickMode==1 and !data.containsKey('specialTimeStart'))">
-                a.specialTimeStart=#{data.specialTimeStart},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('specialTimeEnd')) or (colPickMode==1 and !data.containsKey('specialTimeEnd'))">
-                a.specialTimeEnd=#{data.specialTimeEnd},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
                 a.remark=#{data.remark},
             </if>
@@ -151,6 +145,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('specialStartTime')) or (colPickMode==1 and !data.containsKey('specialStartTime'))">
+                a.specialStartTime=#{data.specialStartTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('specialEndTime')) or (colPickMode==1 and !data.containsKey('specialEndTime'))">
+                a.specialEndTime=#{data.specialEndTime},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -225,20 +225,6 @@
                     </if>
                 </foreach>
             </trim>
-                <trim prefix="specialTimeStart=(case" suffix="ELSE specialTimeStart end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('specialTimeStart')) or (colPickMode==1 and !item.containsKey('specialTimeStart'))">
-                            when a.id=#{item.id} then #{item.specialTimeStart}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="specialTimeEnd=(case" suffix="ELSE specialTimeEnd end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('specialTimeEnd')) or (colPickMode==1 and !item.containsKey('specialTimeEnd'))">
-                            when a.id=#{item.id} then #{item.specialTimeEnd}
-                        </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'))">
@@ -284,6 +270,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="specialStartTime=(case" suffix="ELSE specialStartTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('specialStartTime')) or (colPickMode==1 and !item.containsKey('specialStartTime'))">
+                        when a.id=#{item.id} then #{item.specialStartTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="specialEndTime=(case" suffix="ELSE specialEndTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('specialEndTime')) or (colPickMode==1 and !item.containsKey('specialEndTime'))">
+                        when a.id=#{item.id} then #{item.specialEndTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -572,36 +572,6 @@
             ${_conditionType_} a.specialTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
 
-            <if test="conditionParamRef.containsKey('specialTimeStart')">
-                <if test="conditionParamRef.specialTimeStart != null ">
-                    ${_conditionType_} a.specialTimeStart = #{${_conditionParam_}.specialTimeStart}
-                </if>
-                <if test="conditionParamRef.specialTimeStart == null">
-                    ${_conditionType_} a.specialTimeStart is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeStartStart') and conditionParamRef.specialTimeStartStart != null and conditionParamRef.specialTimeStartStart!=''">
-                ${_conditionType_} a.specialTimeStart <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeStartStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeStartEnd') and conditionParamRef.specialTimeStartEnd != null and conditionParamRef.specialTimeStartEnd!=''">
-                ${_conditionType_} a.specialTimeStart <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeStartEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-
-            <if test="conditionParamRef.containsKey('specialTimeEnd')">
-                <if test="conditionParamRef.specialTimeEnd != null ">
-                    ${_conditionType_} a.specialTimeEnd = #{${_conditionParam_}.specialTimeEnd}
-                </if>
-                <if test="conditionParamRef.specialTimeEnd == null">
-                    ${_conditionType_} a.specialTimeEnd is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeEndStart') and conditionParamRef.specialTimeEndStart != null and conditionParamRef.specialTimeEndStart!=''">
-                ${_conditionType_} a.specialTimeEnd <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeEndStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeEndEnd') and conditionParamRef.specialTimeEndEnd != null and conditionParamRef.specialTimeEndEnd!=''">
-                ${_conditionType_} a.specialTimeEnd <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeEndEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-
         <if test="conditionParamRef.containsKey('remark')">
             <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
                 ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
@@ -706,6 +676,36 @@
         <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('specialStartTime')">
+            <if test="conditionParamRef.specialStartTime != null ">
+                ${_conditionType_} a.specialStartTime = #{${_conditionParam_}.specialStartTime}
+            </if>
+            <if test="conditionParamRef.specialStartTime == null">
+                ${_conditionType_} a.specialStartTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('specialStartTimeStart') and conditionParamRef.specialStartTimeStart != null and conditionParamRef.specialStartTimeStart!=''">
+            ${_conditionType_} a.specialStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('specialStartTimeEnd') and conditionParamRef.specialStartTimeEnd != null and conditionParamRef.specialStartTimeEnd!=''">
+            ${_conditionType_} a.specialStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+
+        <if test="conditionParamRef.containsKey('specialEndTime')">
+            <if test="conditionParamRef.specialEndTime != null ">
+                ${_conditionType_} a.specialEndTime = #{${_conditionParam_}.specialEndTime}
+            </if>
+            <if test="conditionParamRef.specialEndTime == null">
+                ${_conditionType_} a.specialEndTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('specialEndTimeStart') and conditionParamRef.specialEndTimeStart != null and conditionParamRef.specialEndTimeStart!=''">
+            ${_conditionType_} a.specialEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('specialEndTimeEnd') and conditionParamRef.specialEndTimeEnd != null and conditionParamRef.specialEndTimeEnd!=''">
+            ${_conditionType_} a.specialEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -754,16 +754,6 @@
                     <if test='orderCol.specialTime != null and "DESC".equalsIgnoreCase(orderCol.specialTime)'>DESC</if>
                     ,
                 </if>
-                    <if test="orderCol.containsKey('specialTimeStart')">
-                        a.specialTimeStart
-                        <if test='orderCol.specialTimeStart != null and "DESC".equalsIgnoreCase(orderCol.specialTimeStart)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('specialTimeEnd')">
-                        a.specialTimeEnd
-                        <if test='orderCol.specialTimeEnd != null and "DESC".equalsIgnoreCase(orderCol.specialTimeEnd)'>DESC</if>
-                        ,
-                    </if>
                 <if test="orderCol.containsKey('remark')">
                     a.remark
                     <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
@@ -789,6 +779,16 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('specialStartTime')">
+                    a.specialStartTime
+                    <if test='orderCol.specialStartTime != null and "DESC".equalsIgnoreCase(orderCol.specialStartTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('specialEndTime')">
+                    a.specialEndTime
+                    <if test='orderCol.specialEndTime != null and "DESC".equalsIgnoreCase(orderCol.specialEndTime)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFreeworkMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceGroupFreeworkDaoImpl">
 
     <!-- 字段和属性映射 -->

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceGroupFreeworkSpecialMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceGroupFreeworkSpecialDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -12,13 +12,13 @@
         <result property="className" column="className" />
         <result property="addWay" column="addWay" />
         <result property="specialTime" column="specialTime" />
-            <result property="specialTimeStart" column="specialTimeStart" />
-            <result property="specialTimeEnd" column="specialTimeEnd" />
         <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="specialStartTime" column="specialStartTime" />
+        <result property="specialEndTime" column="specialEndTime" />
 
     </resultMap>
 
@@ -47,12 +47,6 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialTime') or colPickMode == 1 and data.containsKey('specialTime')))">
                 a.specialTime,
             </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialTimeStart') or colPickMode == 1 and data.containsKey('specialTimeStart')))">
-                    a.specialTimeStart,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialTimeEnd') or colPickMode == 1 and data.containsKey('specialTimeEnd')))">
-                    a.specialTimeEnd,
-                </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>
@@ -68,23 +62,29 @@
             <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('specialStartTime') or colPickMode == 1 and data.containsKey('specialStartTime')))">
+                a.specialStartTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('specialEndTime') or colPickMode == 1 and data.containsKey('specialEndTime')))">
+                a.specialEndTime,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AttendanceGroupFreeworkSpecialEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_attendance_group_freework_special
-        (freeWorkId,must,classId,className,addWay,specialTime,specialTimeStart,specialTimeEnd,remark,createUserId,createTime,updateUserId,updateTime)
+        (freeWorkId,must,classId,className,addWay,specialTime,remark,createUserId,createTime,updateUserId,updateTime,specialStartTime,specialEndTime)
         VALUES
-        (#{freeWorkId},#{must},#{classId},#{className},#{addWay},#{specialTime},#{specialTimeStart},#{specialTimeEnd},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{freeWorkId},#{must},#{classId},#{className},#{addWay},#{specialTime},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{specialStartTime},#{specialEndTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_attendance_group_freework_special
-        (freeWorkId,must,classId,className,addWay,specialTime,specialTimeStart,specialTimeEnd,remark,createUserId,createTime,updateUserId,updateTime)
+        (freeWorkId,must,classId,className,addWay,specialTime,remark,createUserId,createTime,updateUserId,updateTime,specialStartTime,specialEndTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.freeWorkId},#{item.must},#{item.classId},#{item.className},#{item.addWay},#{item.specialTime},#{item.specialTimeStart},#{item.specialTimeEnd},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.freeWorkId},#{item.must},#{item.classId},#{item.className},#{item.addWay},#{item.specialTime},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.specialStartTime},#{item.specialEndTime})
         </foreach>
     </insert>
 
@@ -124,12 +124,6 @@
             <if test="(colPickMode==0 and data.containsKey('specialTime')) or (colPickMode==1 and !data.containsKey('specialTime'))">
                 a.specialTime=#{data.specialTime},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('specialTimeStart')) or (colPickMode==1 and !data.containsKey('specialTimeStart'))">
-                a.specialTimeStart=#{data.specialTimeStart},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('specialTimeEnd')) or (colPickMode==1 and !data.containsKey('specialTimeEnd'))">
-                a.specialTimeEnd=#{data.specialTimeEnd},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
                 a.remark=#{data.remark},
             </if>
@@ -151,6 +145,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('specialStartTime')) or (colPickMode==1 and !data.containsKey('specialStartTime'))">
+                a.specialStartTime=#{data.specialStartTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('specialEndTime')) or (colPickMode==1 and !data.containsKey('specialEndTime'))">
+                a.specialEndTime=#{data.specialEndTime},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -225,20 +225,6 @@
                     </if>
                 </foreach>
             </trim>
-                <trim prefix="specialTimeStart=(case" suffix="ELSE specialTimeStart end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('specialTimeStart')) or (colPickMode==1 and !item.containsKey('specialTimeStart'))">
-                            when a.id=#{item.id} then #{item.specialTimeStart}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="specialTimeEnd=(case" suffix="ELSE specialTimeEnd end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('specialTimeEnd')) or (colPickMode==1 and !item.containsKey('specialTimeEnd'))">
-                            when a.id=#{item.id} then #{item.specialTimeEnd}
-                        </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'))">
@@ -284,6 +270,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="specialStartTime=(case" suffix="ELSE specialStartTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('specialStartTime')) or (colPickMode==1 and !item.containsKey('specialStartTime'))">
+                        when a.id=#{item.id} then #{item.specialStartTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="specialEndTime=(case" suffix="ELSE specialEndTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('specialEndTime')) or (colPickMode==1 and !item.containsKey('specialEndTime'))">
+                        when a.id=#{item.id} then #{item.specialEndTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -572,36 +572,6 @@
             ${_conditionType_} a.specialTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
 
-            <if test="conditionParamRef.containsKey('specialTimeStart')">
-                <if test="conditionParamRef.specialTimeStart != null ">
-                    ${_conditionType_} a.specialTimeStart = #{${_conditionParam_}.specialTimeStart}
-                </if>
-                <if test="conditionParamRef.specialTimeStart == null">
-                    ${_conditionType_} a.specialTimeStart is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeStartStart') and conditionParamRef.specialTimeStartStart != null and conditionParamRef.specialTimeStartStart!=''">
-                ${_conditionType_} a.specialTimeStart <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeStartStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeStartEnd') and conditionParamRef.specialTimeStartEnd != null and conditionParamRef.specialTimeStartEnd!=''">
-                ${_conditionType_} a.specialTimeStart <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeStartEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-
-            <if test="conditionParamRef.containsKey('specialTimeEnd')">
-                <if test="conditionParamRef.specialTimeEnd != null ">
-                    ${_conditionType_} a.specialTimeEnd = #{${_conditionParam_}.specialTimeEnd}
-                </if>
-                <if test="conditionParamRef.specialTimeEnd == null">
-                    ${_conditionType_} a.specialTimeEnd is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeEndStart') and conditionParamRef.specialTimeEndStart != null and conditionParamRef.specialTimeEndStart!=''">
-                ${_conditionType_} a.specialTimeEnd <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeEndStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('specialTimeEndEnd') and conditionParamRef.specialTimeEndEnd != null and conditionParamRef.specialTimeEndEnd!=''">
-                ${_conditionType_} a.specialTimeEnd <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialTimeEndEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-
         <if test="conditionParamRef.containsKey('remark')">
             <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
                 ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
@@ -706,6 +676,36 @@
         <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('specialStartTime')">
+            <if test="conditionParamRef.specialStartTime != null ">
+                ${_conditionType_} a.specialStartTime = #{${_conditionParam_}.specialStartTime}
+            </if>
+            <if test="conditionParamRef.specialStartTime == null">
+                ${_conditionType_} a.specialStartTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('specialStartTimeStart') and conditionParamRef.specialStartTimeStart != null and conditionParamRef.specialStartTimeStart!=''">
+            ${_conditionType_} a.specialStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('specialStartTimeEnd') and conditionParamRef.specialStartTimeEnd != null and conditionParamRef.specialStartTimeEnd!=''">
+            ${_conditionType_} a.specialStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+
+        <if test="conditionParamRef.containsKey('specialEndTime')">
+            <if test="conditionParamRef.specialEndTime != null ">
+                ${_conditionType_} a.specialEndTime = #{${_conditionParam_}.specialEndTime}
+            </if>
+            <if test="conditionParamRef.specialEndTime == null">
+                ${_conditionType_} a.specialEndTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('specialEndTimeStart') and conditionParamRef.specialEndTimeStart != null and conditionParamRef.specialEndTimeStart!=''">
+            ${_conditionType_} a.specialEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('specialEndTimeEnd') and conditionParamRef.specialEndTimeEnd != null and conditionParamRef.specialEndTimeEnd!=''">
+            ${_conditionType_} a.specialEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.specialEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -754,16 +754,6 @@
                     <if test='orderCol.specialTime != null and "DESC".equalsIgnoreCase(orderCol.specialTime)'>DESC</if>
                     ,
                 </if>
-                    <if test="orderCol.containsKey('specialTimeStart')">
-                        a.specialTimeStart
-                        <if test='orderCol.specialTimeStart != null and "DESC".equalsIgnoreCase(orderCol.specialTimeStart)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('specialTimeEnd')">
-                        a.specialTimeEnd
-                        <if test='orderCol.specialTimeEnd != null and "DESC".equalsIgnoreCase(orderCol.specialTimeEnd)'>DESC</if>
-                        ,
-                    </if>
                 <if test="orderCol.containsKey('remark')">
                     a.remark
                     <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
@@ -789,6 +779,16 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('specialStartTime')">
+                    a.specialStartTime
+                    <if test='orderCol.specialStartTime != null and "DESC".equalsIgnoreCase(orderCol.specialStartTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('specialEndTime')">
+                    a.specialEndTime
+                    <if test='orderCol.specialEndTime != null and "DESC".equalsIgnoreCase(orderCol.specialEndTime)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

db/module.sql

@@ -571,16 +571,19 @@ CREATE TABLE mortals_xhx_attendance_group_freework_special(
     `className` varchar(128)      COMMENT '班次名称',
     `addWay` tinyint(1)    DEFAULT '0'  COMMENT '无需打卡的日期类型(0.单个日期,1.时间段)',
     `specialTime` datetime NOT NULL     COMMENT '特殊时间',
-    `specialTimeStart` datetime NOT NULL     COMMENT '时间段时候开始时间',
-    `specialTimeEnd` datetime NOT NULL     COMMENT '时间段结束时间',
+    `specialStartTime` datetime NOT NULL     COMMENT '时间段时候开始时间',
+    `specialEndTime` datetime NOT NULL     COMMENT '时间段结束时间',
     `remark` varchar(255)      COMMENT '备注',
     `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
     `createTime` datetime NOT NULL     COMMENT '创建时间',
     `updateUserId` bigint(20)      COMMENT '更新用户',
     `updateTime` datetime      COMMENT '更新时间',
+
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤组考勤自由工时特殊日期配置';
 
+
+
 -- ----------------------------
 -- 考勤组考勤自由工时配置表
 -- ----------------------------
@@ -618,8 +621,8 @@ CREATE TABLE mortals_xhx_attendance_group_fixedwork_special(
     `className` varchar(128)      COMMENT '班次名称',
     `addWay` tinyint(1)    DEFAULT '0'  COMMENT '无需打卡的日期类型(0.单个日期,1.时间段)',
     `specialTime` datetime NOT NULL     COMMENT '特殊时间',
-    `specialTimeStart` datetime NOT NULL     COMMENT '时间段时候开始时间',
-    `specialTimeEnd` datetime NOT NULL     COMMENT '时间段结束时间',
+    `specialStartTime` datetime NOT NULL     COMMENT '时间段时候开始时间',
+    `specialEndTime` datetime NOT NULL     COMMENT '时间段结束时间',
     `remark` varchar(255)      COMMENT '备注',
     `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
     `createTime` datetime NOT NULL     COMMENT '创建时间',
@@ -628,6 +631,8 @@ CREATE TABLE mortals_xhx_attendance_group_fixedwork_special(
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤组考勤固定班制特殊日期配置';
 
+
+
 -- ----------------------------
 -- 考勤组考勤固定工时表
 -- ----------------------------

doc/api.md

@@ -8576,13 +8576,13 @@ data|object|数据对象
   className|String|班次名称
   addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
   specialTime|Date|特殊时间
-  specialTimeStart|Date|时间段时候开始时间
-  specialTimeEnd|Date|时间段结束时间
   remark|String|备注
   createUserId|Long|创建用户
   createTime|Date|创建时间
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
+  specialStartTime|Date|时间段时候开始时间
+  specialEndTime|Date|时间段结束时间
 dict|object|字典对象
  must|object|字典属性对象，详见附录
  addWay|object|字典属性对象，详见附录
@@ -8630,13 +8630,13 @@ data|object|数据对象
  className|String|班次名称
  addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
  specialTime|Date|特殊时间
- specialTimeStart|Date|时间段时候开始时间
- specialTimeEnd|Date|时间段结束时间
  remark|String|备注
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
+ specialStartTime|Date|时间段时候开始时间
+ specialEndTime|Date|时间段结束时间
 dict|object|字典对象
  must|object|字典属性对象，详见附录
  addWay|object|字典属性对象，详见附录
@@ -8646,20 +8646,20 @@ dict|object|字典对象
 {
     "code": 1,
     "data": {
-            "id":5248,
-            "freeWorkId":9666,
-            "must":3613,
-            "classId":2609,
-            "className":"ngw8u1",
-            "addWay":6162,
-            "specialTime":"2023-04-08",
-            "specialTimeStart":"2023-04-08",
-            "specialTimeEnd":"2023-04-08",
-            "remark":"jz8f50",
-            "createUserId":5403,
-            "createTime":"2023-04-08",
-            "updateUserId":5469,
-            "updateTime":"2023-04-08"
+            "id":5076,
+            "freeWorkId":7022,
+            "must":2824,
+            "classId":1549,
+            "className":"nddun6",
+            "addWay":9326,
+            "specialTime":"2023-04-10",
+            "remark":"gfccxk",
+            "createUserId":1207,
+            "createTime":"2023-04-10",
+            "updateUserId":480,
+            "updateTime":"2023-04-10",
+            "specialStartTime":"2023-04-10",
+            "specialEndTime":"2023-04-10"
         }
 }
 ```
@@ -8684,22 +8684,22 @@ classId|Long|否|班次ID
 className|String|否|班次名称
 addWay|Integer|否|无需打卡的日期类型(0.单个日期,1.时间段)
 specialTime|Date|是|特殊时间
-specialTimeStart|Date|是|时间段时候开始时间
-specialTimeEnd|Date|是|时间段结束时间
 remark|String|否|备注
+specialStartTime|Date|是|时间段时候开始时间
+specialEndTime|Date|是|时间段结束时间
 
 **请求样例:**
 ```
 {
-    "freeWorkId":1675,
-    "must":5147,
-    "classId":7952,
-    "className":"e0jfo6",
-    "addWay":2694,
-    "specialTime":"2023-04-08",
-    "specialTimeStart":"2023-04-08",
-    "specialTimeEnd":"2023-04-08",
-    "remark":"9tfxpf",
+    "freeWorkId":6139,
+    "must":8249,
+    "classId":2953,
+    "className":"oh2and",
+    "addWay":82,
+    "specialTime":"2023-04-10",
+    "remark":"ypalu8",
+    "specialStartTime":"2023-04-10",
+    "specialEndTime":"2023-04-10"
 }
 
 ```
@@ -8719,13 +8719,13 @@ data|object|数据对象
   className|String|班次名称
   addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
   specialTime|Date|特殊时间
-  specialTimeStart|Date|时间段时候开始时间
-  specialTimeEnd|Date|时间段结束时间
   remark|String|备注
   createUserId|Long|创建用户
   createTime|Date|创建时间
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
+  specialStartTime|Date|时间段时候开始时间
+  specialEndTime|Date|时间段结束时间
 
 **响应消息样例:**
 ```
@@ -9092,13 +9092,13 @@ data|object|数据对象
   className|String|班次名称
   addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
   specialTime|Date|特殊时间
-  specialTimeStart|Date|时间段时候开始时间
-  specialTimeEnd|Date|时间段结束时间
   remark|String|备注
   createUserId|Long|创建用户
   createTime|Date|创建时间
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
+  specialStartTime|Date|时间段时候开始时间
+  specialEndTime|Date|时间段结束时间
 dict|object|字典对象
  must|object|字典属性对象，详见附录
  addWay|object|字典属性对象，详见附录
@@ -9146,13 +9146,13 @@ data|object|数据对象
  className|String|班次名称
  addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
  specialTime|Date|特殊时间
- specialTimeStart|Date|时间段时候开始时间
- specialTimeEnd|Date|时间段结束时间
  remark|String|备注
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
+ specialStartTime|Date|时间段时候开始时间
+ specialEndTime|Date|时间段结束时间
 dict|object|字典对象
  must|object|字典属性对象，详见附录
  addWay|object|字典属性对象，详见附录
@@ -9162,20 +9162,20 @@ dict|object|字典对象
 {
     "code": 1,
     "data": {
-            "id":8015,
-            "fixedWorkId":2972,
-            "must":3802,
-            "classId":5674,
-            "className":"53zlul",
-            "addWay":4124,
-            "specialTime":"2023-04-08",
-            "specialTimeStart":"2023-04-08",
-            "specialTimeEnd":"2023-04-08",
-            "remark":"0rfxq5",
-            "createUserId":8082,
-            "createTime":"2023-04-08",
-            "updateUserId":2828,
-            "updateTime":"2023-04-08"
+            "id":7924,
+            "fixedWorkId":1115,
+            "must":8070,
+            "classId":8139,
+            "className":"3c4hgu",
+            "addWay":1203,
+            "specialTime":"2023-04-10",
+            "remark":"w614hb",
+            "createUserId":4288,
+            "createTime":"2023-04-10",
+            "updateUserId":6736,
+            "updateTime":"2023-04-10",
+            "specialStartTime":"2023-04-10",
+            "specialEndTime":"2023-04-10"
         }
 }
 ```
@@ -9200,22 +9200,22 @@ classId|Long|否|班次ID
 className|String|否|班次名称
 addWay|Integer|否|无需打卡的日期类型(0.单个日期,1.时间段)
 specialTime|Date|是|特殊时间
-specialTimeStart|Date|是|时间段时候开始时间
-specialTimeEnd|Date|是|时间段结束时间
 remark|String|否|备注
+specialStartTime|Date|是|时间段时候开始时间
+specialEndTime|Date|是|时间段结束时间
 
 **请求样例:**
 ```
 {
-    "fixedWorkId":8982,
-    "must":7809,
-    "classId":1902,
-    "className":"72xrq3",
-    "addWay":6684,
-    "specialTime":"2023-04-08",
-    "specialTimeStart":"2023-04-08",
-    "specialTimeEnd":"2023-04-08",
-    "remark":"th3m5f",
+    "fixedWorkId":9498,
+    "must":2219,
+    "classId":5994,
+    "className":"0a7u6p",
+    "addWay":3443,
+    "specialTime":"2023-04-10",
+    "remark":"takndm",
+    "specialStartTime":"2023-04-10",
+    "specialEndTime":"2023-04-10"
 }
 
 ```
@@ -9235,13 +9235,13 @@ data|object|数据对象
   className|String|班次名称
   addWay|Integer|无需打卡的日期类型(0.单个日期,1.时间段)
   specialTime|Date|特殊时间
-  specialTimeStart|Date|时间段时候开始时间
-  specialTimeEnd|Date|时间段结束时间
   remark|String|备注
   createUserId|Long|创建用户
   createTime|Date|创建时间
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
+  specialStartTime|Date|时间段时候开始时间
+  specialEndTime|Date|时间段结束时间
 
 **响应消息样例:**
 ```