Skip to content

A
attendance-performance-platform
Commit 56b22778 authored by daijunxiong's avatar daijunxiong
Browse files
Options

新增考勤假期字段

parent 415c5c9c
Show whitespace changes
Inline Side-by-side
Showing with 12457 additions and 8833 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
View file @ 56b22778
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceLeaveRecordVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceLeaveRecordVo;
import java.util.Date;
/** /**
* 请假记录信息实体对象 * 请假记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-14
*/ */
public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -39,7 +36,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -39,7 +36,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
*/ */
private String phoneNumber; private String phoneNumber;
/** /**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
*/ */
private Integer leaveType; private Integer leaveType;
/** /**
...@@ -153,14 +150,14 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -153,14 +150,14 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
this.phoneNumber = phoneNumber; this.phoneNumber = phoneNumber;
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return Integer * @return Integer
*/ */
public Integer getLeaveType(){ public Integer getLeaveType(){
return leaveType; return leaveType;
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveType * @param leaveType
*/ */
public void setLeaveType(Integer leaveType){ public void setLeaveType(Integer leaveType){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordQuery.java
View file @ 56b22778
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
/** /**
* 请假记录信息查询对象 * 请假记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-14
*/ */
public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -70,19 +68,19 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -70,19 +68,19 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 电话号码排除列表 */ /** 电话号码排除列表 */
private List <String> phoneNumberNotList; private List <String> phoneNumberNotList;
/** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer leaveTypeStart; private Integer leaveTypeStart;
/** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer leaveTypeEnd; private Integer leaveTypeEnd;
/** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer leaveTypeIncrement; private Integer leaveTypeIncrement;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)列表 */
private List <Integer> leaveTypeList; private List <Integer> leaveTypeList;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)排除列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)排除列表 */
private List <Integer> leaveTypeNotList; private List <Integer> leaveTypeNotList;
/** 开始 开始时间 */ /** 开始 开始时间 */
...@@ -542,7 +540,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -542,7 +540,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeStart * @return leaveTypeStart
*/ */
public Integer getLeaveTypeStart(){ public Integer getLeaveTypeStart(){
...@@ -550,7 +548,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -550,7 +548,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeStart * @param leaveTypeStart
*/ */
public void setLeaveTypeStart(Integer leaveTypeStart){ public void setLeaveTypeStart(Integer leaveTypeStart){
...@@ -558,7 +556,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -558,7 +556,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return $leaveTypeEnd * @return $leaveTypeEnd
*/ */
public Integer getLeaveTypeEnd(){ public Integer getLeaveTypeEnd(){
...@@ -566,7 +564,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -566,7 +564,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeEnd * @param leaveTypeEnd
*/ */
public void setLeaveTypeEnd(Integer leaveTypeEnd){ public void setLeaveTypeEnd(Integer leaveTypeEnd){
...@@ -574,7 +572,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -574,7 +572,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeIncrement * @return leaveTypeIncrement
*/ */
public Integer getLeaveTypeIncrement(){ public Integer getLeaveTypeIncrement(){
...@@ -582,7 +580,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -582,7 +580,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeIncrement * @param leaveTypeIncrement
*/ */
public void setLeaveTypeIncrement(Integer leaveTypeIncrement){ public void setLeaveTypeIncrement(Integer leaveTypeIncrement){
...@@ -590,7 +588,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -590,7 +588,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeList * @return leaveTypeList
*/ */
public List<Integer> getLeaveTypeList(){ public List<Integer> getLeaveTypeList(){
...@@ -598,7 +596,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -598,7 +596,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeList * @param leaveTypeList
*/ */
public void setLeaveTypeList(List<Integer> leaveTypeList){ public void setLeaveTypeList(List<Integer> leaveTypeList){
...@@ -606,7 +604,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -606,7 +604,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return leaveTypeNotList * @return leaveTypeNotList
*/ */
public List<Integer> getLeaveTypeNotList(){ public List<Integer> getLeaveTypeNotList(){
...@@ -614,7 +612,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -614,7 +612,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeNotList * @param leaveTypeNotList
*/ */
public void setLeaveTypeNotList(List<Integer> leaveTypeNotList){ public void setLeaveTypeNotList(List<Integer> leaveTypeNotList){
...@@ -1454,7 +1452,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1454,7 +1452,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveType * @param leaveType
*/ */
public AttendanceLeaveRecordQuery leaveType(Integer leaveType){ public AttendanceLeaveRecordQuery leaveType(Integer leaveType){
...@@ -1463,7 +1461,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1463,7 +1461,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeStart * @param leaveTypeStart
*/ */
public AttendanceLeaveRecordQuery leaveTypeStart(Integer leaveTypeStart){ public AttendanceLeaveRecordQuery leaveTypeStart(Integer leaveTypeStart){
...@@ -1472,7 +1470,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1472,7 +1470,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeEnd * @param leaveTypeEnd
*/ */
public AttendanceLeaveRecordQuery leaveTypeEnd(Integer leaveTypeEnd){ public AttendanceLeaveRecordQuery leaveTypeEnd(Integer leaveTypeEnd){
...@@ -1481,7 +1479,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1481,7 +1479,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeIncrement * @param leaveTypeIncrement
*/ */
public AttendanceLeaveRecordQuery leaveTypeIncrement(Integer leaveTypeIncrement){ public AttendanceLeaveRecordQuery leaveTypeIncrement(Integer leaveTypeIncrement){
...@@ -1490,7 +1488,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1490,7 +1488,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeList * @param leaveTypeList
*/ */
public AttendanceLeaveRecordQuery leaveTypeList(List<Integer> leaveTypeList){ public AttendanceLeaveRecordQuery leaveTypeList(List<Integer> leaveTypeList){
...@@ -1499,7 +1497,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1499,7 +1497,7 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param leaveTypeNotList * @param leaveTypeNotList
*/ */
public AttendanceLeaveRecordQuery leaveTypeNotList(List<Integer> leaveTypeNotList){ public AttendanceLeaveRecordQuery leaveTypeNotList(List<Integer> leaveTypeNotList){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java
View file @ 56b22778
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceStatVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceStatVo;
import java.math.BigDecimal;
/** /**
* 考勤汇总信息实体对象 * 考勤汇总信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-14
*/ */
public class AttendanceStatEntity extends AttendanceStatVo { public class AttendanceStatEntity extends AttendanceStatVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -99,7 +96,7 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -99,7 +96,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
@Excel(name = "育儿假") @Excel(name = "育儿假")
private BigDecimal childRearingLeave; private BigDecimal childRearingLeave;
/** /**
* 产假（陪护假/天） * 产假（天））
*/ */
@Excel(name = "产假") @Excel(name = "产假")
private BigDecimal maternityLeave; private BigDecimal maternityLeave;
...@@ -189,6 +186,31 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -189,6 +186,31 @@ public class AttendanceStatEntity extends AttendanceStatVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 哺乳假（天）
*/
@Excel(name = "哺乳假")
private BigDecimal breastfeedingLeaveDays;
/**
* 例假（天）
*/
@Excel(name = "例假")
private BigDecimal menstrualLeaveDays;
/**
* 年假（天）
*/
@Excel(name = "年假")
private BigDecimal annualLeaveDays;
/**
* 调休（天）
*/
@Excel(name = "调休")
private BigDecimal compensatedLeaveDays;
/**
* 陪产假（天）
*/
@Excel(name = "陪产假")
private BigDecimal paternityLeaveDays;
...@@ -432,14 +454,14 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -432,14 +454,14 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.childRearingLeave = childRearingLeave; this.childRearingLeave = childRearingLeave;
} }
/** /**
* 获取 产假（陪护假/天） * 获取 产假（天））
* @return BigDecimal * @return BigDecimal
*/ */
public BigDecimal getMaternityLeave(){ public BigDecimal getMaternityLeave(){
return maternityLeave; return maternityLeave;
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeave * @param maternityLeave
*/ */
public void setMaternityLeave(BigDecimal maternityLeave){ public void setMaternityLeave(BigDecimal maternityLeave){
...@@ -697,6 +719,76 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -697,6 +719,76 @@ public class AttendanceStatEntity extends AttendanceStatVo {
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
/**
* 获取 哺乳假（天）
* @return BigDecimal
*/
public BigDecimal getBreastfeedingLeaveDays(){
return breastfeedingLeaveDays;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDays
*/
public void setBreastfeedingLeaveDays(BigDecimal breastfeedingLeaveDays){
this.breastfeedingLeaveDays = breastfeedingLeaveDays;
}
/**
* 获取 例假（天）
* @return BigDecimal
*/
public BigDecimal getMenstrualLeaveDays(){
return menstrualLeaveDays;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDays
*/
public void setMenstrualLeaveDays(BigDecimal menstrualLeaveDays){
this.menstrualLeaveDays = menstrualLeaveDays;
}
/**
* 获取 年假（天）
* @return BigDecimal
*/
public BigDecimal getAnnualLeaveDays(){
return annualLeaveDays;
}
/**
* 设置 年假（天）
* @param annualLeaveDays
*/
public void setAnnualLeaveDays(BigDecimal annualLeaveDays){
this.annualLeaveDays = annualLeaveDays;
}
/**
* 获取 调休（天）
* @return BigDecimal
*/
public BigDecimal getCompensatedLeaveDays(){
return compensatedLeaveDays;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDays
*/
public void setCompensatedLeaveDays(BigDecimal compensatedLeaveDays){
this.compensatedLeaveDays = compensatedLeaveDays;
}
/**
* 获取 陪产假（天）
* @return BigDecimal
*/
public BigDecimal getPaternityLeaveDays(){
return paternityLeaveDays;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDays
*/
public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){
this.paternityLeaveDays = paternityLeaveDays;
}
...@@ -755,6 +847,11 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -755,6 +847,11 @@ public class AttendanceStatEntity extends AttendanceStatVo {
sb.append(",month:").append(getMonth()); sb.append(",month:").append(getMonth());
sb.append(",day:").append(getDay()); sb.append(",day:").append(getDay());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays());
sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays());
sb.append(",annualLeaveDays:").append(getAnnualLeaveDays());
sb.append(",compensatedLeaveDays:").append(getCompensatedLeaveDays());
sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays());
return sb.toString(); return sb.toString();
} }
...@@ -831,5 +928,15 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -831,5 +928,15 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.day = null; this.day = null;
this.remark = ""; this.remark = "";
this.breastfeedingLeaveDays = BigDecimal.valueOf(0.0);
this.menstrualLeaveDays = BigDecimal.valueOf(0.0);
this.annualLeaveDays = BigDecimal.valueOf(0.0);
this.compensatedLeaveDays = BigDecimal.valueOf(0.0);
this.paternityLeaveDays = BigDecimal.valueOf(0.0);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatQuery.java
View file @ 56b22778
...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model; ...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
/** /**
* 考勤汇总信息查询对象 * 考勤汇总信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-14
*/ */
public class AttendanceStatQuery extends AttendanceStatEntity { public class AttendanceStatQuery extends AttendanceStatEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -250,19 +249,19 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -250,19 +249,19 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
/** 育儿假（天）排除列表 */ /** 育儿假（天）排除列表 */
private List <BigDecimal> childRearingLeaveNotList; private List <BigDecimal> childRearingLeaveNotList;
/** 开始 产假（陪护假/天） */ /** 开始 产假（天）） */
private BigDecimal maternityLeaveStart; private BigDecimal maternityLeaveStart;
/** 结束 产假（陪护假/天） */ /** 结束 产假（天）） */
private BigDecimal maternityLeaveEnd; private BigDecimal maternityLeaveEnd;
/** 增加 产假（陪护假/天） */ /** 增加 产假（天）） */
private BigDecimal maternityLeaveIncrement; private BigDecimal maternityLeaveIncrement;
/** 产假（陪护假/天）列表 */ /** 产假（天））列表 */
private List <BigDecimal> maternityLeaveList; private List <BigDecimal> maternityLeaveList;
/** 产假（陪护假/天）排除列表 */ /** 产假（天））排除列表 */
private List <BigDecimal> maternityLeaveNotList; private List <BigDecimal> maternityLeaveNotList;
/** 开始 调回单位（或离职/天） */ /** 开始 调回单位（或离职/天） */
...@@ -567,6 +566,81 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -567,6 +566,81 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysStart;
/** 结束 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysEnd;
/** 增加 哺乳假（天） */
private BigDecimal breastfeedingLeaveDaysIncrement;
/** 哺乳假（天）列表 */
private List <BigDecimal> breastfeedingLeaveDaysList;
/** 哺乳假（天）排除列表 */
private List <BigDecimal> breastfeedingLeaveDaysNotList;
/** 开始 例假（天） */
private BigDecimal menstrualLeaveDaysStart;
/** 结束 例假（天） */
private BigDecimal menstrualLeaveDaysEnd;
/** 增加 例假（天） */
private BigDecimal menstrualLeaveDaysIncrement;
/** 例假（天）列表 */
private List <BigDecimal> menstrualLeaveDaysList;
/** 例假（天）排除列表 */
private List <BigDecimal> menstrualLeaveDaysNotList;
/** 开始 年假（天） */
private BigDecimal annualLeaveDaysStart;
/** 结束 年假（天） */
private BigDecimal annualLeaveDaysEnd;
/** 增加 年假（天） */
private BigDecimal annualLeaveDaysIncrement;
/** 年假（天）列表 */
private List <BigDecimal> annualLeaveDaysList;
/** 年假（天）排除列表 */
private List <BigDecimal> annualLeaveDaysNotList;
/** 开始 调休（天） */
private BigDecimal compensatedLeaveDaysStart;
/** 结束 调休（天） */
private BigDecimal compensatedLeaveDaysEnd;
/** 增加 调休（天） */
private BigDecimal compensatedLeaveDaysIncrement;
/** 调休（天）列表 */
private List <BigDecimal> compensatedLeaveDaysList;
/** 调休（天）排除列表 */
private List <BigDecimal> compensatedLeaveDaysNotList;
/** 开始 陪产假（天） */
private BigDecimal paternityLeaveDaysStart;
/** 结束 陪产假（天） */
private BigDecimal paternityLeaveDaysEnd;
/** 增加 陪产假（天） */
private BigDecimal paternityLeaveDaysIncrement;
/** 陪产假（天）列表 */
private List <BigDecimal> paternityLeaveDaysList;
/** 陪产假（天）排除列表 */
private List <BigDecimal> paternityLeaveDaysNotList;
/** 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<AttendanceStatQuery> orConditionList; private List<AttendanceStatQuery> orConditionList;
...@@ -1887,7 +1961,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1887,7 +1961,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
/** /**
* 获取 开始 产假（陪护假/天） * 获取 开始 产假（天））
* @return maternityLeaveStart * @return maternityLeaveStart
*/ */
public BigDecimal getMaternityLeaveStart(){ public BigDecimal getMaternityLeaveStart(){
...@@ -1895,7 +1969,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1895,7 +1969,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 开始 产假（陪护假/天） * 设置 开始 产假（天））
* @param maternityLeaveStart * @param maternityLeaveStart
*/ */
public void setMaternityLeaveStart(BigDecimal maternityLeaveStart){ public void setMaternityLeaveStart(BigDecimal maternityLeaveStart){
...@@ -1903,7 +1977,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1903,7 +1977,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 结束 产假（陪护假/天） * 获取 结束 产假（天））
* @return $maternityLeaveEnd * @return $maternityLeaveEnd
*/ */
public BigDecimal getMaternityLeaveEnd(){ public BigDecimal getMaternityLeaveEnd(){
...@@ -1911,7 +1985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1911,7 +1985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 结束 产假（陪护假/天） * 设置 结束 产假（天））
* @param maternityLeaveEnd * @param maternityLeaveEnd
*/ */
public void setMaternityLeaveEnd(BigDecimal maternityLeaveEnd){ public void setMaternityLeaveEnd(BigDecimal maternityLeaveEnd){
...@@ -1919,7 +1993,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1919,7 +1993,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 增加 产假（陪护假/天） * 获取 增加 产假（天））
* @return maternityLeaveIncrement * @return maternityLeaveIncrement
*/ */
public BigDecimal getMaternityLeaveIncrement(){ public BigDecimal getMaternityLeaveIncrement(){
...@@ -1927,7 +2001,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1927,7 +2001,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 增加 产假（陪护假/天） * 设置 增加 产假（天））
* @param maternityLeaveIncrement * @param maternityLeaveIncrement
*/ */
public void setMaternityLeaveIncrement(BigDecimal maternityLeaveIncrement){ public void setMaternityLeaveIncrement(BigDecimal maternityLeaveIncrement){
...@@ -1935,7 +2009,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1935,7 +2009,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 产假（陪护假/天） * 获取 产假（天））
* @return maternityLeaveList * @return maternityLeaveList
*/ */
public List<BigDecimal> getMaternityLeaveList(){ public List<BigDecimal> getMaternityLeaveList(){
...@@ -1943,7 +2017,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1943,7 +2017,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveList * @param maternityLeaveList
*/ */
public void setMaternityLeaveList(List<BigDecimal> maternityLeaveList){ public void setMaternityLeaveList(List<BigDecimal> maternityLeaveList){
...@@ -1951,7 +2025,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1951,7 +2025,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 获取 产假（陪护假/天） * 获取 产假（天））
* @return maternityLeaveNotList * @return maternityLeaveNotList
*/ */
public List<BigDecimal> getMaternityLeaveNotList(){ public List<BigDecimal> getMaternityLeaveNotList(){
...@@ -1959,7 +2033,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -1959,7 +2033,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveNotList * @param maternityLeaveNotList
*/ */
public void setMaternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){ public void setMaternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){
...@@ -3602,6 +3676,411 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -3602,6 +3676,411 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 哺乳假（天）
* @return breastfeedingLeaveDaysStart
*/
public BigDecimal getBreastfeedingLeaveDaysStart(){
return this.breastfeedingLeaveDaysStart;
}
/**
* 设置 开始 哺乳假（天）
* @param breastfeedingLeaveDaysStart
*/
public void setBreastfeedingLeaveDaysStart(BigDecimal breastfeedingLeaveDaysStart){
this.breastfeedingLeaveDaysStart = breastfeedingLeaveDaysStart;
}
/**
* 获取 结束 哺乳假（天）
* @return $breastfeedingLeaveDaysEnd
*/
public BigDecimal getBreastfeedingLeaveDaysEnd(){
return this.breastfeedingLeaveDaysEnd;
}
/**
* 设置 结束 哺乳假（天）
* @param breastfeedingLeaveDaysEnd
*/
public void setBreastfeedingLeaveDaysEnd(BigDecimal breastfeedingLeaveDaysEnd){
this.breastfeedingLeaveDaysEnd = breastfeedingLeaveDaysEnd;
}
/**
* 获取 增加 哺乳假（天）
* @return breastfeedingLeaveDaysIncrement
*/
public BigDecimal getBreastfeedingLeaveDaysIncrement(){
return this.breastfeedingLeaveDaysIncrement;
}
/**
* 设置 增加 哺乳假（天）
* @param breastfeedingLeaveDaysIncrement
*/
public void setBreastfeedingLeaveDaysIncrement(BigDecimal breastfeedingLeaveDaysIncrement){
this.breastfeedingLeaveDaysIncrement = breastfeedingLeaveDaysIncrement;
}
/**
* 获取 哺乳假（天）
* @return breastfeedingLeaveDaysList
*/
public List<BigDecimal> getBreastfeedingLeaveDaysList(){
return this.breastfeedingLeaveDaysList;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysList
*/
public void setBreastfeedingLeaveDaysList(List<BigDecimal> breastfeedingLeaveDaysList){
this.breastfeedingLeaveDaysList = breastfeedingLeaveDaysList;
}
/**
* 获取 哺乳假（天）
* @return breastfeedingLeaveDaysNotList
*/
public List<BigDecimal> getBreastfeedingLeaveDaysNotList(){
return this.breastfeedingLeaveDaysNotList;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysNotList
*/
public void setBreastfeedingLeaveDaysNotList(List<BigDecimal> breastfeedingLeaveDaysNotList){
this.breastfeedingLeaveDaysNotList = breastfeedingLeaveDaysNotList;
}
/**
* 获取 开始 例假（天）
* @return menstrualLeaveDaysStart
*/
public BigDecimal getMenstrualLeaveDaysStart(){
return this.menstrualLeaveDaysStart;
}
/**
* 设置 开始 例假（天）
* @param menstrualLeaveDaysStart
*/
public void setMenstrualLeaveDaysStart(BigDecimal menstrualLeaveDaysStart){
this.menstrualLeaveDaysStart = menstrualLeaveDaysStart;
}
/**
* 获取 结束 例假（天）
* @return $menstrualLeaveDaysEnd
*/
public BigDecimal getMenstrualLeaveDaysEnd(){
return this.menstrualLeaveDaysEnd;
}
/**
* 设置 结束 例假（天）
* @param menstrualLeaveDaysEnd
*/
public void setMenstrualLeaveDaysEnd(BigDecimal menstrualLeaveDaysEnd){
this.menstrualLeaveDaysEnd = menstrualLeaveDaysEnd;
}
/**
* 获取 增加 例假（天）
* @return menstrualLeaveDaysIncrement
*/
public BigDecimal getMenstrualLeaveDaysIncrement(){
return this.menstrualLeaveDaysIncrement;
}
/**
* 设置 增加 例假（天）
* @param menstrualLeaveDaysIncrement
*/
public void setMenstrualLeaveDaysIncrement(BigDecimal menstrualLeaveDaysIncrement){
this.menstrualLeaveDaysIncrement = menstrualLeaveDaysIncrement;
}
/**
* 获取 例假（天）
* @return menstrualLeaveDaysList
*/
public List<BigDecimal> getMenstrualLeaveDaysList(){
return this.menstrualLeaveDaysList;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysList
*/
public void setMenstrualLeaveDaysList(List<BigDecimal> menstrualLeaveDaysList){
this.menstrualLeaveDaysList = menstrualLeaveDaysList;
}
/**
* 获取 例假（天）
* @return menstrualLeaveDaysNotList
*/
public List<BigDecimal> getMenstrualLeaveDaysNotList(){
return this.menstrualLeaveDaysNotList;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysNotList
*/
public void setMenstrualLeaveDaysNotList(List<BigDecimal> menstrualLeaveDaysNotList){
this.menstrualLeaveDaysNotList = menstrualLeaveDaysNotList;
}
/**
* 获取 开始 年假（天）
* @return annualLeaveDaysStart
*/
public BigDecimal getAnnualLeaveDaysStart(){
return this.annualLeaveDaysStart;
}
/**
* 设置 开始 年假（天）
* @param annualLeaveDaysStart
*/
public void setAnnualLeaveDaysStart(BigDecimal annualLeaveDaysStart){
this.annualLeaveDaysStart = annualLeaveDaysStart;
}
/**
* 获取 结束 年假（天）
* @return $annualLeaveDaysEnd
*/
public BigDecimal getAnnualLeaveDaysEnd(){
return this.annualLeaveDaysEnd;
}
/**
* 设置 结束 年假（天）
* @param annualLeaveDaysEnd
*/
public void setAnnualLeaveDaysEnd(BigDecimal annualLeaveDaysEnd){
this.annualLeaveDaysEnd = annualLeaveDaysEnd;
}
/**
* 获取 增加 年假（天）
* @return annualLeaveDaysIncrement
*/
public BigDecimal getAnnualLeaveDaysIncrement(){
return this.annualLeaveDaysIncrement;
}
/**
* 设置 增加 年假（天）
* @param annualLeaveDaysIncrement
*/
public void setAnnualLeaveDaysIncrement(BigDecimal annualLeaveDaysIncrement){
this.annualLeaveDaysIncrement = annualLeaveDaysIncrement;
}
/**
* 获取 年假（天）
* @return annualLeaveDaysList
*/
public List<BigDecimal> getAnnualLeaveDaysList(){
return this.annualLeaveDaysList;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysList
*/
public void setAnnualLeaveDaysList(List<BigDecimal> annualLeaveDaysList){
this.annualLeaveDaysList = annualLeaveDaysList;
}
/**
* 获取 年假（天）
* @return annualLeaveDaysNotList
*/
public List<BigDecimal> getAnnualLeaveDaysNotList(){
return this.annualLeaveDaysNotList;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysNotList
*/
public void setAnnualLeaveDaysNotList(List<BigDecimal> annualLeaveDaysNotList){
this.annualLeaveDaysNotList = annualLeaveDaysNotList;
}
/**
* 获取 开始 调休（天）
* @return compensatedLeaveDaysStart
*/
public BigDecimal getCompensatedLeaveDaysStart(){
return this.compensatedLeaveDaysStart;
}
/**
* 设置 开始 调休（天）
* @param compensatedLeaveDaysStart
*/
public void setCompensatedLeaveDaysStart(BigDecimal compensatedLeaveDaysStart){
this.compensatedLeaveDaysStart = compensatedLeaveDaysStart;
}
/**
* 获取 结束 调休（天）
* @return $compensatedLeaveDaysEnd
*/
public BigDecimal getCompensatedLeaveDaysEnd(){
return this.compensatedLeaveDaysEnd;
}
/**
* 设置 结束 调休（天）
* @param compensatedLeaveDaysEnd
*/
public void setCompensatedLeaveDaysEnd(BigDecimal compensatedLeaveDaysEnd){
this.compensatedLeaveDaysEnd = compensatedLeaveDaysEnd;
}
/**
* 获取 增加 调休（天）
* @return compensatedLeaveDaysIncrement
*/
public BigDecimal getCompensatedLeaveDaysIncrement(){
return this.compensatedLeaveDaysIncrement;
}
/**
* 设置 增加 调休（天）
* @param compensatedLeaveDaysIncrement
*/
public void setCompensatedLeaveDaysIncrement(BigDecimal compensatedLeaveDaysIncrement){
this.compensatedLeaveDaysIncrement = compensatedLeaveDaysIncrement;
}
/**
* 获取 调休（天）
* @return compensatedLeaveDaysList
*/
public List<BigDecimal> getCompensatedLeaveDaysList(){
return this.compensatedLeaveDaysList;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysList
*/
public void setCompensatedLeaveDaysList(List<BigDecimal> compensatedLeaveDaysList){
this.compensatedLeaveDaysList = compensatedLeaveDaysList;
}
/**
* 获取 调休（天）
* @return compensatedLeaveDaysNotList
*/
public List<BigDecimal> getCompensatedLeaveDaysNotList(){
return this.compensatedLeaveDaysNotList;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysNotList
*/
public void setCompensatedLeaveDaysNotList(List<BigDecimal> compensatedLeaveDaysNotList){
this.compensatedLeaveDaysNotList = compensatedLeaveDaysNotList;
}
/**
* 获取 开始 陪产假（天）
* @return paternityLeaveDaysStart
*/
public BigDecimal getPaternityLeaveDaysStart(){
return this.paternityLeaveDaysStart;
}
/**
* 设置 开始 陪产假（天）
* @param paternityLeaveDaysStart
*/
public void setPaternityLeaveDaysStart(BigDecimal paternityLeaveDaysStart){
this.paternityLeaveDaysStart = paternityLeaveDaysStart;
}
/**
* 获取 结束 陪产假（天）
* @return $paternityLeaveDaysEnd
*/
public BigDecimal getPaternityLeaveDaysEnd(){
return this.paternityLeaveDaysEnd;
}
/**
* 设置 结束 陪产假（天）
* @param paternityLeaveDaysEnd
*/
public void setPaternityLeaveDaysEnd(BigDecimal paternityLeaveDaysEnd){
this.paternityLeaveDaysEnd = paternityLeaveDaysEnd;
}
/**
* 获取 增加 陪产假（天）
* @return paternityLeaveDaysIncrement
*/
public BigDecimal getPaternityLeaveDaysIncrement(){
return this.paternityLeaveDaysIncrement;
}
/**
* 设置 增加 陪产假（天）
* @param paternityLeaveDaysIncrement
*/
public void setPaternityLeaveDaysIncrement(BigDecimal paternityLeaveDaysIncrement){
this.paternityLeaveDaysIncrement = paternityLeaveDaysIncrement;
}
/**
* 获取 陪产假（天）
* @return paternityLeaveDaysList
*/
public List<BigDecimal> getPaternityLeaveDaysList(){
return this.paternityLeaveDaysList;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysList
*/
public void setPaternityLeaveDaysList(List<BigDecimal> paternityLeaveDaysList){
this.paternityLeaveDaysList = paternityLeaveDaysList;
}
/**
* 获取 陪产假（天）
* @return paternityLeaveDaysNotList
*/
public List<BigDecimal> getPaternityLeaveDaysNotList(){
return this.paternityLeaveDaysNotList;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysNotList
*/
public void setPaternityLeaveDaysNotList(List<BigDecimal> paternityLeaveDaysNotList){
this.paternityLeaveDaysNotList = paternityLeaveDaysNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -4470,7 +4949,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4470,7 +4949,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeave * @param maternityLeave
*/ */
public AttendanceStatQuery maternityLeave(BigDecimal maternityLeave){ public AttendanceStatQuery maternityLeave(BigDecimal maternityLeave){
...@@ -4479,7 +4958,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4479,7 +4958,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 开始 产假（陪护假/天） * 设置 开始 产假（天））
* @param maternityLeaveStart * @param maternityLeaveStart
*/ */
public AttendanceStatQuery maternityLeaveStart(BigDecimal maternityLeaveStart){ public AttendanceStatQuery maternityLeaveStart(BigDecimal maternityLeaveStart){
...@@ -4488,7 +4967,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4488,7 +4967,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 结束 产假（陪护假/天） * 设置 结束 产假（天））
* @param maternityLeaveEnd * @param maternityLeaveEnd
*/ */
public AttendanceStatQuery maternityLeaveEnd(BigDecimal maternityLeaveEnd){ public AttendanceStatQuery maternityLeaveEnd(BigDecimal maternityLeaveEnd){
...@@ -4497,7 +4976,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4497,7 +4976,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 增加 产假（陪护假/天） * 设置 增加 产假（天））
* @param maternityLeaveIncrement * @param maternityLeaveIncrement
*/ */
public AttendanceStatQuery maternityLeaveIncrement(BigDecimal maternityLeaveIncrement){ public AttendanceStatQuery maternityLeaveIncrement(BigDecimal maternityLeaveIncrement){
...@@ -4506,7 +4985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4506,7 +4985,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveList * @param maternityLeaveList
*/ */
public AttendanceStatQuery maternityLeaveList(List<BigDecimal> maternityLeaveList){ public AttendanceStatQuery maternityLeaveList(List<BigDecimal> maternityLeaveList){
...@@ -4515,7 +4994,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4515,7 +4994,7 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/** /**
* 设置 产假（陪护假/天） * 设置 产假（天））
* @param maternityLeaveNotList * @param maternityLeaveNotList
*/ */
public AttendanceStatQuery maternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){ public AttendanceStatQuery maternityLeaveNotList(List<BigDecimal> maternityLeaveNotList){
...@@ -5570,6 +6049,276 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -5570,6 +6049,276 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
} }
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDays
*/
public AttendanceStatQuery breastfeedingLeaveDays(BigDecimal breastfeedingLeaveDays){
setBreastfeedingLeaveDays(breastfeedingLeaveDays);
return this;
}
/**
* 设置 开始 哺乳假（天）
* @param breastfeedingLeaveDaysStart
*/
public AttendanceStatQuery breastfeedingLeaveDaysStart(BigDecimal breastfeedingLeaveDaysStart){
this.breastfeedingLeaveDaysStart = breastfeedingLeaveDaysStart;
return this;
}
/**
* 设置 结束 哺乳假（天）
* @param breastfeedingLeaveDaysEnd
*/
public AttendanceStatQuery breastfeedingLeaveDaysEnd(BigDecimal breastfeedingLeaveDaysEnd){
this.breastfeedingLeaveDaysEnd = breastfeedingLeaveDaysEnd;
return this;
}
/**
* 设置 增加 哺乳假（天）
* @param breastfeedingLeaveDaysIncrement
*/
public AttendanceStatQuery breastfeedingLeaveDaysIncrement(BigDecimal breastfeedingLeaveDaysIncrement){
this.breastfeedingLeaveDaysIncrement = breastfeedingLeaveDaysIncrement;
return this;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysList
*/
public AttendanceStatQuery breastfeedingLeaveDaysList(List<BigDecimal> breastfeedingLeaveDaysList){
this.breastfeedingLeaveDaysList = breastfeedingLeaveDaysList;
return this;
}
/**
* 设置 哺乳假（天）
* @param breastfeedingLeaveDaysNotList
*/
public AttendanceStatQuery breastfeedingLeaveDaysNotList(List<BigDecimal> breastfeedingLeaveDaysNotList){
this.breastfeedingLeaveDaysNotList = breastfeedingLeaveDaysNotList;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDays
*/
public AttendanceStatQuery menstrualLeaveDays(BigDecimal menstrualLeaveDays){
setMenstrualLeaveDays(menstrualLeaveDays);
return this;
}
/**
* 设置 开始 例假（天）
* @param menstrualLeaveDaysStart
*/
public AttendanceStatQuery menstrualLeaveDaysStart(BigDecimal menstrualLeaveDaysStart){
this.menstrualLeaveDaysStart = menstrualLeaveDaysStart;
return this;
}
/**
* 设置 结束 例假（天）
* @param menstrualLeaveDaysEnd
*/
public AttendanceStatQuery menstrualLeaveDaysEnd(BigDecimal menstrualLeaveDaysEnd){
this.menstrualLeaveDaysEnd = menstrualLeaveDaysEnd;
return this;
}
/**
* 设置 增加 例假（天）
* @param menstrualLeaveDaysIncrement
*/
public AttendanceStatQuery menstrualLeaveDaysIncrement(BigDecimal menstrualLeaveDaysIncrement){
this.menstrualLeaveDaysIncrement = menstrualLeaveDaysIncrement;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysList
*/
public AttendanceStatQuery menstrualLeaveDaysList(List<BigDecimal> menstrualLeaveDaysList){
this.menstrualLeaveDaysList = menstrualLeaveDaysList;
return this;
}
/**
* 设置 例假（天）
* @param menstrualLeaveDaysNotList
*/
public AttendanceStatQuery menstrualLeaveDaysNotList(List<BigDecimal> menstrualLeaveDaysNotList){
this.menstrualLeaveDaysNotList = menstrualLeaveDaysNotList;
return this;
}
/**
* 设置 年假（天）
* @param annualLeaveDays
*/
public AttendanceStatQuery annualLeaveDays(BigDecimal annualLeaveDays){
setAnnualLeaveDays(annualLeaveDays);
return this;
}
/**
* 设置 开始 年假（天）
* @param annualLeaveDaysStart
*/
public AttendanceStatQuery annualLeaveDaysStart(BigDecimal annualLeaveDaysStart){
this.annualLeaveDaysStart = annualLeaveDaysStart;
return this;
}
/**
* 设置 结束 年假（天）
* @param annualLeaveDaysEnd
*/
public AttendanceStatQuery annualLeaveDaysEnd(BigDecimal annualLeaveDaysEnd){
this.annualLeaveDaysEnd = annualLeaveDaysEnd;
return this;
}
/**
* 设置 增加 年假（天）
* @param annualLeaveDaysIncrement
*/
public AttendanceStatQuery annualLeaveDaysIncrement(BigDecimal annualLeaveDaysIncrement){
this.annualLeaveDaysIncrement = annualLeaveDaysIncrement;
return this;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysList
*/
public AttendanceStatQuery annualLeaveDaysList(List<BigDecimal> annualLeaveDaysList){
this.annualLeaveDaysList = annualLeaveDaysList;
return this;
}
/**
* 设置 年假（天）
* @param annualLeaveDaysNotList
*/
public AttendanceStatQuery annualLeaveDaysNotList(List<BigDecimal> annualLeaveDaysNotList){
this.annualLeaveDaysNotList = annualLeaveDaysNotList;
return this;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDays
*/
public AttendanceStatQuery compensatedLeaveDays(BigDecimal compensatedLeaveDays){
setCompensatedLeaveDays(compensatedLeaveDays);
return this;
}
/**
* 设置 开始 调休（天）
* @param compensatedLeaveDaysStart
*/
public AttendanceStatQuery compensatedLeaveDaysStart(BigDecimal compensatedLeaveDaysStart){
this.compensatedLeaveDaysStart = compensatedLeaveDaysStart;
return this;
}
/**
* 设置 结束 调休（天）
* @param compensatedLeaveDaysEnd
*/
public AttendanceStatQuery compensatedLeaveDaysEnd(BigDecimal compensatedLeaveDaysEnd){
this.compensatedLeaveDaysEnd = compensatedLeaveDaysEnd;
return this;
}
/**
* 设置 增加 调休（天）
* @param compensatedLeaveDaysIncrement
*/
public AttendanceStatQuery compensatedLeaveDaysIncrement(BigDecimal compensatedLeaveDaysIncrement){
this.compensatedLeaveDaysIncrement = compensatedLeaveDaysIncrement;
return this;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysList
*/
public AttendanceStatQuery compensatedLeaveDaysList(List<BigDecimal> compensatedLeaveDaysList){
this.compensatedLeaveDaysList = compensatedLeaveDaysList;
return this;
}
/**
* 设置 调休（天）
* @param compensatedLeaveDaysNotList
*/
public AttendanceStatQuery compensatedLeaveDaysNotList(List<BigDecimal> compensatedLeaveDaysNotList){
this.compensatedLeaveDaysNotList = compensatedLeaveDaysNotList;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDays
*/
public AttendanceStatQuery paternityLeaveDays(BigDecimal paternityLeaveDays){
setPaternityLeaveDays(paternityLeaveDays);
return this;
}
/**
* 设置 开始 陪产假（天）
* @param paternityLeaveDaysStart
*/
public AttendanceStatQuery paternityLeaveDaysStart(BigDecimal paternityLeaveDaysStart){
this.paternityLeaveDaysStart = paternityLeaveDaysStart;
return this;
}
/**
* 设置 结束 陪产假（天）
* @param paternityLeaveDaysEnd
*/
public AttendanceStatQuery paternityLeaveDaysEnd(BigDecimal paternityLeaveDaysEnd){
this.paternityLeaveDaysEnd = paternityLeaveDaysEnd;
return this;
}
/**
* 设置 增加 陪产假（天）
* @param paternityLeaveDaysIncrement
*/
public AttendanceStatQuery paternityLeaveDaysIncrement(BigDecimal paternityLeaveDaysIncrement){
this.paternityLeaveDaysIncrement = paternityLeaveDaysIncrement;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysList
*/
public AttendanceStatQuery paternityLeaveDaysList(List<BigDecimal> paternityLeaveDaysList){
this.paternityLeaveDaysList = paternityLeaveDaysList;
return this;
}
/**
* 设置 陪产假（天）
* @param paternityLeaveDaysNotList
*/
public AttendanceStatQuery paternityLeaveDaysNotList(List<BigDecimal> paternityLeaveDaysNotList){
this.paternityLeaveDaysNotList = paternityLeaveDaysNotList;
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
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationBalanceEntity.java
View file @ 56b22778
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationBalanceVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationBalanceVo;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 员工假期余额信息实体对象 * 员工假期余额信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-11 * @date 2023-04-14
*/ */
public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo { public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo {
...@@ -55,6 +52,14 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -55,6 +52,14 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
* 年假（天） * 年假（天）
*/ */
private BigDecimal annualLeaveDays; private BigDecimal annualLeaveDays;
/**
* 婚假（天）
*/
private BigDecimal marriageLeaveDays;
/**
* 备注
*/
private String remark;
/** /**
* 产假（天） * 产假（天）
*/ */
...@@ -63,10 +68,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -63,10 +68,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
* 陪产假（天） * 陪产假（天）
*/ */
private BigDecimal paternityLeaveDays; private BigDecimal paternityLeaveDays;
/**
* 婚假（天）
*/
private BigDecimal marriageLeaveDays;
/** /**
* 例假（天） * 例假（天）
*/ */
...@@ -80,9 +81,49 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -80,9 +81,49 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
*/ */
private BigDecimal bereavementLeaveDays; private BigDecimal bereavementLeaveDays;
/** /**
* 备注 * 回单位（天）
*/ */
private String remark; private BigDecimal backToUnit;
/**
* 因公请假（天）
*/
private BigDecimal onDutyLeave;
/**
* 外出勘验（天）
*/
private BigDecimal outOfOffice;
/**
* 值班补班（天）
*/
private BigDecimal shiftCompensation;
/**
* 体检（天）
*/
private BigDecimal physicalExamination;
/**
* 隔离（天）
*/
private BigDecimal quarantine;
/**
* 因公外出（与窗口工作无关/天）
*/
private BigDecimal businessTrip;
/**
* 公休（天）
*/
private BigDecimal publicHoliday;
/**
* 育儿假（天）
*/
private BigDecimal childRearingLeave;
/**
* 调回单位（或离职/天）
*/
private BigDecimal transferBack;
/**
* 探亲假（天）
*/
private BigDecimal homeLeave;
...@@ -213,6 +254,34 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -213,6 +254,34 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
public void setAnnualLeaveDays(BigDecimal annualLeaveDays){ public void setAnnualLeaveDays(BigDecimal annualLeaveDays){
this.annualLeaveDays = annualLeaveDays; this.annualLeaveDays = annualLeaveDays;
} }
/**
* 获取 婚假（天）
* @return BigDecimal
*/
public BigDecimal getMarriageLeaveDays(){
return marriageLeaveDays;
}
/**
* 设置 婚假（天）
* @param marriageLeaveDays
*/
public void setMarriageLeaveDays(BigDecimal marriageLeaveDays){
this.marriageLeaveDays = marriageLeaveDays;
}
/**
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
/** /**
* 获取 产假（天） * 获取 产假（天）
* @return BigDecimal * @return BigDecimal
...@@ -241,20 +310,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -241,20 +310,6 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){ public void setPaternityLeaveDays(BigDecimal paternityLeaveDays){
this.paternityLeaveDays = paternityLeaveDays; this.paternityLeaveDays = paternityLeaveDays;
} }
/**
* 获取 婚假（天）
* @return BigDecimal
*/
public BigDecimal getMarriageLeaveDays(){
return marriageLeaveDays;
}
/**
* 设置 婚假（天）
* @param marriageLeaveDays
*/
public void setMarriageLeaveDays(BigDecimal marriageLeaveDays){
this.marriageLeaveDays = marriageLeaveDays;
}
/** /**
* 获取 例假（天） * 获取 例假（天）
* @return BigDecimal * @return BigDecimal
...@@ -298,18 +353,158 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -298,18 +353,158 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
this.bereavementLeaveDays = bereavementLeaveDays; this.bereavementLeaveDays = bereavementLeaveDays;
} }
/** /**
* 获取 备注 * 获取 回单位（天）
* @return String * @return BigDecimal
*/ */
public String getRemark(){ public BigDecimal getBackToUnit(){
return remark; return backToUnit;
} }
/** /**
* 设置 备注 * 设置 回单位（天）
* @param remark * @param backToUnit
*/ */
public void setRemark(String remark){ public void setBackToUnit(BigDecimal backToUnit){
this.remark = remark; this.backToUnit = backToUnit;
}
/**
* 获取 因公请假（天）
* @return BigDecimal
*/
public BigDecimal getOnDutyLeave(){
return onDutyLeave;
}
/**
* 设置 因公请假（天）
* @param onDutyLeave
*/
public void setOnDutyLeave(BigDecimal onDutyLeave){
this.onDutyLeave = onDutyLeave;
}
/**
* 获取 外出勘验（天）
* @return BigDecimal
*/
public BigDecimal getOutOfOffice(){
return outOfOffice;
}
/**
* 设置 外出勘验（天）
* @param outOfOffice
*/
public void setOutOfOffice(BigDecimal outOfOffice){
this.outOfOffice = outOfOffice;
}
/**
* 获取 值班补班（天）
* @return BigDecimal
*/
public BigDecimal getShiftCompensation(){
return shiftCompensation;
}
/**
* 设置 值班补班（天）
* @param shiftCompensation
*/
public void setShiftCompensation(BigDecimal shiftCompensation){
this.shiftCompensation = shiftCompensation;
}
/**
* 获取 体检（天）
* @return BigDecimal
*/
public BigDecimal getPhysicalExamination(){
return physicalExamination;
}
/**
* 设置 体检（天）
* @param physicalExamination
*/
public void setPhysicalExamination(BigDecimal physicalExamination){
this.physicalExamination = physicalExamination;
}
/**
* 获取 隔离（天）
* @return BigDecimal
*/
public BigDecimal getQuarantine(){
return quarantine;
}
/**
* 设置 隔离（天）
* @param quarantine
*/
public void setQuarantine(BigDecimal quarantine){
this.quarantine = quarantine;
}
/**
* 获取 因公外出（与窗口工作无关/天）
* @return BigDecimal
*/
public BigDecimal getBusinessTrip(){
return businessTrip;
}
/**
* 设置 因公外出（与窗口工作无关/天）
* @param businessTrip
*/
public void setBusinessTrip(BigDecimal businessTrip){
this.businessTrip = businessTrip;
}
/**
* 获取 公休（天）
* @return BigDecimal
*/
public BigDecimal getPublicHoliday(){
return publicHoliday;
}
/**
* 设置 公休（天）
* @param publicHoliday
*/
public void setPublicHoliday(BigDecimal publicHoliday){
this.publicHoliday = publicHoliday;
}
/**
* 获取 育儿假（天）
* @return BigDecimal
*/
public BigDecimal getChildRearingLeave(){
return childRearingLeave;
}
/**
* 设置 育儿假（天）
* @param childRearingLeave
*/
public void setChildRearingLeave(BigDecimal childRearingLeave){
this.childRearingLeave = childRearingLeave;
}
/**
* 获取 调回单位（或离职/天）
* @return BigDecimal
*/
public BigDecimal getTransferBack(){
return transferBack;
}
/**
* 设置 调回单位（或离职/天）
* @param transferBack
*/
public void setTransferBack(BigDecimal transferBack){
this.transferBack = transferBack;
}
/**
* 获取 探亲假（天）
* @return BigDecimal
*/
public BigDecimal getHomeLeave(){
return homeLeave;
}
/**
* 设置 探亲假（天）
* @param homeLeave
*/
public void setHomeLeave(BigDecimal homeLeave){
this.homeLeave = homeLeave;
} }
...@@ -342,13 +537,24 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -342,13 +537,24 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
sb.append(",compensatedLeaveDays:").append(getCompensatedLeaveDays()); sb.append(",compensatedLeaveDays:").append(getCompensatedLeaveDays());
sb.append(",sickLeaveDays:").append(getSickLeaveDays()); sb.append(",sickLeaveDays:").append(getSickLeaveDays());
sb.append(",annualLeaveDays:").append(getAnnualLeaveDays()); sb.append(",annualLeaveDays:").append(getAnnualLeaveDays());
sb.append(",marriageLeaveDays:").append(getMarriageLeaveDays());
sb.append(",remark:").append(getRemark());
sb.append(",maternityLeaveDays:").append(getMaternityLeaveDays()); sb.append(",maternityLeaveDays:").append(getMaternityLeaveDays());
sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays()); sb.append(",paternityLeaveDays:").append(getPaternityLeaveDays());
sb.append(",marriageLeaveDays:").append(getMarriageLeaveDays());
sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays()); sb.append(",menstrualLeaveDays:").append(getMenstrualLeaveDays());
sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays()); sb.append(",breastfeedingLeaveDays:").append(getBreastfeedingLeaveDays());
sb.append(",bereavementLeaveDays:").append(getBereavementLeaveDays()); sb.append(",bereavementLeaveDays:").append(getBereavementLeaveDays());
sb.append(",remark:").append(getRemark()); sb.append(",backToUnit:").append(getBackToUnit());
sb.append(",onDutyLeave:").append(getOnDutyLeave());
sb.append(",outOfOffice:").append(getOutOfOffice());
sb.append(",shiftCompensation:").append(getShiftCompensation());
sb.append(",physicalExamination:").append(getPhysicalExamination());
sb.append(",quarantine:").append(getQuarantine());
sb.append(",businessTrip:").append(getBusinessTrip());
sb.append(",publicHoliday:").append(getPublicHoliday());
sb.append(",childRearingLeave:").append(getChildRearingLeave());
sb.append(",transferBack:").append(getTransferBack());
sb.append(",homeLeave:").append(getHomeLeave());
return sb.toString(); return sb.toString();
} }
...@@ -372,18 +578,40 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo ...@@ -372,18 +578,40 @@ public class AttendanceVacationBalanceEntity extends AttendanceVacationBalanceVo
this.annualLeaveDays = BigDecimal.valueOf(0); this.annualLeaveDays = BigDecimal.valueOf(0);
this.marriageLeaveDays = BigDecimal.valueOf(0);
this.remark = "";
this.maternityLeaveDays = BigDecimal.valueOf(0); this.maternityLeaveDays = BigDecimal.valueOf(0);
this.paternityLeaveDays = BigDecimal.valueOf(0); this.paternityLeaveDays = BigDecimal.valueOf(0);
this.marriageLeaveDays = BigDecimal.valueOf(0);
this.menstrualLeaveDays = BigDecimal.valueOf(0); this.menstrualLeaveDays = BigDecimal.valueOf(0);
this.breastfeedingLeaveDays = BigDecimal.valueOf(0); this.breastfeedingLeaveDays = BigDecimal.valueOf(0);
this.bereavementLeaveDays = BigDecimal.valueOf(0); this.bereavementLeaveDays = BigDecimal.valueOf(0);
this.remark = ""; this.backToUnit = BigDecimal.valueOf(0);
this.onDutyLeave = BigDecimal.valueOf(0);
this.outOfOffice = BigDecimal.valueOf(0);
this.shiftCompensation = BigDecimal.valueOf(0);
this.physicalExamination = BigDecimal.valueOf(0);
this.quarantine = BigDecimal.valueOf(0);
this.businessTrip = BigDecimal.valueOf(0);
this.publicHoliday = BigDecimal.valueOf(0);
this.childRearingLeave = BigDecimal.valueOf(0);
this.transferBack = BigDecimal.valueOf(0);
this.homeLeave = BigDecimal.valueOf(0);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordEntity.java
View file @ 56b22778
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceVacationRecordVo;
import java.math.BigDecimal;
/** /**
* 员工假期记录信息实体对象 * 员工假期记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-12 * @date 2023-04-14
*/ */
public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,7 +24,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -27,7 +24,7 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
*/ */
private String staffName; private String staffName;
/** /**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
*/ */
private Integer type; private Integer type;
/** /**
...@@ -91,14 +88,14 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo { ...@@ -91,14 +88,14 @@ public class AttendanceVacationRecordEntity extends AttendanceVacationRecordVo {
this.staffName = staffName; this.staffName = staffName;
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return Integer * @return Integer
*/ */
public Integer getType(){ public Integer getType(){
return type; return type;
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param type * @param type
*/ */
public void setType(Integer type){ public void setType(Integer type){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceVacationRecordQuery.java
View file @ 56b22778
...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model; ...@@ -2,13 +2,12 @@ package com.mortals.xhx.module.attendance.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceVacationRecordEntity;
/** /**
* 员工假期记录信息查询对象 * 员工假期记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-12 * @date 2023-04-14
*/ */
public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntity { public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -45,19 +44,19 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -45,19 +44,19 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
/** 员工姓名排除列表 */ /** 员工姓名排除列表 */
private List <String> staffNameNotList; private List <String> staffNameNotList;
/** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer typeStart; private Integer typeStart;
/** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer typeEnd; private Integer typeEnd;
/** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) */ /** 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假) */
private Integer typeIncrement; private Integer typeIncrement;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)列表 */
private List <Integer> typeList; private List <Integer> typeList;
/** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)排除列表 */ /** 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)排除列表 */
private List <Integer> typeNotList; private List <Integer> typeNotList;
/** 开始 增减类型(1.增加,2.扣除) */ /** 开始 增减类型(1.增加,2.扣除) */
...@@ -360,7 +359,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -360,7 +359,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeStart * @return typeStart
*/ */
public Integer getTypeStart(){ public Integer getTypeStart(){
...@@ -368,7 +367,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -368,7 +367,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeStart * @param typeStart
*/ */
public void setTypeStart(Integer typeStart){ public void setTypeStart(Integer typeStart){
...@@ -376,7 +375,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -376,7 +375,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return $typeEnd * @return $typeEnd
*/ */
public Integer getTypeEnd(){ public Integer getTypeEnd(){
...@@ -384,7 +383,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -384,7 +383,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeEnd * @param typeEnd
*/ */
public void setTypeEnd(Integer typeEnd){ public void setTypeEnd(Integer typeEnd){
...@@ -392,7 +391,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -392,7 +391,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeIncrement * @return typeIncrement
*/ */
public Integer getTypeIncrement(){ public Integer getTypeIncrement(){
...@@ -400,7 +399,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -400,7 +399,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeIncrement * @param typeIncrement
*/ */
public void setTypeIncrement(Integer typeIncrement){ public void setTypeIncrement(Integer typeIncrement){
...@@ -408,7 +407,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -408,7 +407,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeList * @return typeList
*/ */
public List<Integer> getTypeList(){ public List<Integer> getTypeList(){
...@@ -416,7 +415,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -416,7 +415,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeList * @param typeList
*/ */
public void setTypeList(List<Integer> typeList){ public void setTypeList(List<Integer> typeList){
...@@ -424,7 +423,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -424,7 +423,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 获取 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @return typeNotList * @return typeNotList
*/ */
public List<Integer> getTypeNotList(){ public List<Integer> getTypeNotList(){
...@@ -432,7 +431,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -432,7 +431,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeNotList * @param typeNotList
*/ */
public void setTypeNotList(List<Integer> typeNotList){ public void setTypeNotList(List<Integer> typeNotList){
...@@ -1116,7 +1115,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1116,7 +1115,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param type * @param type
*/ */
public AttendanceVacationRecordQuery type(Integer type){ public AttendanceVacationRecordQuery type(Integer type){
...@@ -1125,7 +1124,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1125,7 +1124,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 开始 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeStart * @param typeStart
*/ */
public AttendanceVacationRecordQuery typeStart(Integer typeStart){ public AttendanceVacationRecordQuery typeStart(Integer typeStart){
...@@ -1134,7 +1133,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1134,7 +1133,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 结束 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeEnd * @param typeEnd
*/ */
public AttendanceVacationRecordQuery typeEnd(Integer typeEnd){ public AttendanceVacationRecordQuery typeEnd(Integer typeEnd){
...@@ -1143,7 +1142,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1143,7 +1142,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 增加 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeIncrement * @param typeIncrement
*/ */
public AttendanceVacationRecordQuery typeIncrement(Integer typeIncrement){ public AttendanceVacationRecordQuery typeIncrement(Integer typeIncrement){
...@@ -1152,7 +1151,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1152,7 +1151,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeList * @param typeList
*/ */
public AttendanceVacationRecordQuery typeList(List<Integer> typeList){ public AttendanceVacationRecordQuery typeList(List<Integer> typeList){
...@@ -1161,7 +1160,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit ...@@ -1161,7 +1160,7 @@ public class AttendanceVacationRecordQuery extends AttendanceVacationRecordEntit
} }
/** /**
* 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假) * 设置 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
* @param typeNotList * @param typeNotList
*/ */
public AttendanceVacationRecordQuery typeNotList(List<Integer> typeNotList){ public AttendanceVacationRecordQuery typeNotList(List<Integer> typeNotList){
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceLeaveRecordMapper.xml
View file @ 56b22778
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!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.AttendanceLeaveRecordDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceLeaveRecordDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -500,13 +500,13 @@ ...@@ -500,13 +500,13 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')"> <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in ${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -527,13 +527,13 @@ ...@@ -527,13 +527,13 @@
${_conditionType_} a.leavePersonId is null ${_conditionType_} a.leavePersonId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonIdList')"> <if test="conditionParamRef.containsKey('leavePersonIdList') and conditionParamRef.leavePersonIdList.size() > 0">
${_conditionType_} a.leavePersonId in ${_conditionType_} a.leavePersonId in
<foreach collection="conditionParamRef.leavePersonIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonIdNotList')"> <if test="conditionParamRef.containsKey('leavePersonIdNotList') and conditionParamRef.leavePersonIdNotList.size() > 0">
${_conditionType_} a.leavePersonId not in ${_conditionType_} a.leavePersonId not in
<foreach collection="conditionParamRef.leavePersonIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -555,13 +555,13 @@ ...@@ -555,13 +555,13 @@
${_conditionType_} a.leavePerson is null ${_conditionType_} a.leavePerson is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonList')"> <if test="conditionParamRef.containsKey('leavePersonList') and conditionParamRef.leavePersonList.size() > 0">
${_conditionType_} a.leavePerson in ${_conditionType_} a.leavePerson in
<foreach collection="conditionParamRef.leavePersonList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leavePersonNotList')"> <if test="conditionParamRef.containsKey('leavePersonNotList') and conditionParamRef.leavePersonNotList.size() > 0">
${_conditionType_} a.leavePerson not in ${_conditionType_} a.leavePerson not in
<foreach collection="conditionParamRef.leavePersonNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leavePersonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -575,13 +575,13 @@ ...@@ -575,13 +575,13 @@
${_conditionType_} a.deptId is null ${_conditionType_} a.deptId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdList')"> <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
${_conditionType_} a.deptId in ${_conditionType_} a.deptId in
<foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdNotList')"> <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
${_conditionType_} a.deptId not in ${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -603,13 +603,13 @@ ...@@ -603,13 +603,13 @@
${_conditionType_} a.deptName is null ${_conditionType_} a.deptName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameList')"> <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in ${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameNotList')"> <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in ${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -624,13 +624,13 @@ ...@@ -624,13 +624,13 @@
${_conditionType_} a.phoneNumber is null ${_conditionType_} a.phoneNumber is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNumberList')"> <if test="conditionParamRef.containsKey('phoneNumberList') and conditionParamRef.phoneNumberList.size() > 0">
${_conditionType_} a.phoneNumber in ${_conditionType_} a.phoneNumber in
<foreach collection="conditionParamRef.phoneNumberList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.phoneNumberList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNumberNotList')"> <if test="conditionParamRef.containsKey('phoneNumberNotList') and conditionParamRef.phoneNumberNotList.size() > 0">
${_conditionType_} a.phoneNumber not in ${_conditionType_} a.phoneNumber not in
<foreach collection="conditionParamRef.phoneNumberNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.phoneNumberNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -644,13 +644,13 @@ ...@@ -644,13 +644,13 @@
${_conditionType_} a.leaveType is null ${_conditionType_} a.leaveType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leaveTypeList')"> <if test="conditionParamRef.containsKey('leaveTypeList') and conditionParamRef.leaveTypeList.size() > 0">
${_conditionType_} a.leaveType in ${_conditionType_} a.leaveType in
<foreach collection="conditionParamRef.leaveTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leaveTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leaveTypeNotList')"> <if test="conditionParamRef.containsKey('leaveTypeNotList') and conditionParamRef.leaveTypeNotList.size() > 0">
${_conditionType_} a.leaveType not in ${_conditionType_} a.leaveType not in
<foreach collection="conditionParamRef.leaveTypeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leaveTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -701,13 +701,13 @@ ...@@ -701,13 +701,13 @@
${_conditionType_} a.duration is null ${_conditionType_} a.duration is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('durationList')"> <if test="conditionParamRef.containsKey('durationList') and conditionParamRef.durationList.size() > 0">
${_conditionType_} a.duration in ${_conditionType_} a.duration in
<foreach collection="conditionParamRef.durationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.durationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('durationNotList')"> <if test="conditionParamRef.containsKey('durationNotList') and conditionParamRef.durationNotList.size() > 0">
${_conditionType_} a.duration not in ${_conditionType_} a.duration not in
<foreach collection="conditionParamRef.durationNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.durationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -729,13 +729,13 @@ ...@@ -729,13 +729,13 @@
${_conditionType_} a.reason is null ${_conditionType_} a.reason is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('reasonList')"> <if test="conditionParamRef.containsKey('reasonList') and conditionParamRef.reasonList.size() > 0">
${_conditionType_} a.reason in ${_conditionType_} a.reason in
<foreach collection="conditionParamRef.reasonList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.reasonList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('reasonNotList')"> <if test="conditionParamRef.containsKey('reasonNotList') and conditionParamRef.reasonNotList.size() > 0">
${_conditionType_} a.reason not in ${_conditionType_} a.reason not in
<foreach collection="conditionParamRef.reasonNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.reasonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -749,13 +749,13 @@ ...@@ -749,13 +749,13 @@
${_conditionType_} a.approverId is null ${_conditionType_} a.approverId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('approverIdList')"> <if test="conditionParamRef.containsKey('approverIdList') and conditionParamRef.approverIdList.size() > 0">
${_conditionType_} a.approverId in ${_conditionType_} a.approverId in
<foreach collection="conditionParamRef.approverIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('approverIdNotList')"> <if test="conditionParamRef.containsKey('approverIdNotList') and conditionParamRef.approverIdNotList.size() > 0">
${_conditionType_} a.approverId not in ${_conditionType_} a.approverId not in
<foreach collection="conditionParamRef.approverIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -777,13 +777,13 @@ ...@@ -777,13 +777,13 @@
${_conditionType_} a.approver is null ${_conditionType_} a.approver is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('approverList')"> <if test="conditionParamRef.containsKey('approverList') and conditionParamRef.approverList.size() > 0">
${_conditionType_} a.approver in ${_conditionType_} a.approver in
<foreach collection="conditionParamRef.approverList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('approverNotList')"> <if test="conditionParamRef.containsKey('approverNotList') and conditionParamRef.approverNotList.size() > 0">
${_conditionType_} a.approver not in ${_conditionType_} a.approver not in
<foreach collection="conditionParamRef.approverNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.approverNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -798,13 +798,13 @@ ...@@ -798,13 +798,13 @@
${_conditionType_} a.attachment is null ${_conditionType_} a.attachment is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentList')"> <if test="conditionParamRef.containsKey('attachmentList') and conditionParamRef.attachmentList.size() > 0">
${_conditionType_} a.attachment in ${_conditionType_} a.attachment in
<foreach collection="conditionParamRef.attachmentList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentNotList')"> <if test="conditionParamRef.containsKey('attachmentNotList') and conditionParamRef.attachmentNotList.size() > 0">
${_conditionType_} a.attachment not in ${_conditionType_} a.attachment not in
<foreach collection="conditionParamRef.attachmentNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -819,13 +819,13 @@ ...@@ -819,13 +819,13 @@
${_conditionType_} a.attachmentPath is null ${_conditionType_} a.attachmentPath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentPathList')"> <if test="conditionParamRef.containsKey('attachmentPathList') and conditionParamRef.attachmentPathList.size() > 0">
${_conditionType_} a.attachmentPath in ${_conditionType_} a.attachmentPath in
<foreach collection="conditionParamRef.attachmentPathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentPathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('attachmentPathNotList')"> <if test="conditionParamRef.containsKey('attachmentPathNotList') and conditionParamRef.attachmentPathNotList.size() > 0">
${_conditionType_} a.attachmentPath not in ${_conditionType_} a.attachmentPath not in
<foreach collection="conditionParamRef.attachmentPathNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attachmentPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -840,13 +840,13 @@ ...@@ -840,13 +840,13 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList')"> <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in ${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -860,13 +860,13 @@ ...@@ -860,13 +860,13 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -902,13 +902,13 @@ ...@@ -902,13 +902,13 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')"> <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapper.xml
View file @ 56b22778
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!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.AttendanceStatDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceStatDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -46,6 +46,11 @@ ...@@ -46,6 +46,11 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="breastfeedingLeaveDays" column="breastfeedingLeaveDays" />
<result property="menstrualLeaveDays" column="menstrualLeaveDays" />
<result property="annualLeaveDays" column="annualLeaveDays" />
<result property="compensatedLeaveDays" column="compensatedLeaveDays" />
<result property="paternityLeaveDays" column="paternityLeaveDays" />
</resultMap> </resultMap>
...@@ -176,23 +181,38 @@ ...@@ -176,23 +181,38 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('breastfeedingLeaveDays') or colPickMode == 1 and data.containsKey('breastfeedingLeaveDays')))">
a.breastfeedingLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menstrualLeaveDays') or colPickMode == 1 and data.containsKey('menstrualLeaveDays')))">
a.menstrualLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annualLeaveDays') or colPickMode == 1 and data.containsKey('annualLeaveDays')))">
a.annualLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('compensatedLeaveDays') or colPickMode == 1 and data.containsKey('compensatedLeaveDays')))">
a.compensatedLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paternityLeaveDays') or colPickMode == 1 and data.containsKey('paternityLeaveDays')))">
a.paternityLeaveDays,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceStatEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceStatEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_stat insert into mortals_xhx_attendance_stat
(windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime) (windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime,breastfeedingLeaveDays,menstrualLeaveDays,annualLeaveDays,compensatedLeaveDays,paternityLeaveDays)
VALUES VALUES
(#{windowCategory},#{staffId},#{staffName},#{deptId},#{deptName},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{sickLeave},#{funeralLeave},#{marriageLeave},#{childRearingLeave},#{maternityLeave},#{transferBack},#{homeLeave},#{personalLeave},#{absenteeismDays},#{otherDays},#{attendanceRate},#{nonCompliancePunch},#{lateTimes},#{surfingMobileTimes},#{overtimeTimes},#{vacancy},#{nonStandardDressTimes},#{unexcusedMeetingAbsence},#{earlyLeaveMeeting},#{year},#{month},#{day},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{windowCategory},#{staffId},#{staffName},#{deptId},#{deptName},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{sickLeave},#{funeralLeave},#{marriageLeave},#{childRearingLeave},#{maternityLeave},#{transferBack},#{homeLeave},#{personalLeave},#{absenteeismDays},#{otherDays},#{attendanceRate},#{nonCompliancePunch},#{lateTimes},#{surfingMobileTimes},#{overtimeTimes},#{vacancy},#{nonStandardDressTimes},#{unexcusedMeetingAbsence},#{earlyLeaveMeeting},#{year},#{month},#{day},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{breastfeedingLeaveDays},#{menstrualLeaveDays},#{annualLeaveDays},#{compensatedLeaveDays},#{paternityLeaveDays})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_stat insert into mortals_xhx_attendance_stat
(windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime) (windowCategory,staffId,staffName,deptId,deptName,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,sickLeave,funeralLeave,marriageLeave,childRearingLeave,maternityLeave,transferBack,homeLeave,personalLeave,absenteeismDays,otherDays,attendanceRate,nonCompliancePunch,lateTimes,surfingMobileTimes,overtimeTimes,vacancy,nonStandardDressTimes,unexcusedMeetingAbsence,earlyLeaveMeeting,year,month,day,remark,createUserId,createTime,updateUserId,updateTime,breastfeedingLeaveDays,menstrualLeaveDays,annualLeaveDays,compensatedLeaveDays,paternityLeaveDays)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.windowCategory},#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.sickLeave},#{item.funeralLeave},#{item.marriageLeave},#{item.childRearingLeave},#{item.maternityLeave},#{item.transferBack},#{item.homeLeave},#{item.personalLeave},#{item.absenteeismDays},#{item.otherDays},#{item.attendanceRate},#{item.nonCompliancePunch},#{item.lateTimes},#{item.surfingMobileTimes},#{item.overtimeTimes},#{item.vacancy},#{item.nonStandardDressTimes},#{item.unexcusedMeetingAbsence},#{item.earlyLeaveMeeting},#{item.year},#{item.month},#{item.day},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.windowCategory},#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.sickLeave},#{item.funeralLeave},#{item.marriageLeave},#{item.childRearingLeave},#{item.maternityLeave},#{item.transferBack},#{item.homeLeave},#{item.personalLeave},#{item.absenteeismDays},#{item.otherDays},#{item.attendanceRate},#{item.nonCompliancePunch},#{item.lateTimes},#{item.surfingMobileTimes},#{item.overtimeTimes},#{item.vacancy},#{item.nonStandardDressTimes},#{item.unexcusedMeetingAbsence},#{item.earlyLeaveMeeting},#{item.year},#{item.month},#{item.day},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.breastfeedingLeaveDays},#{item.menstrualLeaveDays},#{item.annualLeaveDays},#{item.compensatedLeaveDays},#{item.paternityLeaveDays})
</foreach> </foreach>
</insert> </insert>
...@@ -424,6 +444,36 @@ ...@@ -424,6 +444,36 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('breastfeedingLeaveDays')) or (colPickMode==1 and !data.containsKey('breastfeedingLeaveDays'))">
a.breastfeedingLeaveDays=#{data.breastfeedingLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('breastfeedingLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('breastfeedingLeaveDaysIncrement'))">
a.breastfeedingLeaveDays=ifnull(a.breastfeedingLeaveDays,0) + #{data.breastfeedingLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDays'))">
a.menstrualLeaveDays=#{data.menstrualLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('menstrualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDaysIncrement'))">
a.menstrualLeaveDays=ifnull(a.menstrualLeaveDays,0) + #{data.menstrualLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('annualLeaveDays')) or (colPickMode==1 and !data.containsKey('annualLeaveDays'))">
a.annualLeaveDays=#{data.annualLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('annualLeaveDaysIncrement'))">
a.annualLeaveDays=ifnull(a.annualLeaveDays,0) + #{data.annualLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('compensatedLeaveDays')) or (colPickMode==1 and !data.containsKey('compensatedLeaveDays'))">
a.compensatedLeaveDays=#{data.compensatedLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('compensatedLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('compensatedLeaveDaysIncrement'))">
a.compensatedLeaveDays=ifnull(a.compensatedLeaveDays,0) + #{data.compensatedLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('paternityLeaveDays')) or (colPickMode==1 and !data.containsKey('paternityLeaveDays'))">
a.paternityLeaveDays=#{data.paternityLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('paternityLeaveDaysIncrement'))">
a.paternityLeaveDays=ifnull(a.paternityLeaveDays,0) + #{data.paternityLeaveDaysIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -886,6 +936,66 @@ ...@@ -886,6 +936,66 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="breastfeedingLeaveDays=(case" suffix="ELSE breastfeedingLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('breastfeedingLeaveDays')) or (colPickMode==1 and !item.containsKey('breastfeedingLeaveDays'))">
when a.id=#{item.id} then #{item.breastfeedingLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('breastfeedingLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('breastfeedingLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.breastfeedingLeaveDays,0) + #{item.breastfeedingLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="menstrualLeaveDays=(case" suffix="ELSE menstrualLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !item.containsKey('menstrualLeaveDays'))">
when a.id=#{item.id} then #{item.menstrualLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('menstrualLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('menstrualLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.menstrualLeaveDays,0) + #{item.menstrualLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="annualLeaveDays=(case" suffix="ELSE annualLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('annualLeaveDays')) or (colPickMode==1 and !item.containsKey('annualLeaveDays'))">
when a.id=#{item.id} then #{item.annualLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('annualLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.annualLeaveDays,0) + #{item.annualLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="compensatedLeaveDays=(case" suffix="ELSE compensatedLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('compensatedLeaveDays')) or (colPickMode==1 and !item.containsKey('compensatedLeaveDays'))">
when a.id=#{item.id} then #{item.compensatedLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('compensatedLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('compensatedLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.compensatedLeaveDays,0) + #{item.compensatedLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="paternityLeaveDays=(case" suffix="ELSE paternityLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('paternityLeaveDays')) or (colPickMode==1 and !item.containsKey('paternityLeaveDays'))">
when a.id=#{item.id} then #{item.paternityLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('paternityLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.paternityLeaveDays,0) + #{item.paternityLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1010,13 +1120,13 @@ ...@@ -1010,13 +1120,13 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')"> <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in ${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1038,13 +1148,13 @@ ...@@ -1038,13 +1148,13 @@
${_conditionType_} a.windowCategory is null ${_conditionType_} a.windowCategory is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('windowCategoryList')"> <if test="conditionParamRef.containsKey('windowCategoryList') and conditionParamRef.windowCategoryList.size() > 0">
${_conditionType_} a.windowCategory in ${_conditionType_} a.windowCategory in
<foreach collection="conditionParamRef.windowCategoryList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.windowCategoryList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('windowCategoryNotList')"> <if test="conditionParamRef.containsKey('windowCategoryNotList') and conditionParamRef.windowCategoryNotList.size() > 0">
${_conditionType_} a.windowCategory not in ${_conditionType_} a.windowCategory not in
<foreach collection="conditionParamRef.windowCategoryNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.windowCategoryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1058,13 +1168,13 @@ ...@@ -1058,13 +1168,13 @@
${_conditionType_} a.staffId is null ${_conditionType_} a.staffId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('staffIdList')"> <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
${_conditionType_} a.staffId in ${_conditionType_} a.staffId in
<foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('staffIdNotList')"> <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
${_conditionType_} a.staffId not in ${_conditionType_} a.staffId not in
<foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1086,13 +1196,13 @@ ...@@ -1086,13 +1196,13 @@
${_conditionType_} a.staffName is null ${_conditionType_} a.staffName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('staffNameList')"> <if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
${_conditionType_} a.staffName in ${_conditionType_} a.staffName in
<foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('staffNameNotList')"> <if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
${_conditionType_} a.staffName not in ${_conditionType_} a.staffName not in
<foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1106,13 +1216,13 @@ ...@@ -1106,13 +1216,13 @@
${_conditionType_} a.deptId is null ${_conditionType_} a.deptId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdList')"> <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
${_conditionType_} a.deptId in ${_conditionType_} a.deptId in
<foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptIdNotList')"> <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
${_conditionType_} a.deptId not in ${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1134,13 +1244,13 @@ ...@@ -1134,13 +1244,13 @@
${_conditionType_} a.deptName is null ${_conditionType_} a.deptName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameList')"> <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in ${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deptNameNotList')"> <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in ${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1154,13 +1264,13 @@ ...@@ -1154,13 +1264,13 @@
${_conditionType_} a.backToUnit is null ${_conditionType_} a.backToUnit is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('backToUnitList')"> <if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
${_conditionType_} a.backToUnit in ${_conditionType_} a.backToUnit in
<foreach collection="conditionParamRef.backToUnitList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.backToUnitList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('backToUnitNotList')"> <if test="conditionParamRef.containsKey('backToUnitNotList') and conditionParamRef.backToUnitNotList.size() > 0">
${_conditionType_} a.backToUnit not in ${_conditionType_} a.backToUnit not in
<foreach collection="conditionParamRef.backToUnitNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.backToUnitNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1181,13 +1291,13 @@ ...@@ -1181,13 +1291,13 @@
${_conditionType_} a.onDutyLeave is null ${_conditionType_} a.onDutyLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('onDutyLeaveList')"> <if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
${_conditionType_} a.onDutyLeave in ${_conditionType_} a.onDutyLeave in
<foreach collection="conditionParamRef.onDutyLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('onDutyLeaveNotList')"> <if test="conditionParamRef.containsKey('onDutyLeaveNotList') and conditionParamRef.onDutyLeaveNotList.size() > 0">
${_conditionType_} a.onDutyLeave not in ${_conditionType_} a.onDutyLeave not in
<foreach collection="conditionParamRef.onDutyLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1208,13 +1318,13 @@ ...@@ -1208,13 +1318,13 @@
${_conditionType_} a.outOfOffice is null ${_conditionType_} a.outOfOffice is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('outOfOfficeList')"> <if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
${_conditionType_} a.outOfOffice in ${_conditionType_} a.outOfOffice in
<foreach collection="conditionParamRef.outOfOfficeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.outOfOfficeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('outOfOfficeNotList')"> <if test="conditionParamRef.containsKey('outOfOfficeNotList') and conditionParamRef.outOfOfficeNotList.size() > 0">
${_conditionType_} a.outOfOffice not in ${_conditionType_} a.outOfOffice not in
<foreach collection="conditionParamRef.outOfOfficeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.outOfOfficeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1235,13 +1345,13 @@ ...@@ -1235,13 +1345,13 @@
${_conditionType_} a.shiftCompensation is null ${_conditionType_} a.shiftCompensation is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('shiftCompensationList')"> <if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
${_conditionType_} a.shiftCompensation in ${_conditionType_} a.shiftCompensation in
<foreach collection="conditionParamRef.shiftCompensationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.shiftCompensationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('shiftCompensationNotList')"> <if test="conditionParamRef.containsKey('shiftCompensationNotList') and conditionParamRef.shiftCompensationNotList.size() > 0">
${_conditionType_} a.shiftCompensation not in ${_conditionType_} a.shiftCompensation not in
<foreach collection="conditionParamRef.shiftCompensationNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.shiftCompensationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1262,13 +1372,13 @@ ...@@ -1262,13 +1372,13 @@
${_conditionType_} a.physicalExamination is null ${_conditionType_} a.physicalExamination is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('physicalExaminationList')"> <if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
${_conditionType_} a.physicalExamination in ${_conditionType_} a.physicalExamination in
<foreach collection="conditionParamRef.physicalExaminationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.physicalExaminationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('physicalExaminationNotList')"> <if test="conditionParamRef.containsKey('physicalExaminationNotList') and conditionParamRef.physicalExaminationNotList.size() > 0">
${_conditionType_} a.physicalExamination not in ${_conditionType_} a.physicalExamination not in
<foreach collection="conditionParamRef.physicalExaminationNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.physicalExaminationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1289,13 +1399,13 @@ ...@@ -1289,13 +1399,13 @@
${_conditionType_} a.quarantine is null ${_conditionType_} a.quarantine is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('quarantineList')"> <if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
${_conditionType_} a.quarantine in ${_conditionType_} a.quarantine in
<foreach collection="conditionParamRef.quarantineList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.quarantineList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('quarantineNotList')"> <if test="conditionParamRef.containsKey('quarantineNotList') and conditionParamRef.quarantineNotList.size() > 0">
${_conditionType_} a.quarantine not in ${_conditionType_} a.quarantine not in
<foreach collection="conditionParamRef.quarantineNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.quarantineNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1316,13 +1426,13 @@ ...@@ -1316,13 +1426,13 @@
${_conditionType_} a.businessTrip is null ${_conditionType_} a.businessTrip is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('businessTripList')"> <if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
${_conditionType_} a.businessTrip in ${_conditionType_} a.businessTrip in
<foreach collection="conditionParamRef.businessTripList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.businessTripList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('businessTripNotList')"> <if test="conditionParamRef.containsKey('businessTripNotList') and conditionParamRef.businessTripNotList.size() > 0">
${_conditionType_} a.businessTrip not in ${_conditionType_} a.businessTrip not in
<foreach collection="conditionParamRef.businessTripNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.businessTripNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1343,13 +1453,13 @@ ...@@ -1343,13 +1453,13 @@
${_conditionType_} a.publicHoliday is null ${_conditionType_} a.publicHoliday is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('publicHolidayList')"> <if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
${_conditionType_} a.publicHoliday in ${_conditionType_} a.publicHoliday in
<foreach collection="conditionParamRef.publicHolidayList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.publicHolidayList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('publicHolidayNotList')"> <if test="conditionParamRef.containsKey('publicHolidayNotList') and conditionParamRef.publicHolidayNotList.size() > 0">
${_conditionType_} a.publicHoliday not in ${_conditionType_} a.publicHoliday not in
<foreach collection="conditionParamRef.publicHolidayNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.publicHolidayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1370,13 +1480,13 @@ ...@@ -1370,13 +1480,13 @@
${_conditionType_} a.sickLeave is null ${_conditionType_} a.sickLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sickLeaveList')"> <if test="conditionParamRef.containsKey('sickLeaveList') and conditionParamRef.sickLeaveList.size() > 0">
${_conditionType_} a.sickLeave in ${_conditionType_} a.sickLeave in
<foreach collection="conditionParamRef.sickLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sickLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sickLeaveNotList')"> <if test="conditionParamRef.containsKey('sickLeaveNotList') and conditionParamRef.sickLeaveNotList.size() > 0">
${_conditionType_} a.sickLeave not in ${_conditionType_} a.sickLeave not in
<foreach collection="conditionParamRef.sickLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sickLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1397,13 +1507,13 @@ ...@@ -1397,13 +1507,13 @@
${_conditionType_} a.funeralLeave is null ${_conditionType_} a.funeralLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('funeralLeaveList')"> <if test="conditionParamRef.containsKey('funeralLeaveList') and conditionParamRef.funeralLeaveList.size() > 0">
${_conditionType_} a.funeralLeave in ${_conditionType_} a.funeralLeave in
<foreach collection="conditionParamRef.funeralLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.funeralLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('funeralLeaveNotList')"> <if test="conditionParamRef.containsKey('funeralLeaveNotList') and conditionParamRef.funeralLeaveNotList.size() > 0">
${_conditionType_} a.funeralLeave not in ${_conditionType_} a.funeralLeave not in
<foreach collection="conditionParamRef.funeralLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.funeralLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1424,13 +1534,13 @@ ...@@ -1424,13 +1534,13 @@
${_conditionType_} a.marriageLeave is null ${_conditionType_} a.marriageLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveList')"> <if test="conditionParamRef.containsKey('marriageLeaveList') and conditionParamRef.marriageLeaveList.size() > 0">
${_conditionType_} a.marriageLeave in ${_conditionType_} a.marriageLeave in
<foreach collection="conditionParamRef.marriageLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.marriageLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveNotList')"> <if test="conditionParamRef.containsKey('marriageLeaveNotList') and conditionParamRef.marriageLeaveNotList.size() > 0">
${_conditionType_} a.marriageLeave not in ${_conditionType_} a.marriageLeave not in
<foreach collection="conditionParamRef.marriageLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.marriageLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1451,13 +1561,13 @@ ...@@ -1451,13 +1561,13 @@
${_conditionType_} a.childRearingLeave is null ${_conditionType_} a.childRearingLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('childRearingLeaveList')"> <if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
${_conditionType_} a.childRearingLeave in ${_conditionType_} a.childRearingLeave in
<foreach collection="conditionParamRef.childRearingLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.childRearingLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('childRearingLeaveNotList')"> <if test="conditionParamRef.containsKey('childRearingLeaveNotList') and conditionParamRef.childRearingLeaveNotList.size() > 0">
${_conditionType_} a.childRearingLeave not in ${_conditionType_} a.childRearingLeave not in
<foreach collection="conditionParamRef.childRearingLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.childRearingLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1478,13 +1588,13 @@ ...@@ -1478,13 +1588,13 @@
${_conditionType_} a.maternityLeave is null ${_conditionType_} a.maternityLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('maternityLeaveList')"> <if test="conditionParamRef.containsKey('maternityLeaveList') and conditionParamRef.maternityLeaveList.size() > 0">
${_conditionType_} a.maternityLeave in ${_conditionType_} a.maternityLeave in
<foreach collection="conditionParamRef.maternityLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.maternityLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('maternityLeaveNotList')"> <if test="conditionParamRef.containsKey('maternityLeaveNotList') and conditionParamRef.maternityLeaveNotList.size() > 0">
${_conditionType_} a.maternityLeave not in ${_conditionType_} a.maternityLeave not in
<foreach collection="conditionParamRef.maternityLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.maternityLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1505,13 +1615,13 @@ ...@@ -1505,13 +1615,13 @@
${_conditionType_} a.transferBack is null ${_conditionType_} a.transferBack is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('transferBackList')"> <if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
${_conditionType_} a.transferBack in ${_conditionType_} a.transferBack in
<foreach collection="conditionParamRef.transferBackList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.transferBackList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('transferBackNotList')"> <if test="conditionParamRef.containsKey('transferBackNotList') and conditionParamRef.transferBackNotList.size() > 0">
${_conditionType_} a.transferBack not in ${_conditionType_} a.transferBack not in
<foreach collection="conditionParamRef.transferBackNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.transferBackNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1532,13 +1642,13 @@ ...@@ -1532,13 +1642,13 @@
${_conditionType_} a.homeLeave is null ${_conditionType_} a.homeLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('homeLeaveList')"> <if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
${_conditionType_} a.homeLeave in ${_conditionType_} a.homeLeave in
<foreach collection="conditionParamRef.homeLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.homeLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('homeLeaveNotList')"> <if test="conditionParamRef.containsKey('homeLeaveNotList') and conditionParamRef.homeLeaveNotList.size() > 0">
${_conditionType_} a.homeLeave not in ${_conditionType_} a.homeLeave not in
<foreach collection="conditionParamRef.homeLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.homeLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1559,13 +1669,13 @@ ...@@ -1559,13 +1669,13 @@
${_conditionType_} a.personalLeave is null ${_conditionType_} a.personalLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('personalLeaveList')"> <if test="conditionParamRef.containsKey('personalLeaveList') and conditionParamRef.personalLeaveList.size() > 0">
${_conditionType_} a.personalLeave in ${_conditionType_} a.personalLeave in
<foreach collection="conditionParamRef.personalLeaveList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.personalLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('personalLeaveNotList')"> <if test="conditionParamRef.containsKey('personalLeaveNotList') and conditionParamRef.personalLeaveNotList.size() > 0">
${_conditionType_} a.personalLeave not in ${_conditionType_} a.personalLeave not in
<foreach collection="conditionParamRef.personalLeaveNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.personalLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1586,13 +1696,13 @@ ...@@ -1586,13 +1696,13 @@
${_conditionType_} a.absenteeismDays is null ${_conditionType_} a.absenteeismDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('absenteeismDaysList')"> <if test="conditionParamRef.containsKey('absenteeismDaysList') and conditionParamRef.absenteeismDaysList.size() > 0">
${_conditionType_} a.absenteeismDays in ${_conditionType_} a.absenteeismDays in
<foreach collection="conditionParamRef.absenteeismDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.absenteeismDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('absenteeismDaysNotList')"> <if test="conditionParamRef.containsKey('absenteeismDaysNotList') and conditionParamRef.absenteeismDaysNotList.size() > 0">
${_conditionType_} a.absenteeismDays not in ${_conditionType_} a.absenteeismDays not in
<foreach collection="conditionParamRef.absenteeismDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.absenteeismDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1613,13 +1723,13 @@ ...@@ -1613,13 +1723,13 @@
${_conditionType_} a.otherDays is null ${_conditionType_} a.otherDays is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('otherDaysList')"> <if test="conditionParamRef.containsKey('otherDaysList') and conditionParamRef.otherDaysList.size() > 0">
${_conditionType_} a.otherDays in ${_conditionType_} a.otherDays in
<foreach collection="conditionParamRef.otherDaysList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.otherDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('otherDaysNotList')"> <if test="conditionParamRef.containsKey('otherDaysNotList') and conditionParamRef.otherDaysNotList.size() > 0">
${_conditionType_} a.otherDays not in ${_conditionType_} a.otherDays not in
<foreach collection="conditionParamRef.otherDaysNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.otherDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1640,13 +1750,13 @@ ...@@ -1640,13 +1750,13 @@
${_conditionType_} a.attendanceRate is null ${_conditionType_} a.attendanceRate is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('attendanceRateList')"> <if test="conditionParamRef.containsKey('attendanceRateList') and conditionParamRef.attendanceRateList.size() > 0">
${_conditionType_} a.attendanceRate in ${_conditionType_} a.attendanceRate in
<foreach collection="conditionParamRef.attendanceRateList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attendanceRateList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('attendanceRateNotList')"> <if test="conditionParamRef.containsKey('attendanceRateNotList') and conditionParamRef.attendanceRateNotList.size() > 0">
${_conditionType_} a.attendanceRate not in ${_conditionType_} a.attendanceRate not in
<foreach collection="conditionParamRef.attendanceRateNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.attendanceRateNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1667,13 +1777,13 @@ ...@@ -1667,13 +1777,13 @@
${_conditionType_} a.nonCompliancePunch is null ${_conditionType_} a.nonCompliancePunch is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nonCompliancePunchList')"> <if test="conditionParamRef.containsKey('nonCompliancePunchList') and conditionParamRef.nonCompliancePunchList.size() > 0">
${_conditionType_} a.nonCompliancePunch in ${_conditionType_} a.nonCompliancePunch in
<foreach collection="conditionParamRef.nonCompliancePunchList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonCompliancePunchList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nonCompliancePunchNotList')"> <if test="conditionParamRef.containsKey('nonCompliancePunchNotList') and conditionParamRef.nonCompliancePunchNotList.size() > 0">
${_conditionType_} a.nonCompliancePunch not in ${_conditionType_} a.nonCompliancePunch not in
<foreach collection="conditionParamRef.nonCompliancePunchNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonCompliancePunchNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1694,13 +1804,13 @@ ...@@ -1694,13 +1804,13 @@
${_conditionType_} a.lateTimes is null ${_conditionType_} a.lateTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('lateTimesList')"> <if test="conditionParamRef.containsKey('lateTimesList') and conditionParamRef.lateTimesList.size() > 0">
${_conditionType_} a.lateTimes in ${_conditionType_} a.lateTimes in
<foreach collection="conditionParamRef.lateTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lateTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('lateTimesNotList')"> <if test="conditionParamRef.containsKey('lateTimesNotList') and conditionParamRef.lateTimesNotList.size() > 0">
${_conditionType_} a.lateTimes not in ${_conditionType_} a.lateTimes not in
<foreach collection="conditionParamRef.lateTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lateTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1721,13 +1831,13 @@ ...@@ -1721,13 +1831,13 @@
${_conditionType_} a.surfingMobileTimes is null ${_conditionType_} a.surfingMobileTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('surfingMobileTimesList')"> <if test="conditionParamRef.containsKey('surfingMobileTimesList') and conditionParamRef.surfingMobileTimesList.size() > 0">
${_conditionType_} a.surfingMobileTimes in ${_conditionType_} a.surfingMobileTimes in
<foreach collection="conditionParamRef.surfingMobileTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.surfingMobileTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('surfingMobileTimesNotList')"> <if test="conditionParamRef.containsKey('surfingMobileTimesNotList') and conditionParamRef.surfingMobileTimesNotList.size() > 0">
${_conditionType_} a.surfingMobileTimes not in ${_conditionType_} a.surfingMobileTimes not in
<foreach collection="conditionParamRef.surfingMobileTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.surfingMobileTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1748,13 +1858,13 @@ ...@@ -1748,13 +1858,13 @@
${_conditionType_} a.overtimeTimes is null ${_conditionType_} a.overtimeTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('overtimeTimesList')"> <if test="conditionParamRef.containsKey('overtimeTimesList') and conditionParamRef.overtimeTimesList.size() > 0">
${_conditionType_} a.overtimeTimes in ${_conditionType_} a.overtimeTimes in
<foreach collection="conditionParamRef.overtimeTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.overtimeTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('overtimeTimesNotList')"> <if test="conditionParamRef.containsKey('overtimeTimesNotList') and conditionParamRef.overtimeTimesNotList.size() > 0">
${_conditionType_} a.overtimeTimes not in ${_conditionType_} a.overtimeTimes not in
<foreach collection="conditionParamRef.overtimeTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.overtimeTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1775,13 +1885,13 @@ ...@@ -1775,13 +1885,13 @@
${_conditionType_} a.vacancy is null ${_conditionType_} a.vacancy is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('vacancyList')"> <if test="conditionParamRef.containsKey('vacancyList') and conditionParamRef.vacancyList.size() > 0">
${_conditionType_} a.vacancy in ${_conditionType_} a.vacancy in
<foreach collection="conditionParamRef.vacancyList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.vacancyList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('vacancyNotList')"> <if test="conditionParamRef.containsKey('vacancyNotList') and conditionParamRef.vacancyNotList.size() > 0">
${_conditionType_} a.vacancy not in ${_conditionType_} a.vacancy not in
<foreach collection="conditionParamRef.vacancyNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.vacancyNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1802,13 +1912,13 @@ ...@@ -1802,13 +1912,13 @@
${_conditionType_} a.nonStandardDressTimes is null ${_conditionType_} a.nonStandardDressTimes is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nonStandardDressTimesList')"> <if test="conditionParamRef.containsKey('nonStandardDressTimesList') and conditionParamRef.nonStandardDressTimesList.size() > 0">
${_conditionType_} a.nonStandardDressTimes in ${_conditionType_} a.nonStandardDressTimes in
<foreach collection="conditionParamRef.nonStandardDressTimesList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonStandardDressTimesList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nonStandardDressTimesNotList')"> <if test="conditionParamRef.containsKey('nonStandardDressTimesNotList') and conditionParamRef.nonStandardDressTimesNotList.size() > 0">
${_conditionType_} a.nonStandardDressTimes not in ${_conditionType_} a.nonStandardDressTimes not in
<foreach collection="conditionParamRef.nonStandardDressTimesNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nonStandardDressTimesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1829,13 +1939,13 @@ ...@@ -1829,13 +1939,13 @@
${_conditionType_} a.unexcusedMeetingAbsence is null ${_conditionType_} a.unexcusedMeetingAbsence is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceList')"> <if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceList') and conditionParamRef.unexcusedMeetingAbsenceList.size() > 0">
${_conditionType_} a.unexcusedMeetingAbsence in ${_conditionType_} a.unexcusedMeetingAbsence in
<foreach collection="conditionParamRef.unexcusedMeetingAbsenceList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.unexcusedMeetingAbsenceList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceNotList')"> <if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceNotList') and conditionParamRef.unexcusedMeetingAbsenceNotList.size() > 0">
${_conditionType_} a.unexcusedMeetingAbsence not in ${_conditionType_} a.unexcusedMeetingAbsence not in
<foreach collection="conditionParamRef.unexcusedMeetingAbsenceNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.unexcusedMeetingAbsenceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1856,13 +1966,13 @@ ...@@ -1856,13 +1966,13 @@
${_conditionType_} a.earlyLeaveMeeting is null ${_conditionType_} a.earlyLeaveMeeting is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('earlyLeaveMeetingList')"> <if test="conditionParamRef.containsKey('earlyLeaveMeetingList') and conditionParamRef.earlyLeaveMeetingList.size() > 0">
${_conditionType_} a.earlyLeaveMeeting in ${_conditionType_} a.earlyLeaveMeeting in
<foreach collection="conditionParamRef.earlyLeaveMeetingList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.earlyLeaveMeetingList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('earlyLeaveMeetingNotList')"> <if test="conditionParamRef.containsKey('earlyLeaveMeetingNotList') and conditionParamRef.earlyLeaveMeetingNotList.size() > 0">
${_conditionType_} a.earlyLeaveMeeting not in ${_conditionType_} a.earlyLeaveMeeting not in
<foreach collection="conditionParamRef.earlyLeaveMeetingNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.earlyLeaveMeetingNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1883,13 +1993,13 @@ ...@@ -1883,13 +1993,13 @@
${_conditionType_} a.year is null ${_conditionType_} a.year is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('yearList')"> <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
${_conditionType_} a.year in ${_conditionType_} a.year in
<foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('yearNotList')"> <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
${_conditionType_} a.year not in ${_conditionType_} a.year not in
<foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1910,13 +2020,13 @@ ...@@ -1910,13 +2020,13 @@
${_conditionType_} a.month is null ${_conditionType_} a.month is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('monthList')"> <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
${_conditionType_} a.month in ${_conditionType_} a.month in
<foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('monthNotList')"> <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
${_conditionType_} a.month not in ${_conditionType_} a.month not in
<foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1937,13 +2047,13 @@ ...@@ -1937,13 +2047,13 @@
${_conditionType_} a.day is null ${_conditionType_} a.day is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('dayList')"> <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
${_conditionType_} a.day in ${_conditionType_} a.day in
<foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('dayNotList')"> <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
${_conditionType_} a.day not in ${_conditionType_} a.day not in
<foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1965,13 +2075,13 @@ ...@@ -1965,13 +2075,13 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList')"> <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in ${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -1985,13 +2095,13 @@ ...@@ -1985,13 +2095,13 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -2027,13 +2137,13 @@ ...@@ -2027,13 +2137,13 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')"> <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -2061,6 +2171,141 @@ ...@@ -2061,6 +2171,141 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <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') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDays')">
<if test="conditionParamRef.breastfeedingLeaveDays != null ">
${_conditionType_} a.breastfeedingLeaveDays = #{${_conditionParam_}.breastfeedingLeaveDays}
</if>
<if test="conditionParamRef.breastfeedingLeaveDays == null">
${_conditionType_} a.breastfeedingLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysList') and conditionParamRef.breastfeedingLeaveDaysList.size() > 0">
${_conditionType_} a.breastfeedingLeaveDays in
<foreach collection="conditionParamRef.breastfeedingLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysNotList') and conditionParamRef.breastfeedingLeaveDaysNotList.size() > 0">
${_conditionType_} a.breastfeedingLeaveDays not in
<foreach collection="conditionParamRef.breastfeedingLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysStart') and conditionParamRef.breastfeedingLeaveDaysStart != null">
${_conditionType_} a.breastfeedingLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.breastfeedingLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysEnd') and conditionParamRef.breastfeedingLeaveDaysEnd != null">
${_conditionType_} a.breastfeedingLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.breastfeedingLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDays')">
<if test="conditionParamRef.menstrualLeaveDays != null ">
${_conditionType_} a.menstrualLeaveDays = #{${_conditionParam_}.menstrualLeaveDays}
</if>
<if test="conditionParamRef.menstrualLeaveDays == null">
${_conditionType_} a.menstrualLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysList') and conditionParamRef.menstrualLeaveDaysList.size() > 0">
${_conditionType_} a.menstrualLeaveDays in
<foreach collection="conditionParamRef.menstrualLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysNotList') and conditionParamRef.menstrualLeaveDaysNotList.size() > 0">
${_conditionType_} a.menstrualLeaveDays not in
<foreach collection="conditionParamRef.menstrualLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysStart') and conditionParamRef.menstrualLeaveDaysStart != null">
${_conditionType_} a.menstrualLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.menstrualLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysEnd') and conditionParamRef.menstrualLeaveDaysEnd != null">
${_conditionType_} a.menstrualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.menstrualLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('annualLeaveDays')">
<if test="conditionParamRef.annualLeaveDays != null ">
${_conditionType_} a.annualLeaveDays = #{${_conditionParam_}.annualLeaveDays}
</if>
<if test="conditionParamRef.annualLeaveDays == null">
${_conditionType_} a.annualLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysList') and conditionParamRef.annualLeaveDaysList.size() > 0">
${_conditionType_} a.annualLeaveDays in
<foreach collection="conditionParamRef.annualLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysNotList') and conditionParamRef.annualLeaveDaysNotList.size() > 0">
${_conditionType_} a.annualLeaveDays not in
<foreach collection="conditionParamRef.annualLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysStart') and conditionParamRef.annualLeaveDaysStart != null">
${_conditionType_} a.annualLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.annualLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysEnd') and conditionParamRef.annualLeaveDaysEnd != null">
${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDays')">
<if test="conditionParamRef.compensatedLeaveDays != null ">
${_conditionType_} a.compensatedLeaveDays = #{${_conditionParam_}.compensatedLeaveDays}
</if>
<if test="conditionParamRef.compensatedLeaveDays == null">
${_conditionType_} a.compensatedLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysList') and conditionParamRef.compensatedLeaveDaysList.size() > 0">
${_conditionType_} a.compensatedLeaveDays in
<foreach collection="conditionParamRef.compensatedLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysNotList') and conditionParamRef.compensatedLeaveDaysNotList.size() > 0">
${_conditionType_} a.compensatedLeaveDays not in
<foreach collection="conditionParamRef.compensatedLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysStart') and conditionParamRef.compensatedLeaveDaysStart != null">
${_conditionType_} a.compensatedLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.compensatedLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysEnd') and conditionParamRef.compensatedLeaveDaysEnd != null">
${_conditionType_} a.compensatedLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.compensatedLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDays')">
<if test="conditionParamRef.paternityLeaveDays != null ">
${_conditionType_} a.paternityLeaveDays = #{${_conditionParam_}.paternityLeaveDays}
</if>
<if test="conditionParamRef.paternityLeaveDays == null">
${_conditionType_} a.paternityLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysList') and conditionParamRef.paternityLeaveDaysList.size() > 0">
${_conditionType_} a.paternityLeaveDays in
<foreach collection="conditionParamRef.paternityLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysNotList') and conditionParamRef.paternityLeaveDaysNotList.size() > 0">
${_conditionType_} a.paternityLeaveDays not in
<foreach collection="conditionParamRef.paternityLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysStart') and conditionParamRef.paternityLeaveDaysStart != null">
${_conditionType_} a.paternityLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.paternityLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysEnd') and conditionParamRef.paternityLeaveDaysEnd != null">
${_conditionType_} a.paternityLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.paternityLeaveDaysEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -2279,6 +2524,31 @@ ...@@ -2279,6 +2524,31 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('breastfeedingLeaveDays')">
a.breastfeedingLeaveDays
<if test='orderCol.breastfeedingLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.breastfeedingLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('menstrualLeaveDays')">
a.menstrualLeaveDays
<if test='orderCol.menstrualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.menstrualLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('annualLeaveDays')">
a.annualLeaveDays
<if test='orderCol.annualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.annualLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('compensatedLeaveDays')">
a.compensatedLeaveDays
<if test='orderCol.compensatedLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.compensatedLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paternityLeaveDays')">
a.paternityLeaveDays
<if test='orderCol.paternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.paternityLeaveDays)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationBalanceMapper.xml
View file @ 56b22778
...@@ -15,17 +15,28 @@ ...@@ -15,17 +15,28 @@
<result property="compensatedLeaveDays" column="compensatedLeaveDays" /> <result property="compensatedLeaveDays" column="compensatedLeaveDays" />
<result property="sickLeaveDays" column="sickLeaveDays" /> <result property="sickLeaveDays" column="sickLeaveDays" />
<result property="annualLeaveDays" column="annualLeaveDays" /> <result property="annualLeaveDays" column="annualLeaveDays" />
<result property="maternityLeaveDays" column="maternityLeaveDays" />
<result property="paternityLeaveDays" column="paternityLeaveDays" />
<result property="marriageLeaveDays" column="marriageLeaveDays" /> <result property="marriageLeaveDays" column="marriageLeaveDays" />
<result property="menstrualLeaveDays" column="menstrualLeaveDays" />
<result property="breastfeedingLeaveDays" column="breastfeedingLeaveDays" />
<result property="bereavementLeaveDays" column="bereavementLeaveDays" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="maternityLeaveDays" column="maternityLeaveDays" />
<result property="paternityLeaveDays" column="paternityLeaveDays" />
<result property="menstrualLeaveDays" column="menstrualLeaveDays" />
<result property="breastfeedingLeaveDays" column="breastfeedingLeaveDays" />
<result property="bereavementLeaveDays" column="bereavementLeaveDays" />
<result property="backToUnit" column="backToUnit" />
<result property="onDutyLeave" column="onDutyLeave" />
<result property="outOfOffice" column="outOfOffice" />
<result property="shiftCompensation" column="shiftCompensation" />
<result property="physicalExamination" column="physicalExamination" />
<result property="quarantine" column="quarantine" />
<result property="businessTrip" column="businessTrip" />
<result property="publicHoliday" column="publicHoliday" />
<result property="childRearingLeave" column="childRearingLeave" />
<result property="transferBack" column="transferBack" />
<result property="homeLeave" column="homeLeave" />
</resultMap> </resultMap>
...@@ -63,15 +74,30 @@ ...@@ -63,15 +74,30 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annualLeaveDays') or colPickMode == 1 and data.containsKey('annualLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annualLeaveDays') or colPickMode == 1 and data.containsKey('annualLeaveDays')))">
a.annualLeaveDays, a.annualLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('marriageLeaveDays') or colPickMode == 1 and data.containsKey('marriageLeaveDays')))">
a.marriageLeaveDays,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<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('maternityLeaveDays') or colPickMode == 1 and data.containsKey('maternityLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('maternityLeaveDays') or colPickMode == 1 and data.containsKey('maternityLeaveDays')))">
a.maternityLeaveDays, a.maternityLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paternityLeaveDays') or colPickMode == 1 and data.containsKey('paternityLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paternityLeaveDays') or colPickMode == 1 and data.containsKey('paternityLeaveDays')))">
a.paternityLeaveDays, a.paternityLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('marriageLeaveDays') or colPickMode == 1 and data.containsKey('marriageLeaveDays')))">
a.marriageLeaveDays,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menstrualLeaveDays') or colPickMode == 1 and data.containsKey('menstrualLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menstrualLeaveDays') or colPickMode == 1 and data.containsKey('menstrualLeaveDays')))">
a.menstrualLeaveDays, a.menstrualLeaveDays,
</if> </if>
...@@ -81,38 +107,56 @@ ...@@ -81,38 +107,56 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bereavementLeaveDays') or colPickMode == 1 and data.containsKey('bereavementLeaveDays')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bereavementLeaveDays') or colPickMode == 1 and data.containsKey('bereavementLeaveDays')))">
a.bereavementLeaveDays, a.bereavementLeaveDays,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('backToUnit') or colPickMode == 1 and data.containsKey('backToUnit')))">
a.remark, a.backToUnit,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onDutyLeave') or colPickMode == 1 and data.containsKey('onDutyLeave')))">
a.createUserId, a.onDutyLeave,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('outOfOffice') or colPickMode == 1 and data.containsKey('outOfOffice')))">
a.createTime, a.outOfOffice,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shiftCompensation') or colPickMode == 1 and data.containsKey('shiftCompensation')))">
a.updateUserId, a.shiftCompensation,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('physicalExamination') or colPickMode == 1 and data.containsKey('physicalExamination')))">
a.updateTime, a.physicalExamination,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('quarantine') or colPickMode == 1 and data.containsKey('quarantine')))">
a.quarantine,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessTrip') or colPickMode == 1 and data.containsKey('businessTrip')))">
a.businessTrip,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('publicHoliday') or colPickMode == 1 and data.containsKey('publicHoliday')))">
a.publicHoliday,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('childRearingLeave') or colPickMode == 1 and data.containsKey('childRearingLeave')))">
a.childRearingLeave,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('transferBack') or colPickMode == 1 and data.containsKey('transferBack')))">
a.transferBack,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('homeLeave') or colPickMode == 1 and data.containsKey('homeLeave')))">
a.homeLeave,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceVacationBalanceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceVacationBalanceEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_vacation_balance insert into mortals_xhx_attendance_vacation_balance
(staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,maternityLeaveDays,paternityLeaveDays,marriageLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave)
VALUES VALUES
(#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{maternityLeaveDays},#{paternityLeaveDays},#{marriageLeaveDays},#{menstrualLeaveDays},#{breastfeedingLeaveDays},#{bereavementLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{staffId},#{staffName},#{deptId},#{deptName},#{entryTime},#{personalLeaveDays},#{compensatedLeaveDays},#{sickLeaveDays},#{annualLeaveDays},#{marriageLeaveDays},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{maternityLeaveDays},#{paternityLeaveDays},#{menstrualLeaveDays},#{breastfeedingLeaveDays},#{bereavementLeaveDays},#{backToUnit},#{onDutyLeave},#{outOfOffice},#{shiftCompensation},#{physicalExamination},#{quarantine},#{businessTrip},#{publicHoliday},#{childRearingLeave},#{transferBack},#{homeLeave})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_vacation_balance insert into mortals_xhx_attendance_vacation_balance
(staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,maternityLeaveDays,paternityLeaveDays,marriageLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,remark,createUserId,createTime,updateUserId,updateTime) (staffId,staffName,deptId,deptName,entryTime,personalLeaveDays,compensatedLeaveDays,sickLeaveDays,annualLeaveDays,marriageLeaveDays,remark,createUserId,createTime,updateUserId,updateTime,maternityLeaveDays,paternityLeaveDays,menstrualLeaveDays,breastfeedingLeaveDays,bereavementLeaveDays,backToUnit,onDutyLeave,outOfOffice,shiftCompensation,physicalExamination,quarantine,businessTrip,publicHoliday,childRearingLeave,transferBack,homeLeave)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.entryTime},#{item.personalLeaveDays},#{item.compensatedLeaveDays},#{item.sickLeaveDays},#{item.annualLeaveDays},#{item.maternityLeaveDays},#{item.paternityLeaveDays},#{item.marriageLeaveDays},#{item.menstrualLeaveDays},#{item.breastfeedingLeaveDays},#{item.bereavementLeaveDays},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.staffId},#{item.staffName},#{item.deptId},#{item.deptName},#{item.entryTime},#{item.personalLeaveDays},#{item.compensatedLeaveDays},#{item.sickLeaveDays},#{item.annualLeaveDays},#{item.marriageLeaveDays},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.maternityLeaveDays},#{item.paternityLeaveDays},#{item.menstrualLeaveDays},#{item.breastfeedingLeaveDays},#{item.bereavementLeaveDays},#{item.backToUnit},#{item.onDutyLeave},#{item.outOfOffice},#{item.shiftCompensation},#{item.physicalExamination},#{item.quarantine},#{item.businessTrip},#{item.publicHoliday},#{item.childRearingLeave},#{item.transferBack},#{item.homeLeave})
</foreach> </foreach>
</insert> </insert>
...@@ -167,6 +211,33 @@ ...@@ -167,6 +211,33 @@
<if test="(colPickMode==0 and data.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('annualLeaveDaysIncrement'))"> <if test="(colPickMode==0 and data.containsKey('annualLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('annualLeaveDaysIncrement'))">
a.annualLeaveDays=ifnull(a.annualLeaveDays,0) + #{data.annualLeaveDaysIncrement}, a.annualLeaveDays=ifnull(a.annualLeaveDays,0) + #{data.annualLeaveDaysIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDays')) or (colPickMode==1 and !data.containsKey('marriageLeaveDays'))">
a.marriageLeaveDays=#{data.marriageLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('marriageLeaveDaysIncrement'))">
a.marriageLeaveDays=ifnull(a.marriageLeaveDays,0) + #{data.marriageLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<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('maternityLeaveDays')) or (colPickMode==1 and !data.containsKey('maternityLeaveDays'))"> <if test="(colPickMode==0 and data.containsKey('maternityLeaveDays')) or (colPickMode==1 and !data.containsKey('maternityLeaveDays'))">
a.maternityLeaveDays=#{data.maternityLeaveDays}, a.maternityLeaveDays=#{data.maternityLeaveDays},
</if> </if>
...@@ -179,12 +250,6 @@ ...@@ -179,12 +250,6 @@
<if test="(colPickMode==0 and data.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('paternityLeaveDaysIncrement'))"> <if test="(colPickMode==0 and data.containsKey('paternityLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('paternityLeaveDaysIncrement'))">
a.paternityLeaveDays=ifnull(a.paternityLeaveDays,0) + #{data.paternityLeaveDaysIncrement}, a.paternityLeaveDays=ifnull(a.paternityLeaveDays,0) + #{data.paternityLeaveDaysIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDays')) or (colPickMode==1 and !data.containsKey('marriageLeaveDays'))">
a.marriageLeaveDays=#{data.marriageLeaveDays},
</if>
<if test="(colPickMode==0 and data.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('marriageLeaveDaysIncrement'))">
a.marriageLeaveDays=ifnull(a.marriageLeaveDays,0) + #{data.marriageLeaveDaysIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDays'))"> <if test="(colPickMode==0 and data.containsKey('menstrualLeaveDays')) or (colPickMode==1 and !data.containsKey('menstrualLeaveDays'))">
a.menstrualLeaveDays=#{data.menstrualLeaveDays}, a.menstrualLeaveDays=#{data.menstrualLeaveDays},
</if> </if>
...@@ -203,26 +268,71 @@ ...@@ -203,26 +268,71 @@
<if test="(colPickMode==0 and data.containsKey('bereavementLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('bereavementLeaveDaysIncrement'))"> <if test="(colPickMode==0 and data.containsKey('bereavementLeaveDaysIncrement')) or (colPickMode==1 and !data.containsKey('bereavementLeaveDaysIncrement'))">
a.bereavementLeaveDays=ifnull(a.bereavementLeaveDays,0) + #{data.bereavementLeaveDaysIncrement}, a.bereavementLeaveDays=ifnull(a.bereavementLeaveDays,0) + #{data.bereavementLeaveDaysIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('backToUnit')) or (colPickMode==1 and !data.containsKey('backToUnit'))">
a.remark=#{data.remark}, a.backToUnit=#{data.backToUnit},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))"> <if test="(colPickMode==0 and data.containsKey('backToUnitIncrement')) or (colPickMode==1 and !data.containsKey('backToUnitIncrement'))">
a.createUserId=#{data.createUserId}, a.backToUnit=ifnull(a.backToUnit,0) + #{data.backToUnitIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('onDutyLeave')) or (colPickMode==1 and !data.containsKey('onDutyLeave'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement}, a.onDutyLeave=#{data.onDutyLeave},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('onDutyLeaveIncrement')) or (colPickMode==1 and !data.containsKey('onDutyLeaveIncrement'))">
a.createTime=#{data.createTime}, a.onDutyLeave=ifnull(a.onDutyLeave,0) + #{data.onDutyLeaveIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))"> <if test="(colPickMode==0 and data.containsKey('outOfOffice')) or (colPickMode==1 and !data.containsKey('outOfOffice'))">
a.updateUserId=#{data.updateUserId}, a.outOfOffice=#{data.outOfOffice},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('outOfOfficeIncrement')) or (colPickMode==1 and !data.containsKey('outOfOfficeIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement}, a.outOfOffice=ifnull(a.outOfOffice,0) + #{data.outOfOfficeIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('shiftCompensation')) or (colPickMode==1 and !data.containsKey('shiftCompensation'))">
a.updateTime=#{data.updateTime}, a.shiftCompensation=#{data.shiftCompensation},
</if>
<if test="(colPickMode==0 and data.containsKey('shiftCompensationIncrement')) or (colPickMode==1 and !data.containsKey('shiftCompensationIncrement'))">
a.shiftCompensation=ifnull(a.shiftCompensation,0) + #{data.shiftCompensationIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('physicalExamination')) or (colPickMode==1 and !data.containsKey('physicalExamination'))">
a.physicalExamination=#{data.physicalExamination},
</if>
<if test="(colPickMode==0 and data.containsKey('physicalExaminationIncrement')) or (colPickMode==1 and !data.containsKey('physicalExaminationIncrement'))">
a.physicalExamination=ifnull(a.physicalExamination,0) + #{data.physicalExaminationIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('quarantine')) or (colPickMode==1 and !data.containsKey('quarantine'))">
a.quarantine=#{data.quarantine},
</if>
<if test="(colPickMode==0 and data.containsKey('quarantineIncrement')) or (colPickMode==1 and !data.containsKey('quarantineIncrement'))">
a.quarantine=ifnull(a.quarantine,0) + #{data.quarantineIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('businessTrip')) or (colPickMode==1 and !data.containsKey('businessTrip'))">
a.businessTrip=#{data.businessTrip},
</if>
<if test="(colPickMode==0 and data.containsKey('businessTripIncrement')) or (colPickMode==1 and !data.containsKey('businessTripIncrement'))">
a.businessTrip=ifnull(a.businessTrip,0) + #{data.businessTripIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('publicHoliday')) or (colPickMode==1 and !data.containsKey('publicHoliday'))">
a.publicHoliday=#{data.publicHoliday},
</if>
<if test="(colPickMode==0 and data.containsKey('publicHolidayIncrement')) or (colPickMode==1 and !data.containsKey('publicHolidayIncrement'))">
a.publicHoliday=ifnull(a.publicHoliday,0) + #{data.publicHolidayIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('childRearingLeave')) or (colPickMode==1 and !data.containsKey('childRearingLeave'))">
a.childRearingLeave=#{data.childRearingLeave},
</if>
<if test="(colPickMode==0 and data.containsKey('childRearingLeaveIncrement')) or (colPickMode==1 and !data.containsKey('childRearingLeaveIncrement'))">
a.childRearingLeave=ifnull(a.childRearingLeave,0) + #{data.childRearingLeaveIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('transferBack')) or (colPickMode==1 and !data.containsKey('transferBack'))">
a.transferBack=#{data.transferBack},
</if>
<if test="(colPickMode==0 and data.containsKey('transferBackIncrement')) or (colPickMode==1 and !data.containsKey('transferBackIncrement'))">
a.transferBack=ifnull(a.transferBack,0) + #{data.transferBackIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('homeLeave')) or (colPickMode==1 and !data.containsKey('homeLeave'))">
a.homeLeave=#{data.homeLeave},
</if>
<if test="(colPickMode==0 and data.containsKey('homeLeaveIncrement')) or (colPickMode==1 and !data.containsKey('homeLeaveIncrement'))">
a.homeLeave=ifnull(a.homeLeave,0) + #{data.homeLeaveIncrement},
</if> </if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
...@@ -329,6 +439,63 @@ ...@@ -329,6 +439,63 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="marriageLeaveDays=(case" suffix="ELSE marriageLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDays')) or (colPickMode==1 and !item.containsKey('marriageLeaveDays'))">
when a.id=#{item.id} then #{item.marriageLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('marriageLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.marriageLeaveDays,0) + #{item.marriageLeaveDaysIncrement}
</when>
</choose>
</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'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
<trim prefix="maternityLeaveDays=(case" suffix="ELSE maternityLeaveDays end),"> <trim prefix="maternityLeaveDays=(case" suffix="ELSE maternityLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -353,18 +520,6 @@ ...@@ -353,18 +520,6 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="marriageLeaveDays=(case" suffix="ELSE marriageLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDays')) or (colPickMode==1 and !item.containsKey('marriageLeaveDays'))">
when a.id=#{item.id} then #{item.marriageLeaveDays}
</when>
<when test="(colPickMode==0 and item.containsKey('marriageLeaveDaysIncrement')) or (colPickMode==1 and !item.containsKey('marriageLeaveDaysIncrement'))">
when a.id=#{item.id} then ifnull(a.marriageLeaveDays,0) + #{item.marriageLeaveDaysIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="menstrualLeaveDays=(case" suffix="ELSE menstrualLeaveDays end),"> <trim prefix="menstrualLeaveDays=(case" suffix="ELSE menstrualLeaveDays end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -401,49 +556,136 @@ ...@@ -401,49 +556,136 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="remark=(case" suffix="ELSE remark end),"> <trim prefix="backToUnit=(case" suffix="ELSE backToUnit end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))"> <choose>
when a.id=#{item.id} then #{item.remark} <when test="(colPickMode==0 and item.containsKey('backToUnit')) or (colPickMode==1 and !item.containsKey('backToUnit'))">
</if> when a.id=#{item.id} then #{item.backToUnit}
</when>
<when test="(colPickMode==0 and item.containsKey('backToUnitIncrement')) or (colPickMode==1 and !item.containsKey('backToUnitIncrement'))">
when a.id=#{item.id} then ifnull(a.backToUnit,0) + #{item.backToUnitIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="onDutyLeave=(case" suffix="ELSE onDutyLeave end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('onDutyLeave')) or (colPickMode==1 and !item.containsKey('onDutyLeave'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.onDutyLeave}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('onDutyLeaveIncrement')) or (colPickMode==1 and !item.containsKey('onDutyLeaveIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.onDutyLeave,0) + #{item.onDutyLeaveIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="outOfOffice=(case" suffix="ELSE outOfOffice end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <choose>
when a.id=#{item.id} then #{item.createTime} <when test="(colPickMode==0 and item.containsKey('outOfOffice')) or (colPickMode==1 and !item.containsKey('outOfOffice'))">
</if> when a.id=#{item.id} then #{item.outOfOffice}
</when>
<when test="(colPickMode==0 and item.containsKey('outOfOfficeIncrement')) or (colPickMode==1 and !item.containsKey('outOfOfficeIncrement'))">
when a.id=#{item.id} then ifnull(a.outOfOffice,0) + #{item.outOfOfficeIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> <trim prefix="shiftCompensation=(case" suffix="ELSE shiftCompensation end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> <when test="(colPickMode==0 and item.containsKey('shiftCompensation')) or (colPickMode==1 and !item.containsKey('shiftCompensation'))">
when a.id=#{item.id} then #{item.updateUserId} when a.id=#{item.id} then #{item.shiftCompensation}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('shiftCompensationIncrement')) or (colPickMode==1 and !item.containsKey('shiftCompensationIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} when a.id=#{item.id} then ifnull(a.shiftCompensation,0) + #{item.shiftCompensationIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="physicalExamination=(case" suffix="ELSE physicalExamination end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <choose>
when a.id=#{item.id} then #{item.updateTime} <when test="(colPickMode==0 and item.containsKey('physicalExamination')) or (colPickMode==1 and !item.containsKey('physicalExamination'))">
</if> when a.id=#{item.id} then #{item.physicalExamination}
</when>
<when test="(colPickMode==0 and item.containsKey('physicalExaminationIncrement')) or (colPickMode==1 and !item.containsKey('physicalExaminationIncrement'))">
when a.id=#{item.id} then ifnull(a.physicalExamination,0) + #{item.physicalExaminationIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="quarantine=(case" suffix="ELSE quarantine end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('quarantine')) or (colPickMode==1 and !item.containsKey('quarantine'))">
when a.id=#{item.id} then #{item.quarantine}
</when>
<when test="(colPickMode==0 and item.containsKey('quarantineIncrement')) or (colPickMode==1 and !item.containsKey('quarantineIncrement'))">
when a.id=#{item.id} then ifnull(a.quarantine,0) + #{item.quarantineIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="businessTrip=(case" suffix="ELSE businessTrip end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('businessTrip')) or (colPickMode==1 and !item.containsKey('businessTrip'))">
when a.id=#{item.id} then #{item.businessTrip}
</when>
<when test="(colPickMode==0 and item.containsKey('businessTripIncrement')) or (colPickMode==1 and !item.containsKey('businessTripIncrement'))">
when a.id=#{item.id} then ifnull(a.businessTrip,0) + #{item.businessTripIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="publicHoliday=(case" suffix="ELSE publicHoliday end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('publicHoliday')) or (colPickMode==1 and !item.containsKey('publicHoliday'))">
when a.id=#{item.id} then #{item.publicHoliday}
</when>
<when test="(colPickMode==0 and item.containsKey('publicHolidayIncrement')) or (colPickMode==1 and !item.containsKey('publicHolidayIncrement'))">
when a.id=#{item.id} then ifnull(a.publicHoliday,0) + #{item.publicHolidayIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="childRearingLeave=(case" suffix="ELSE childRearingLeave end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('childRearingLeave')) or (colPickMode==1 and !item.containsKey('childRearingLeave'))">
when a.id=#{item.id} then #{item.childRearingLeave}
</when>
<when test="(colPickMode==0 and item.containsKey('childRearingLeaveIncrement')) or (colPickMode==1 and !item.containsKey('childRearingLeaveIncrement'))">
when a.id=#{item.id} then ifnull(a.childRearingLeave,0) + #{item.childRearingLeaveIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="transferBack=(case" suffix="ELSE transferBack end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('transferBack')) or (colPickMode==1 and !item.containsKey('transferBack'))">
when a.id=#{item.id} then #{item.transferBack}
</when>
<when test="(colPickMode==0 and item.containsKey('transferBackIncrement')) or (colPickMode==1 and !item.containsKey('transferBackIncrement'))">
when a.id=#{item.id} then ifnull(a.transferBack,0) + #{item.transferBackIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="homeLeave=(case" suffix="ELSE homeLeave end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('homeLeave')) or (colPickMode==1 and !item.containsKey('homeLeave'))">
when a.id=#{item.id} then #{item.homeLeave}
</when>
<when test="(colPickMode==0 and item.containsKey('homeLeaveIncrement')) or (colPickMode==1 and !item.containsKey('homeLeaveIncrement'))">
when a.id=#{item.id} then ifnull(a.homeLeave,0) + #{item.homeLeaveIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
</trim> </trim>
...@@ -808,8 +1050,140 @@ ...@@ -808,8 +1050,140 @@
${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd} ${_conditionType_} a.annualLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.annualLeaveDaysEnd}
</if> </if>
<if test="conditionParamRef.containsKey('maternityLeaveDays')"> <if test="conditionParamRef.containsKey('marriageLeaveDays')">
<if test="conditionParamRef.maternityLeaveDays != null "> <if test="conditionParamRef.marriageLeaveDays != null ">
${_conditionType_} a.marriageLeaveDays = #{${_conditionParam_}.marriageLeaveDays}
</if>
<if test="conditionParamRef.marriageLeaveDays == null">
${_conditionType_} a.marriageLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysList') and conditionParamRef.marriageLeaveDaysList.size() > 0">
${_conditionType_} a.marriageLeaveDays in
<foreach collection="conditionParamRef.marriageLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysNotList') and conditionParamRef.marriageLeaveDaysNotList.size() > 0">
${_conditionType_} a.marriageLeaveDays not in
<foreach collection="conditionParamRef.marriageLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysStart') and conditionParamRef.marriageLeaveDaysStart != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.marriageLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysEnd') and conditionParamRef.marriageLeaveDaysEnd != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.marriageLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<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('maternityLeaveDays')">
<if test="conditionParamRef.maternityLeaveDays != null ">
${_conditionType_} a.maternityLeaveDays = #{${_conditionParam_}.maternityLeaveDays} ${_conditionType_} a.maternityLeaveDays = #{${_conditionParam_}.maternityLeaveDays}
</if> </if>
<if test="conditionParamRef.maternityLeaveDays == null"> <if test="conditionParamRef.maternityLeaveDays == null">
...@@ -862,33 +1236,6 @@ ...@@ -862,33 +1236,6 @@
${_conditionType_} a.paternityLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.paternityLeaveDaysEnd} ${_conditionType_} a.paternityLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.paternityLeaveDaysEnd}
</if> </if>
<if test="conditionParamRef.containsKey('marriageLeaveDays')">
<if test="conditionParamRef.marriageLeaveDays != null ">
${_conditionType_} a.marriageLeaveDays = #{${_conditionParam_}.marriageLeaveDays}
</if>
<if test="conditionParamRef.marriageLeaveDays == null">
${_conditionType_} a.marriageLeaveDays is null
</if>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysList') and conditionParamRef.marriageLeaveDaysList.size() > 0">
${_conditionType_} a.marriageLeaveDays in
<foreach collection="conditionParamRef.marriageLeaveDaysList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysNotList') and conditionParamRef.marriageLeaveDaysNotList.size() > 0">
${_conditionType_} a.marriageLeaveDays not in
<foreach collection="conditionParamRef.marriageLeaveDaysNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysStart') and conditionParamRef.marriageLeaveDaysStart != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ >= ]]> #{${_conditionParam_}.marriageLeaveDaysStart}
</if>
<if test="conditionParamRef.containsKey('marriageLeaveDaysEnd') and conditionParamRef.marriageLeaveDaysEnd != null">
${_conditionType_} a.marriageLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.marriageLeaveDaysEnd}
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDays')"> <if test="conditionParamRef.containsKey('menstrualLeaveDays')">
<if test="conditionParamRef.menstrualLeaveDays != null "> <if test="conditionParamRef.menstrualLeaveDays != null ">
${_conditionType_} a.menstrualLeaveDays = #{${_conditionParam_}.menstrualLeaveDays} ${_conditionType_} a.menstrualLeaveDays = #{${_conditionParam_}.menstrualLeaveDays}
...@@ -970,111 +1317,303 @@ ...@@ -970,111 +1317,303 @@
${_conditionType_} a.bereavementLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.bereavementLeaveDaysEnd} ${_conditionType_} a.bereavementLeaveDays <![CDATA[ <= ]]> #{${_conditionParam_}.bereavementLeaveDaysEnd}
</if> </if>
<if test="conditionParamRef.containsKey('backToUnit')">
<if test="conditionParamRef.backToUnit != null ">
${_conditionType_} a.backToUnit = #{${_conditionParam_}.backToUnit}
</if>
<if test="conditionParamRef.backToUnit == null">
${_conditionType_} a.backToUnit is null
</if>
</if>
<if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
${_conditionType_} a.backToUnit in
<foreach collection="conditionParamRef.backToUnitList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('backToUnitNotList') and conditionParamRef.backToUnitNotList.size() > 0">
${_conditionType_} a.backToUnit not in
<foreach collection="conditionParamRef.backToUnitNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('backToUnitStart') and conditionParamRef.backToUnitStart != null">
${_conditionType_} a.backToUnit <![CDATA[ >= ]]> #{${_conditionParam_}.backToUnitStart}
</if>
<if test="conditionParamRef.containsKey('backToUnitEnd') and conditionParamRef.backToUnitEnd != null">
${_conditionType_} a.backToUnit <![CDATA[ <= ]]> #{${_conditionParam_}.backToUnitEnd}
</if>
<if test="conditionParamRef.containsKey('remark')"> <if test="conditionParamRef.containsKey('onDutyLeave')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''"> <if test="conditionParamRef.onDutyLeave != null ">
${_conditionType_} a.remark like #{${_conditionParam_}.remark} ${_conditionType_} a.onDutyLeave = #{${_conditionParam_}.onDutyLeave}
</if> </if>
<if test="conditionParamRef.remark == null"> <if test="conditionParamRef.onDutyLeave == null">
${_conditionType_} a.remark is null ${_conditionType_} a.onDutyLeave is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0"> <if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.onDutyLeave in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0"> <if test="conditionParamRef.containsKey('onDutyLeaveNotList') and conditionParamRef.onDutyLeaveNotList.size() > 0">
${_conditionType_} a.remark not in ${_conditionType_} a.onDutyLeave not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onDutyLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('onDutyLeaveStart') and conditionParamRef.onDutyLeaveStart != null">
<if test="conditionParamRef.createUserId != null "> ${_conditionType_} a.onDutyLeave <![CDATA[ >= ]]> #{${_conditionParam_}.onDutyLeaveStart}
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.createUserId == null"> <if test="conditionParamRef.containsKey('onDutyLeaveEnd') and conditionParamRef.onDutyLeaveEnd != null">
${_conditionType_} a.createUserId is null ${_conditionType_} a.onDutyLeave <![CDATA[ <= ]]> #{${_conditionParam_}.onDutyLeaveEnd}
</if> </if>
<if test="conditionParamRef.containsKey('outOfOffice')">
<if test="conditionParamRef.outOfOffice != null ">
${_conditionType_} a.outOfOffice = #{${_conditionParam_}.outOfOffice}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.outOfOffice == null">
${_conditionType_} a.createUserId in ${_conditionType_} a.outOfOffice is null
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> </if>
</if>
<if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
${_conditionType_} a.outOfOffice in
<foreach collection="conditionParamRef.outOfOfficeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0"> <if test="conditionParamRef.containsKey('outOfOfficeNotList') and conditionParamRef.outOfOfficeNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.outOfOffice not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.outOfOfficeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('outOfOfficeStart') and conditionParamRef.outOfOfficeStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.outOfOffice <![CDATA[ >= ]]> #{${_conditionParam_}.outOfOfficeStart}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.containsKey('outOfOfficeEnd') and conditionParamRef.outOfOfficeEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.outOfOffice <![CDATA[ <= ]]> #{${_conditionParam_}.outOfOfficeEnd}
</if> </if>
<if test="conditionParamRef.containsKey('shiftCompensation')">
<if test="conditionParamRef.shiftCompensation != null ">
${_conditionType_} a.shiftCompensation = #{${_conditionParam_}.shiftCompensation}
</if>
<if test="conditionParamRef.shiftCompensation == null">
${_conditionType_} a.shiftCompensation is null
</if>
</if>
<if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
${_conditionType_} a.shiftCompensation in
<foreach collection="conditionParamRef.shiftCompensationList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shiftCompensationNotList') and conditionParamRef.shiftCompensationNotList.size() > 0">
${_conditionType_} a.shiftCompensation not in
<foreach collection="conditionParamRef.shiftCompensationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shiftCompensationStart') and conditionParamRef.shiftCompensationStart != null">
${_conditionType_} a.shiftCompensation <![CDATA[ >= ]]> #{${_conditionParam_}.shiftCompensationStart}
</if>
<if test="conditionParamRef.containsKey('shiftCompensationEnd') and conditionParamRef.shiftCompensationEnd != null">
${_conditionType_} a.shiftCompensation <![CDATA[ <= ]]> #{${_conditionParam_}.shiftCompensationEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('physicalExamination')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.physicalExamination != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.physicalExamination = #{${_conditionParam_}.physicalExamination}
</if> </if>
<if test="conditionParamRef.createTime == null"> <if test="conditionParamRef.physicalExamination == null">
${_conditionType_} a.createTime is null ${_conditionType_} a.physicalExamination is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.physicalExamination in
<foreach collection="conditionParamRef.physicalExaminationList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.containsKey('physicalExaminationNotList') and conditionParamRef.physicalExaminationNotList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.physicalExamination not in
<foreach collection="conditionParamRef.physicalExaminationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserId')"> <if test="conditionParamRef.containsKey('physicalExaminationStart') and conditionParamRef.physicalExaminationStart != null">
<if test="conditionParamRef.updateUserId != null "> ${_conditionType_} a.physicalExamination <![CDATA[ >= ]]> #{${_conditionParam_}.physicalExaminationStart}
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.updateUserId == null"> <if test="conditionParamRef.containsKey('physicalExaminationEnd') and conditionParamRef.physicalExaminationEnd != null">
${_conditionType_} a.updateUserId is null ${_conditionType_} a.physicalExamination <![CDATA[ <= ]]> #{${_conditionParam_}.physicalExaminationEnd}
</if> </if>
<if test="conditionParamRef.containsKey('quarantine')">
<if test="conditionParamRef.quarantine != null ">
${_conditionType_} a.quarantine = #{${_conditionParam_}.quarantine}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0"> <if test="conditionParamRef.quarantine == null">
${_conditionType_} a.updateUserId in ${_conditionType_} a.quarantine is null
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> </if>
</if>
<if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
${_conditionType_} a.quarantine in
<foreach collection="conditionParamRef.quarantineList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0"> <if test="conditionParamRef.containsKey('quarantineNotList') and conditionParamRef.quarantineNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.quarantine not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.quarantineNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('quarantineStart') and conditionParamRef.quarantineStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.quarantine <![CDATA[ >= ]]> #{${_conditionParam_}.quarantineStart}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.containsKey('quarantineEnd') and conditionParamRef.quarantineEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.quarantine <![CDATA[ <= ]]> #{${_conditionParam_}.quarantineEnd}
</if> </if>
<if test="conditionParamRef.containsKey('businessTrip')">
<if test="conditionParamRef.businessTrip != null ">
${_conditionType_} a.businessTrip = #{${_conditionParam_}.businessTrip}
</if>
<if test="conditionParamRef.businessTrip == null">
${_conditionType_} a.businessTrip is null
</if>
</if>
<if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
${_conditionType_} a.businessTrip in
<foreach collection="conditionParamRef.businessTripList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('businessTripNotList') and conditionParamRef.businessTripNotList.size() > 0">
${_conditionType_} a.businessTrip not in
<foreach collection="conditionParamRef.businessTripNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('businessTripStart') and conditionParamRef.businessTripStart != null">
${_conditionType_} a.businessTrip <![CDATA[ >= ]]> #{${_conditionParam_}.businessTripStart}
</if>
<if test="conditionParamRef.containsKey('businessTripEnd') and conditionParamRef.businessTripEnd != null">
${_conditionType_} a.businessTrip <![CDATA[ <= ]]> #{${_conditionParam_}.businessTripEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('publicHoliday')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.publicHoliday != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.publicHoliday = #{${_conditionParam_}.publicHoliday}
</if> </if>
<if test="conditionParamRef.updateTime == null"> <if test="conditionParamRef.publicHoliday == null">
${_conditionType_} a.updateTime is null ${_conditionType_} a.publicHoliday is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.publicHoliday in
<foreach collection="conditionParamRef.publicHolidayList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('publicHolidayNotList') and conditionParamRef.publicHolidayNotList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.publicHoliday not in
<foreach collection="conditionParamRef.publicHolidayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('publicHolidayStart') and conditionParamRef.publicHolidayStart != null">
${_conditionType_} a.publicHoliday <![CDATA[ >= ]]> #{${_conditionParam_}.publicHolidayStart}
</if>
<if test="conditionParamRef.containsKey('publicHolidayEnd') and conditionParamRef.publicHolidayEnd != null">
${_conditionType_} a.publicHoliday <![CDATA[ <= ]]> #{${_conditionParam_}.publicHolidayEnd}
</if>
<if test="conditionParamRef.containsKey('childRearingLeave')">
<if test="conditionParamRef.childRearingLeave != null ">
${_conditionType_} a.childRearingLeave = #{${_conditionParam_}.childRearingLeave}
</if>
<if test="conditionParamRef.childRearingLeave == null">
${_conditionType_} a.childRearingLeave is null
</if>
</if>
<if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
${_conditionType_} a.childRearingLeave in
<foreach collection="conditionParamRef.childRearingLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('childRearingLeaveNotList') and conditionParamRef.childRearingLeaveNotList.size() > 0">
${_conditionType_} a.childRearingLeave not in
<foreach collection="conditionParamRef.childRearingLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('childRearingLeaveStart') and conditionParamRef.childRearingLeaveStart != null">
${_conditionType_} a.childRearingLeave <![CDATA[ >= ]]> #{${_conditionParam_}.childRearingLeaveStart}
</if>
<if test="conditionParamRef.containsKey('childRearingLeaveEnd') and conditionParamRef.childRearingLeaveEnd != null">
${_conditionType_} a.childRearingLeave <![CDATA[ <= ]]> #{${_conditionParam_}.childRearingLeaveEnd}
</if>
<if test="conditionParamRef.containsKey('transferBack')">
<if test="conditionParamRef.transferBack != null ">
${_conditionType_} a.transferBack = #{${_conditionParam_}.transferBack}
</if>
<if test="conditionParamRef.transferBack == null">
${_conditionType_} a.transferBack is null
</if>
</if>
<if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
${_conditionType_} a.transferBack in
<foreach collection="conditionParamRef.transferBackList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('transferBackNotList') and conditionParamRef.transferBackNotList.size() > 0">
${_conditionType_} a.transferBack not in
<foreach collection="conditionParamRef.transferBackNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('transferBackStart') and conditionParamRef.transferBackStart != null">
${_conditionType_} a.transferBack <![CDATA[ >= ]]> #{${_conditionParam_}.transferBackStart}
</if>
<if test="conditionParamRef.containsKey('transferBackEnd') and conditionParamRef.transferBackEnd != null">
${_conditionType_} a.transferBack <![CDATA[ <= ]]> #{${_conditionParam_}.transferBackEnd}
</if>
<if test="conditionParamRef.containsKey('homeLeave')">
<if test="conditionParamRef.homeLeave != null ">
${_conditionType_} a.homeLeave = #{${_conditionParam_}.homeLeave}
</if>
<if test="conditionParamRef.homeLeave == null">
${_conditionType_} a.homeLeave is null
</if>
</if>
<if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
${_conditionType_} a.homeLeave in
<foreach collection="conditionParamRef.homeLeaveList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('homeLeaveNotList') and conditionParamRef.homeLeaveNotList.size() > 0">
${_conditionType_} a.homeLeave not in
<foreach collection="conditionParamRef.homeLeaveNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('homeLeaveStart') and conditionParamRef.homeLeaveStart != null">
${_conditionType_} a.homeLeave <![CDATA[ >= ]]> #{${_conditionParam_}.homeLeaveStart}
</if>
<if test="conditionParamRef.containsKey('homeLeaveEnd') and conditionParamRef.homeLeaveEnd != null">
${_conditionType_} a.homeLeave <![CDATA[ <= ]]> #{${_conditionParam_}.homeLeaveEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1138,6 +1677,36 @@ ...@@ -1138,6 +1677,36 @@
<if test='orderCol.annualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.annualLeaveDays)'>DESC</if> <if test='orderCol.annualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.annualLeaveDays)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('marriageLeaveDays')">
a.marriageLeaveDays
<if test='orderCol.marriageLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.marriageLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('maternityLeaveDays')"> <if test="orderCol.containsKey('maternityLeaveDays')">
a.maternityLeaveDays a.maternityLeaveDays
<if test='orderCol.maternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.maternityLeaveDays)'>DESC</if> <if test='orderCol.maternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.maternityLeaveDays)'>DESC</if>
...@@ -1148,11 +1717,6 @@ ...@@ -1148,11 +1717,6 @@
<if test='orderCol.paternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.paternityLeaveDays)'>DESC</if> <if test='orderCol.paternityLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.paternityLeaveDays)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('marriageLeaveDays')">
a.marriageLeaveDays
<if test='orderCol.marriageLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.marriageLeaveDays)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('menstrualLeaveDays')"> <if test="orderCol.containsKey('menstrualLeaveDays')">
a.menstrualLeaveDays a.menstrualLeaveDays
<if test='orderCol.menstrualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.menstrualLeaveDays)'>DESC</if> <if test='orderCol.menstrualLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.menstrualLeaveDays)'>DESC</if>
...@@ -1168,29 +1732,59 @@ ...@@ -1168,29 +1732,59 @@
<if test='orderCol.bereavementLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.bereavementLeaveDays)'>DESC</if> <if test='orderCol.bereavementLeaveDays != null and "DESC".equalsIgnoreCase(orderCol.bereavementLeaveDays)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('backToUnit')">
a.remark a.backToUnit
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.backToUnit != null and "DESC".equalsIgnoreCase(orderCol.backToUnit)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('onDutyLeave')">
a.createUserId a.onDutyLeave
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.onDutyLeave != null and "DESC".equalsIgnoreCase(orderCol.onDutyLeave)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('outOfOffice')">
a.createTime a.outOfOffice
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.outOfOffice != null and "DESC".equalsIgnoreCase(orderCol.outOfOffice)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('shiftCompensation')">
a.updateUserId a.shiftCompensation
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.shiftCompensation != null and "DESC".equalsIgnoreCase(orderCol.shiftCompensation)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('physicalExamination')">
a.updateTime a.physicalExamination
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.physicalExamination != null and "DESC".equalsIgnoreCase(orderCol.physicalExamination)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('quarantine')">
a.quarantine
<if test='orderCol.quarantine != null and "DESC".equalsIgnoreCase(orderCol.quarantine)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('businessTrip')">
a.businessTrip
<if test='orderCol.businessTrip != null and "DESC".equalsIgnoreCase(orderCol.businessTrip)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('publicHoliday')">
a.publicHoliday
<if test='orderCol.publicHoliday != null and "DESC".equalsIgnoreCase(orderCol.publicHoliday)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('childRearingLeave')">
a.childRearingLeave
<if test='orderCol.childRearingLeave != null and "DESC".equalsIgnoreCase(orderCol.childRearingLeave)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('transferBack')">
a.transferBack
<if test='orderCol.transferBack != null and "DESC".equalsIgnoreCase(orderCol.transferBack)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('homeLeave')">
a.homeLeave
<if test='orderCol.homeLeave != null and "DESC".equalsIgnoreCase(orderCol.homeLeave)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceVacationRecordMapper.xml
View file @ 56b22778
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!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.AttendanceVacationRecordDaoImpl"> <mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceVacationRecordDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
......
db/menu.sql
View file @ 56b22778
...@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe ...@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '8', '例假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '8', '例假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '9', '哺乳假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '9', '哺乳假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '10', '丧假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '10', '丧假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '11', '回单位', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '12', '因公请假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '13', '外出勘验', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '14', '值班补班', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '15', '体检', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '16', '隔离', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '17', '因公外出', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '18', '公休', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '19', '育儿假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '20', '调回单位', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '21', '探亲假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 员工假期余额信息菜单 SQL -- 员工假期余额信息菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -546,5 +557,16 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio ...@@ -546,5 +557,16 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '8', '例假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '8', '例假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '9', '哺乳假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '9', '哺乳假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '10', '丧假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '10', '丧假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '11', '回单位', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '12', '因公请假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '13', '外出勘验', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '14', '值班补班', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '15', '体检', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '16', '隔离', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '17', '因公外出', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '18', '公休', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '19', '育儿假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '20', '调回单位', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '21', '探亲假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
\ No newline at end of file
db/module.sql
View file @ 56b22778
...@@ -340,8 +340,7 @@ CREATE TABLE mortals_xhx_attendance_leave_record( ...@@ -340,8 +340,7 @@ CREATE TABLE mortals_xhx_attendance_leave_record(
`deptId` bigint(20) COMMENT '所属部门id', `deptId` bigint(20) COMMENT '所属部门id',
`deptName` varchar(256) COMMENT '所属部门', `deptName` varchar(256) COMMENT '所属部门',
`phoneNumber` varchar(20) COMMENT '电话号码', `phoneNumber` varchar(20) COMMENT '电话号码',
`leaveType` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)', `leaveType` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)', `startTime` datetime COMMENT '开始时间',
`startTime` datetime COMMENT '开始时间',
`endTime` datetime COMMENT '结束时间', `endTime` datetime COMMENT '结束时间',
`duration` int(9) COMMENT '时长,单位秒', `duration` int(9) COMMENT '时长,单位秒',
`reason` text COMMENT '请假事由', `reason` text COMMENT '请假事由',
...@@ -372,17 +371,28 @@ CREATE TABLE mortals_xhx_attendance_vacation_balance( ...@@ -372,17 +371,28 @@ CREATE TABLE mortals_xhx_attendance_vacation_balance(
`compensatedLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '调休（天）', `compensatedLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '调休（天）',
`sickLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '病假（天）', `sickLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '病假（天）',
`annualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '年假（天）', `annualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '年假（天）',
`maternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '产假（天）',
`paternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '陪产假（天）',
`marriageLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '婚假（天）', `marriageLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '婚假（天）',
`menstrualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '例假（天）',
`breastfeedingLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '哺乳假（天）',
`bereavementLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '丧假（天）',
`remark` varchar(255) COMMENT '备注', `remark` varchar(255) COMMENT '备注',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`maternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '产假（天）',
`paternityLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '陪产假（天）',
`menstrualLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '例假（天）',
`breastfeedingLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '哺乳假（天）',
`bereavementLeaveDays` decimal(10,2) DEFAULT '0' COMMENT '丧假（天）',
`backToUnit` decimal(10,2) DEFAULT '0' COMMENT '回单位（天）',
`onDutyLeave` decimal(10,2) DEFAULT '0' COMMENT '因公请假（天）',
`outOfOffice` decimal(10,2) DEFAULT '0' COMMENT '外出勘验（天）',
`shiftCompensation` decimal(10,2) DEFAULT '0' COMMENT '值班补班（天）',
`physicalExamination` decimal(10,2) DEFAULT '0' COMMENT '体检（天）',
`quarantine` decimal(10,2) DEFAULT '0' COMMENT '隔离（天）',
`businessTrip` decimal(10,2) DEFAULT '0' COMMENT '因公外出（与窗口工作无关/天）',
`publicHoliday` decimal(10,2) DEFAULT '0' COMMENT '公休（天）',
`childRearingLeave` decimal(10,2) DEFAULT '0' COMMENT '育儿假（天）',
`transferBack` decimal(10,2) DEFAULT '0' COMMENT '调回单位（或离职/天）',
`homeLeave` decimal(10,2) DEFAULT '0' COMMENT '探亲假（天）',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工假期余额信息';
...@@ -394,7 +404,7 @@ CREATE TABLE mortals_xhx_attendance_vacation_record( ...@@ -394,7 +404,7 @@ CREATE TABLE mortals_xhx_attendance_vacation_record(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`staffId` bigint(20) COMMENT '员工id', `staffId` bigint(20) COMMENT '员工id',
`staffName` varchar(255) COMMENT '员工姓名', `staffName` varchar(255) COMMENT '员工姓名',
`type` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假)', `type` tinyint(2) COMMENT '请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)',
`subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)', `subAddType` tinyint(1) DEFAULT '1' COMMENT '增减类型(1.增加,2.扣除)',
`validityPeriod` varchar(255) DEFAULT '0' COMMENT '有效期', `validityPeriod` varchar(255) DEFAULT '0' COMMENT '有效期',
`subOrAddDays` decimal(10,2) DEFAULT '0' COMMENT '增加或扣减天数（天）', `subOrAddDays` decimal(10,2) DEFAULT '0' COMMENT '增加或扣减天数（天）',
...@@ -453,7 +463,7 @@ CREATE TABLE mortals_xhx_attendance_stat( ...@@ -453,7 +463,7 @@ CREATE TABLE mortals_xhx_attendance_stat(
`funeralLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '丧假（天）', `funeralLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '丧假（天）',
`marriageLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '婚假（天）', `marriageLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '婚假（天）',
`childRearingLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '育儿假（天）', `childRearingLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '育儿假（天）',
`maternityLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '产假（陪护假/天）', `maternityLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '产假（天））',
`transferBack` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调回单位（或离职/天）', `transferBack` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调回单位（或离职/天）',
`homeLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '探亲假（天）', `homeLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '探亲假（天）',
`personalLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '事假（天）', `personalLeave` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '事假（天）',
...@@ -476,6 +486,11 @@ CREATE TABLE mortals_xhx_attendance_stat( ...@@ -476,6 +486,11 @@ CREATE TABLE mortals_xhx_attendance_stat(
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
`breastfeedingLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '哺乳假（天）',
`menstrualLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '例假（天）',
`annualLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '年假（天）',
`compensatedLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '调休（天）',
`paternityLeaveDays` double(4,1) NOT NULL DEFAULT '0.0' COMMENT '陪产假（天）',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考勤汇总信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 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