Commit 4f83af74 authored by 赵啸非's avatar 赵啸非

修改固定班次考勤

parent 2d246048
...@@ -244,6 +244,11 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo { ...@@ -244,6 +244,11 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
* 扣分时间 * 扣分时间
*/ */
private Date deductTime; private Date deductTime;
/**
* 窗口编号
*/
private String windowNum;
/** /**
* 绩效记录申诉附件信息信息 * 绩效记录申诉附件信息信息
*/ */
......
...@@ -9,7 +9,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity; ...@@ -9,7 +9,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
* 绩效记录申诉信息查询对象 * 绩效记录申诉信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-15 * @date 2023-07-31
*/ */
public class PerformAttendAppealQuery extends PerformAttendAppealEntity { public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -480,6 +480,11 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity { ...@@ -480,6 +480,11 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
/** 结束 扣分时间 */ /** 结束 扣分时间 */
private String deductTimeEnd; 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) */ /** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PerformAttendAppealQuery> orConditionList; private List<PerformAttendAppealQuery> orConditionList;
...@@ -3145,6 +3150,38 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity { ...@@ -3145,6 +3150,38 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity {
this.deductTimeEnd = deductTimeEnd; 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 * @param id
...@@ -4589,6 +4626,25 @@ public class PerformAttendAppealQuery extends PerformAttendAppealEntity { ...@@ -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) * 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
...@@ -32,4 +32,6 @@ public class PerformAttendAppealVo extends BaseEntityLong { ...@@ -32,4 +32,6 @@ public class PerformAttendAppealVo extends BaseEntityLong {
/** 结束 创建时间 */ /** 结束 创建时间 */
private String createTimeEnd; private String createTimeEnd;
private String windowNum;
} }
\ No newline at end of file
...@@ -816,3 +816,8 @@ ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `auditStatus` tinyint( ...@@ -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_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_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_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 '窗口编号';
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment