邛崃绩效需求

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

@@ -99,6 +99,14 @@ public class CheckWindowWorkmanPerformEntity extends CheckWindowWorkmanPerformVo
      * 处理状态(1.未处理,2.已处理)
      */
     private Integer checkStatus;
+    /**
+     * 考核季度
+     */
+    private Integer season;
+    /**
+     * 时间类型(0,按月,1按季度,2按年)
+     */
+    private Integer timeType;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -135,5 +143,7 @@ public class CheckWindowWorkmanPerformEntity extends CheckWindowWorkmanPerformVo
         this.manageCheckResult = "";
         this.remark = "";
         this.checkStatus = 1;
+        this.season = null;
+        this.timeType = 0;
     }
 }
\ No newline at end of file

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

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
  * 窗口人员考核汇总核查查询对象
  *
  * @author zxfei
- * @date 2024-01-17
+ * @date 2025-04-09
  */
 public class CheckWindowWorkmanPerformQuery extends CheckWindowWorkmanPerformEntity {
     /** 开始 序号，主键，自增长 */
@@ -244,6 +244,36 @@ public class CheckWindowWorkmanPerformQuery extends CheckWindowWorkmanPerformEnt
     /** 处理状态(1.未处理,2.已处理)排除列表 */
     private List <Integer> checkStatusNotList;
 
+    /** 开始 考核季度 */
+    private Integer seasonStart;
+
+    /** 结束 考核季度 */
+    private Integer seasonEnd;
+
+    /** 增加 考核季度 */
+    private Integer seasonIncrement;
+
+    /** 考核季度列表 */
+    private List <Integer> seasonList;
+
+    /** 考核季度排除列表 */
+    private List <Integer> seasonNotList;
+
+    /** 开始 时间类型(0,按月,1按季度,2按年) */
+    private Integer timeTypeStart;
+
+    /** 结束 时间类型(0,按月,1按季度,2按年) */
+    private Integer timeTypeEnd;
+
+    /** 增加 时间类型(0,按月,1按季度,2按年) */
+    private Integer timeTypeIncrement;
+
+    /** 时间类型(0,按月,1按季度,2按年)列表 */
+    private List <Integer> timeTypeList;
+
+    /** 时间类型(0,按月,1按季度,2按年)排除列表 */
+    private List <Integer> timeTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckWindowWorkmanPerformQuery> orConditionList;
 
@@ -1559,6 +1589,168 @@ public class CheckWindowWorkmanPerformQuery extends CheckWindowWorkmanPerformEnt
     }
 
 
+    /**
+     * 获取 开始 考核季度
+     * @return seasonStart
+     */
+    public Integer getSeasonStart(){
+        return this.seasonStart;
+    }
+
+    /**
+     * 设置 开始 考核季度
+     * @param seasonStart
+     */
+    public void setSeasonStart(Integer seasonStart){
+        this.seasonStart = seasonStart;
+    }
+
+    /**
+     * 获取 结束 考核季度
+     * @return $seasonEnd
+     */
+    public Integer getSeasonEnd(){
+        return this.seasonEnd;
+    }
+
+    /**
+     * 设置 结束 考核季度
+     * @param seasonEnd
+     */
+    public void setSeasonEnd(Integer seasonEnd){
+        this.seasonEnd = seasonEnd;
+    }
+
+    /**
+     * 获取 增加 考核季度
+     * @return seasonIncrement
+     */
+    public Integer getSeasonIncrement(){
+        return this.seasonIncrement;
+    }
+
+    /**
+     * 设置 增加 考核季度
+     * @param seasonIncrement
+     */
+    public void setSeasonIncrement(Integer seasonIncrement){
+        this.seasonIncrement = seasonIncrement;
+    }
+
+    /**
+     * 获取 考核季度
+     * @return seasonList
+     */
+    public List<Integer> getSeasonList(){
+        return this.seasonList;
+    }
+
+    /**
+     * 设置 考核季度
+     * @param seasonList
+     */
+    public void setSeasonList(List<Integer> seasonList){
+        this.seasonList = seasonList;
+    }
+
+    /**
+     * 获取 考核季度
+     * @return seasonNotList
+     */
+    public List<Integer> getSeasonNotList(){
+        return this.seasonNotList;
+    }
+
+    /**
+     * 设置 考核季度
+     * @param seasonNotList
+     */
+    public void setSeasonNotList(List<Integer> seasonNotList){
+        this.seasonNotList = seasonNotList;
+    }
+
+
+    /**
+     * 获取 开始 时间类型(0,按月,1按季度,2按年)
+     * @return timeTypeStart
+     */
+    public Integer getTimeTypeStart(){
+        return this.timeTypeStart;
+    }
+
+    /**
+     * 设置 开始 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeStart
+     */
+    public void setTimeTypeStart(Integer timeTypeStart){
+        this.timeTypeStart = timeTypeStart;
+    }
+
+    /**
+     * 获取 结束 时间类型(0,按月,1按季度,2按年)
+     * @return $timeTypeEnd
+     */
+    public Integer getTimeTypeEnd(){
+        return this.timeTypeEnd;
+    }
+
+    /**
+     * 设置 结束 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeEnd
+     */
+    public void setTimeTypeEnd(Integer timeTypeEnd){
+        this.timeTypeEnd = timeTypeEnd;
+    }
+
+    /**
+     * 获取 增加 时间类型(0,按月,1按季度,2按年)
+     * @return timeTypeIncrement
+     */
+    public Integer getTimeTypeIncrement(){
+        return this.timeTypeIncrement;
+    }
+
+    /**
+     * 设置 增加 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeIncrement
+     */
+    public void setTimeTypeIncrement(Integer timeTypeIncrement){
+        this.timeTypeIncrement = timeTypeIncrement;
+    }
+
+    /**
+     * 获取 时间类型(0,按月,1按季度,2按年)
+     * @return timeTypeList
+     */
+    public List<Integer> getTimeTypeList(){
+        return this.timeTypeList;
+    }
+
+    /**
+     * 设置 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeList
+     */
+    public void setTimeTypeList(List<Integer> timeTypeList){
+        this.timeTypeList = timeTypeList;
+    }
+
+    /**
+     * 获取 时间类型(0,按月,1按季度,2按年)
+     * @return timeTypeNotList
+     */
+    public List<Integer> getTimeTypeNotList(){
+        return this.timeTypeNotList;
+    }
+
+    /**
+     * 设置 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeNotList
+     */
+    public void setTimeTypeNotList(List<Integer> timeTypeNotList){
+        this.timeTypeNotList = timeTypeNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2328,6 +2520,114 @@ public class CheckWindowWorkmanPerformQuery extends CheckWindowWorkmanPerformEnt
         return this;
     }
 
+    /**
+     * 设置  考核季度
+     * @param season
+     */
+    public CheckWindowWorkmanPerformQuery season(Integer season){
+        setSeason(season);
+        return this;
+    }
+
+    /**
+     * 设置 开始 考核季度
+     * @param seasonStart
+     */
+    public CheckWindowWorkmanPerformQuery seasonStart(Integer seasonStart){
+        this.seasonStart = seasonStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 考核季度
+     * @param seasonEnd
+     */
+    public CheckWindowWorkmanPerformQuery seasonEnd(Integer seasonEnd){
+        this.seasonEnd = seasonEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 考核季度
+     * @param seasonIncrement
+     */
+    public CheckWindowWorkmanPerformQuery seasonIncrement(Integer seasonIncrement){
+        this.seasonIncrement = seasonIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 考核季度
+     * @param seasonList
+     */
+    public CheckWindowWorkmanPerformQuery seasonList(List<Integer> seasonList){
+        this.seasonList = seasonList;
+        return this;
+    }
+
+    /**
+     * 设置 考核季度
+     * @param seasonNotList
+     */
+    public CheckWindowWorkmanPerformQuery seasonNotList(List<Integer> seasonNotList){
+        this.seasonNotList = seasonNotList;
+        return this;
+    }
+
+    /**
+     * 设置  时间类型(0,按月,1按季度,2按年)
+     * @param timeType
+     */
+    public CheckWindowWorkmanPerformQuery timeType(Integer timeType){
+        setTimeType(timeType);
+        return this;
+    }
+
+    /**
+     * 设置 开始 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeStart
+     */
+    public CheckWindowWorkmanPerformQuery timeTypeStart(Integer timeTypeStart){
+        this.timeTypeStart = timeTypeStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeEnd
+     */
+    public CheckWindowWorkmanPerformQuery timeTypeEnd(Integer timeTypeEnd){
+        this.timeTypeEnd = timeTypeEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeIncrement
+     */
+    public CheckWindowWorkmanPerformQuery timeTypeIncrement(Integer timeTypeIncrement){
+        this.timeTypeIncrement = timeTypeIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeList
+     */
+    public CheckWindowWorkmanPerformQuery timeTypeList(List<Integer> timeTypeList){
+        this.timeTypeList = timeTypeList;
+        return this;
+    }
+
+    /**
+     * 设置 时间类型(0,按月,1按季度,2按年)
+     * @param timeTypeNotList
+     */
+    public CheckWindowWorkmanPerformQuery timeTypeNotList(List<Integer> timeTypeNotList){
+        this.timeTypeNotList = timeTypeNotList;
+        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/resources/sqlmap/module/check/CheckWindowWorkmanPerformMapper.xml

@@ -29,10 +29,10 @@
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="checkStatus" column="checkStatus" />
-
+        <result property="season" column="season" />
+        <result property="timeType" column="timeType" />
     </resultMap>
 
-
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
@@ -108,23 +108,29 @@
             <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('season') or colPickMode == 1 and data.containsKey('season')))">
+                a.season,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('timeType') or colPickMode == 1 and data.containsKey('timeType')))">
+                a.timeType,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckWindowWorkmanPerformEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_window_workman_perform
-        (recordId,year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,fromName,submitDate,manageCheckPerson,manageCheckTime,manageCheckDesc,manageCheckResult,remark,createUserId,createTime,updateUserId,updateTime,checkStatus)
+        (recordId,year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,fromName,submitDate,manageCheckPerson,manageCheckTime,manageCheckDesc,manageCheckResult,remark,createUserId,createTime,updateUserId,updateTime,checkStatus,season,timeType)
         VALUES
-        (#{recordId},#{year},#{month},#{windowId},#{windowName},#{ownerId},#{ownerName},#{deptId},#{deptName},#{salaId},#{salaName},#{fromName},#{submitDate},#{manageCheckPerson},#{manageCheckTime},#{manageCheckDesc},#{manageCheckResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{checkStatus})
+        (#{recordId},#{year},#{month},#{windowId},#{windowName},#{ownerId},#{ownerName},#{deptId},#{deptName},#{salaId},#{salaName},#{fromName},#{submitDate},#{manageCheckPerson},#{manageCheckTime},#{manageCheckDesc},#{manageCheckResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{checkStatus},#{season},#{timeType})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_window_workman_perform
-        (recordId,year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,fromName,submitDate,manageCheckPerson,manageCheckTime,manageCheckDesc,manageCheckResult,remark,createUserId,createTime,updateUserId,updateTime,checkStatus)
+        (recordId,year,month,windowId,windowName,ownerId,ownerName,deptId,deptName,salaId,salaName,fromName,submitDate,manageCheckPerson,manageCheckTime,manageCheckDesc,manageCheckResult,remark,createUserId,createTime,updateUserId,updateTime,checkStatus,season,timeType)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.year},#{item.month},#{item.windowId},#{item.windowName},#{item.ownerId},#{item.ownerName},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.fromName},#{item.submitDate},#{item.manageCheckPerson},#{item.manageCheckTime},#{item.manageCheckDesc},#{item.manageCheckResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.checkStatus})
+            (#{item.recordId},#{item.year},#{item.month},#{item.windowId},#{item.windowName},#{item.ownerId},#{item.ownerName},#{item.deptId},#{item.deptName},#{item.salaId},#{item.salaName},#{item.fromName},#{item.submitDate},#{item.manageCheckPerson},#{item.manageCheckTime},#{item.manageCheckDesc},#{item.manageCheckResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.checkStatus},#{item.season},#{item.timeType})
         </foreach>
     </insert>
 
@@ -233,6 +239,18 @@
             <if test="(colPickMode==0 and data.containsKey('checkStatusIncrement')) or (colPickMode==1 and !data.containsKey('checkStatusIncrement'))">
                 a.checkStatus=ifnull(a.checkStatus,0) + #{data.checkStatusIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('season')) or (colPickMode==1 and !data.containsKey('season'))">
+                a.season=#{data.season},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('seasonIncrement')) or (colPickMode==1 and !data.containsKey('seasonIncrement'))">
+                a.season=ifnull(a.season,0) + #{data.seasonIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('timeType')) or (colPickMode==1 and !data.containsKey('timeType'))">
+                a.timeType=#{data.timeType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('timeTypeIncrement')) or (colPickMode==1 and !data.containsKey('timeTypeIncrement'))">
+                a.timeType=ifnull(a.timeType,0) + #{data.timeTypeIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -456,6 +474,30 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="season=(case" suffix="ELSE season end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('season')) or (colPickMode==1 and !item.containsKey('season'))">
+                            when a.id=#{item.id} then #{item.season}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('seasonIncrement')) or (colPickMode==1 and !item.containsKey('seasonIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.season,0) + #{item.seasonIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="timeType=(case" suffix="ELSE timeType end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('timeType')) or (colPickMode==1 and !item.containsKey('timeType'))">
+                            when a.id=#{item.id} then #{item.timeType}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('timeTypeIncrement')) or (colPickMode==1 and !item.containsKey('timeTypeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.timeType,0) + #{item.timeTypeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -470,7 +512,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_check_window_workman_perform as a where a.id=#{condition.id}
+        delete from mortals_xhx_check_window_workman_perform as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -567,6 +609,10 @@
     <!-- 条件映射-代参数 -->
     <sql id="_condition_param_">
         <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
         <if test="conditionParamRef.containsKey('id')">
             <if test="conditionParamRef.id != null">
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
@@ -1118,6 +1164,60 @@
             ${_conditionType_} a.checkStatus <![CDATA[ <= ]]> #{${_conditionParam_}.checkStatusEnd}
         </if>
 
+        <if test="conditionParamRef.containsKey('season')">
+            <if test="conditionParamRef.season != null ">
+                ${_conditionType_} a.season = #{${_conditionParam_}.season}
+            </if>
+            <if test="conditionParamRef.season == null">
+                ${_conditionType_} a.season is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('seasonList') and conditionParamRef.seasonList.size() > 0">
+            ${_conditionType_} a.season in
+            <foreach collection="conditionParamRef.seasonList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('seasonNotList') and conditionParamRef.seasonNotList.size() > 0">
+            ${_conditionType_} a.season not in
+            <foreach collection="conditionParamRef.seasonNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('seasonStart') and conditionParamRef.seasonStart != null">
+            ${_conditionType_} a.season <![CDATA[ >= ]]> #{${_conditionParam_}.seasonStart}
+        </if>
+        <if test="conditionParamRef.containsKey('seasonEnd') and conditionParamRef.seasonEnd != null">
+            ${_conditionType_} a.season <![CDATA[ <= ]]> #{${_conditionParam_}.seasonEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('timeType')">
+            <if test="conditionParamRef.timeType != null ">
+                ${_conditionType_} a.timeType = #{${_conditionParam_}.timeType}
+            </if>
+            <if test="conditionParamRef.timeType == null">
+                ${_conditionType_} a.timeType is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('timeTypeList') and conditionParamRef.timeTypeList.size() > 0">
+            ${_conditionType_} a.timeType in
+            <foreach collection="conditionParamRef.timeTypeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('timeTypeNotList') and conditionParamRef.timeTypeNotList.size() > 0">
+            ${_conditionType_} a.timeType not in
+            <foreach collection="conditionParamRef.timeTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('timeTypeStart') and conditionParamRef.timeTypeStart != null">
+            ${_conditionType_} a.timeType <![CDATA[ >= ]]> #{${_conditionParam_}.timeTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('timeTypeEnd') and conditionParamRef.timeTypeEnd != null">
+            ${_conditionType_} a.timeType <![CDATA[ <= ]]> #{${_conditionParam_}.timeTypeEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1199,6 +1299,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('seasonList') and conditionParamRef.seasonList.size() > 0">
+                field(a.season,
+                <foreach collection="conditionParamRef.seasonList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('timeTypeList') and conditionParamRef.timeTypeList.size() > 0">
+                field(a.timeType,
+                <foreach collection="conditionParamRef.timeTypeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                     a.${item.colName} ${item.sortKind}
@@ -1284,6 +1398,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('seasonList') and conditionParamRef.seasonList.size() > 0">
+                field(a.season,
+                <foreach collection="conditionParamRef.seasonList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('timeTypeList') and conditionParamRef.timeTypeList.size() > 0">
+                field(a.timeType,
+                <foreach collection="conditionParamRef.timeTypeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -1405,6 +1533,16 @@
                     <if test='orderCol.checkStatus != null and "DESC".equalsIgnoreCase(orderCol.checkStatus)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('season')">
+                    a.season
+                    <if test='orderCol.season != null and "DESC".equalsIgnoreCase(orderCol.season)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('timeType')">
+                    a.timeType
+                    <if test='orderCol.timeType != null and "DESC".equalsIgnoreCase(orderCol.timeType)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
 

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

@@ -17,6 +17,7 @@
         AND s.id = d.staffId
         AND p.checkStatus = 2
         AND p.manageCheckResult = 1
+        AND p.timeType = 0
         <if test="recordId != null and recordId!=''"> AND p.recordId = #{recordId} </if>
         <if test="year != null and year!=''"> AND p.`year` = #{year} </if>
         <if test="month != null and month!=''"> AND p.`month` = #{month} </if>

db/add.sql

@@ -1388,3 +1388,4 @@ ALTER TABLE mortals_xhx_staff ADD COLUMN  `dingUserId` varchar(128)  COMMENT '
 -- 2025-04-08    邛崃需求
 -- ----------------------------
 ALTER TABLE `mortals_xhx_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2)    DEFAULT '0'  COMMENT '时间类型(0,按月,1按季度,2按年)';
+ALTER TABLE `mortals_xhx_check_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2)    DEFAULT '0'  COMMENT '时间类型(0,按月,1按季度,2按年)';