邛崃绩效需求

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/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

@@ -1387,4 +1387,5 @@ 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_window_workman_perform` ADD COLUMN `season` int(4) DEFAULT NULL COMMENT '考核季度',ADD COLUMN `timeType` tinyint(2)    DEFAULT '0'  COMMENT '时间类型(0,按月,1按季度,2按年)';
\ No newline at end of file
+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按年)';