修改固定班次考勤

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

@@ -244,6 +244,11 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
      * 扣分时间
      */
     private Date deductTime;
+
+    /**
+     * 窗口编号
+     */
+    private String windowNum;
     /**
      * 绩效记录申诉附件信息信息
      */

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

@@ -9,7 +9,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
  * 绩效记录申诉信息查询对象
  *
  * @author zxfei
- * @date 2023-07-15
+ * @date 2023-07-31
  */
 public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
     /** 开始 序号，主键，自增长 */
@@ -480,6 +480,11 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
     /** 结束 扣分时间 */
     private String deductTimeEnd;
 
+    /** 窗口编号 */
+    private List<String> windowNumList;
+
+    /** 窗口编号排除列表 */
+    private List <String> windowNumNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformAttendAppealQuery> orConditionList;
 
@@ -3145,6 +3150,38 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
         this.deductTimeEnd = deductTimeEnd;
     }
 
+    /**
+     * 获取 窗口编号
+     * @return windowNumList
+     */
+    public List<String> getWindowNumList(){
+        return this.windowNumList;
+    }
+
+    /**
+     * 设置 窗口编号
+     * @param windowNumList
+     */
+    public void setWindowNumList(List<String> windowNumList){
+        this.windowNumList = windowNumList;
+    }
+
+    /**
+     * 获取 窗口编号
+     * @return windowNumNotList
+     */
+    public List<String> getWindowNumNotList(){
+        return this.windowNumNotList;
+    }
+
+    /**
+     * 设置 窗口编号
+     * @param windowNumNotList
+     */
+    public void setWindowNumNotList(List<String> windowNumNotList){
+        this.windowNumNotList = windowNumNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -4589,6 +4626,25 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
     }
 
 
+
+    /**
+     * 设置 窗口编号
+     * @param windowNum
+     */
+    public PerformAttendAppealQuery windowNum(String windowNum){
+        setWindowNum(windowNum);
+        return this;
+    }
+
+    /**
+     * 设置 窗口编号
+     * @param windowNumList
+     */
+    public PerformAttendAppealQuery windowNumList(List<String> windowNumList){
+        this.windowNumList = windowNumList;
+        return this;
+    }
+
     /**
      * 获取 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/perform/model/vo/PerformAttendAppealVo.java

@@ -32,4 +32,6 @@ public class PerformAttendAppealVo extends BaseEntityLong {
     /** 结束 创建时间 */
     private String createTimeEnd;
 
+    private String windowNum;
+
 }
\ No newline at end of file

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

@@ -62,6 +62,7 @@
         <result property="performType" column="performType" />
         <result property="deductPerson" column="deductPerson" />
         <result property="deductTime" column="deductTime" />
+        <result property="windowNum" column="windowNum" />
         <collection property="performAttendAppealFilesList" column="id" ofType="PerformAttendAppealFilesEntity" javaType="ArrayList" select="getPerformAttendAppealFilesByAppealId"></collection>
     </resultMap>
     <resultMap type="PerformAttendAppealFilesEntity" id="PerformAttendAppealFilesEntity-Map">
@@ -250,6 +251,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deductTime') or colPickMode == 1 and data.containsKey('deductTime')))">
                 a.deductTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowNum') or colPickMode == 1 and data.containsKey('windowNum')))">
+                a.windowNum,
+            </if>
         </trim>
     </sql>
     <!-- 子表所有列 -->
@@ -261,18 +265,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformAttendAppealEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_attend_appeal
-        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subMethod,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,createUserId,createTime,updateUserId,updateTime,violationType,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,deductPerson,deductTime)
+        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subMethod,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,createUserId,createTime,updateUserId,updateTime,violationType,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,deductPerson,deductTime,windowNum)
         VALUES
-        (#{checkRecordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subMethod},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{processStatus},#{appealDesc},#{appealTime},#{appealResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{violationType},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{irregularOtherType},#{performType},#{deductPerson},#{deductTime})
+        (#{checkRecordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subMethod},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{processStatus},#{appealDesc},#{appealTime},#{appealResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{violationType},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{irregularOtherType},#{performType},#{deductPerson},#{deductTime},#{windowNum})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_attend_appeal
-        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subMethod,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,createUserId,createTime,updateUserId,updateTime,violationType,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,deductPerson,deductTime)
+        (checkRecordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subMethod,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,processStatus,appealDesc,appealTime,appealResult,remark,createUserId,createTime,updateUserId,updateTime,violationType,reviewResult,reviewTime,reviewSource,reviewDevice,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,goworkCode,goworkDepts,matterlName,goworkTime,irregularType,happenTime,duration,alarmTime,snapPath,irregularOtherType,performType,deductPerson,deductTime,windowNum)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.checkRecordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.processStatus},#{item.appealDesc},#{item.appealTime},#{item.appealResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.violationType},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.irregularOtherType},#{item.performType},#{item.deductPerson},#{item.deductTime})
+            (#{item.checkRecordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.processStatus},#{item.appealDesc},#{item.appealTime},#{item.appealResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.violationType},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.irregularOtherType},#{item.performType},#{item.deductPerson},#{item.deductTime},#{item.windowNum})
         </foreach>
     </insert>
 
@@ -498,6 +502,9 @@
             <if test="(colPickMode==0 and data.containsKey('deductTime')) or (colPickMode==1 and !data.containsKey('deductTime'))">
                 a.deductTime=#{data.deductTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('windowNum')) or (colPickMode==1 and !data.containsKey('windowNum'))">
+                a.windowNum=#{data.windowNum},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -982,6 +989,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="windowNum=(case" suffix="ELSE windowNum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('windowNum')) or (colPickMode==1 and !item.containsKey('windowNum'))">
+                        when a.id=#{item.id} then #{item.windowNum}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -2327,6 +2341,27 @@
         <if test="conditionParamRef.containsKey('deductTimeEnd') and conditionParamRef.deductTimeEnd != null and conditionParamRef.deductTimeEnd!=''">
             ${_conditionType_} a.deductTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.deductTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+
+        <if test="conditionParamRef.containsKey('windowNum')">
+            <if test="conditionParamRef.windowNum != null and conditionParamRef.windowNum != ''">
+                ${_conditionType_} a.windowNum like #{${_conditionParam_}.windowNum}
+            </if>
+            <if test="conditionParamRef.windowNum == null">
+                ${_conditionType_} a.windowNum is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('windowNumList') and conditionParamRef.windowNumList.size() > 0">
+            ${_conditionType_} a.windowNum in
+            <foreach collection="conditionParamRef.windowNumList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('windowNumNotList') and conditionParamRef.windowNumNotList.size() > 0">
+            ${_conditionType_} a.windowNum not in
+            <foreach collection="conditionParamRef.windowNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -2625,6 +2660,11 @@
                     <if test='orderCol.deductTime != null and "DESC".equalsIgnoreCase(orderCol.deductTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('windowNum')">
+                    a.windowNum
+                    <if test='orderCol.windowNum != null and "DESC".equalsIgnoreCase(orderCol.windowNum)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

db/add.sql

@@ -816,3 +816,8 @@ ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN  `auditStatus` tinyint(
 ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN  `auditStatus` tinyint(1)    DEFAULT '1'  COMMENT '审核状态(1.同意,2.不同意)';
 ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN  `auditStatus` tinyint(1)    DEFAULT '1'  COMMENT '审核状态(1.同意,2.不同意)';
 ALTER TABLE mortals_xhx_check_other_record ADD COLUMN  `auditStatus` tinyint(1)    DEFAULT '1'  COMMENT '审核状态(1.同意,2.不同意)';
+
+
+
+
+ALTER TABLE mortals_xhx_perform_attend_appeal ADD COLUMN  `windowNum` varchar(255)  DEFAULT ''    COMMENT '窗口编号';