Skip to content

A
attendance-performance-platform
Commit a4eca9a8 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

员工信息、请假记录、考勤打卡记录、考勤打卡记录异常信息、海康考勤打卡记录、考勤汇总信息，增加人员所属大厅信息

parent 93640b69
Hide whitespace changes
Inline Side-by-side
Showing with 5500 additions and 2335 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java
View file @ a4eca9a8
...@@ -97,6 +97,8 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService { ...@@ -97,6 +97,8 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
recordHikEntity.setWorkNum(staffCache.getWorkNum()); recordHikEntity.setWorkNum(staffCache.getWorkNum());
recordHikEntity.setDeptId(staffCache.getDeptId()); recordHikEntity.setDeptId(staffCache.getDeptId());
recordHikEntity.setDeptName(staffCache.getDeptName()); recordHikEntity.setDeptName(staffCache.getDeptName());
recordHikEntity.setSalaId(staffCache.getSalaId());
recordHikEntity.setSalaName(staffCache.getSalaName());
recordHikEntity.setPositionId(staffCache.getPositionId()); recordHikEntity.setPositionId(staffCache.getPositionId());
recordHikEntity.setPositionName(staffCache.getPositionName()); recordHikEntity.setPositionName(staffCache.getPositionName());
recordHikEntity.setAttendanceGroupId(groupId); recordHikEntity.setAttendanceGroupId(groupId);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventAfterTaskImpl.java
View file @ a4eca9a8
...@@ -151,6 +151,8 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService { ...@@ -151,6 +151,8 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
recordHikEntity.setWorkNum(staffCache.getWorkNum()); recordHikEntity.setWorkNum(staffCache.getWorkNum());
recordHikEntity.setDeptId(staffCache.getDeptId()); recordHikEntity.setDeptId(staffCache.getDeptId());
recordHikEntity.setDeptName(staffCache.getDeptName()); recordHikEntity.setDeptName(staffCache.getDeptName());
recordHikEntity.setSalaId(staffCache.getSalaId());
recordHikEntity.setSalaName(staffCache.getSalaName());
recordHikEntity.setPositionId(staffCache.getPositionId()); recordHikEntity.setPositionId(staffCache.getPositionId());
recordHikEntity.setPositionName(staffCache.getPositionName()); recordHikEntity.setPositionName(staffCache.getPositionName());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
View file @ a4eca9a8
...@@ -133,6 +133,8 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService { ...@@ -133,6 +133,8 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
recordHikEntity.setWorkNum(staffCache.getWorkNum()); recordHikEntity.setWorkNum(staffCache.getWorkNum());
recordHikEntity.setDeptId(staffCache.getDeptId()); recordHikEntity.setDeptId(staffCache.getDeptId());
recordHikEntity.setDeptName(staffCache.getDeptName()); recordHikEntity.setDeptName(staffCache.getDeptName());
recordHikEntity.setSalaId(staffCache.getSalaId());
recordHikEntity.setSalaName(staffCache.getSalaName());
recordHikEntity.setPositionId(staffCache.getPositionId()); recordHikEntity.setPositionId(staffCache.getPositionId());
recordHikEntity.setPositionName(staffCache.getPositionName()); recordHikEntity.setPositionName(staffCache.getPositionName());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java
View file @ a4eca9a8
...@@ -140,7 +140,8 @@ public class DingMessageController { ...@@ -140,7 +140,8 @@ public class DingMessageController {
leaveRecordEntity.setDeptId(staffEntity.getDeptId()); leaveRecordEntity.setDeptId(staffEntity.getDeptId());
leaveRecordEntity.setDeptName(staffEntity.getDeptName()); leaveRecordEntity.setDeptName(staffEntity.getDeptName());
leaveRecordEntity.setPhoneNumber(staffEntity.getPhoneNumber()); leaveRecordEntity.setPhoneNumber(staffEntity.getPhoneNumber());
leaveRecordEntity.setSalaId(staffEntity.getSalaId());
leaveRecordEntity.setSalaName(staffEntity.getSalaName());
// if(result.getTasks().size() >0 ){ // if(result.getTasks().size() >0 ){
// if(result.getTasks().get(0).getCreateTime() != null && result.getTasks().get(0).getFinishTime() != null){ // if(result.getTasks().get(0).getCreateTime() != null && result.getTasks().get(0).getFinishTime() != null){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
View file @ a4eca9a8
...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
* 请假记录信息实体对象 * 请假记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-08-15 * @date 2024-01-11
*/ */
@Data @Data
public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
...@@ -61,15 +61,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -61,15 +61,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/** /**
* 时长,单位秒 * 时长,单位秒
*/ */
private Integer duration; private Integer duration;
/**
* 钉钉原始请假时间记录
*/
@Excel(name = "请假时间")
private String sourceDingTime;
/** /**
* 请假事由 * 请假事由
*/ */
...@@ -118,7 +110,19 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -118,7 +110,19 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
* 处理状态 * 处理状态
*/ */
private Integer processStatus; private Integer processStatus;
/**
* 钉钉原始请假时间记录
*/
@Excel(name = "请假时间")
private String sourceDingTime;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -157,5 +161,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { ...@@ -157,5 +161,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
this.auditTime = new Date(); this.auditTime = new Date();
this.processStatus = 1; this.processStatus = 1;
this.sourceDingTime = ""; this.sourceDingTime = "";
this.salaId = null;
this.salaName = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordQuery.java
View file @ a4eca9a8
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
* 请假记录信息查询对象 * 请假记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-08-15 * @date 2024-01-11
*/ */
public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -246,6 +246,26 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -246,6 +246,26 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 钉钉原始请假时间记录排除列表 */ /** 钉钉原始请假时间记录排除列表 */
private List <String> sourceDingTimeNotList; private List <String> sourceDingTimeNotList;
/** 开始 所属大厅 */
private Long salaIdStart;
/** 结束 所属大厅 */
private Long salaIdEnd;
/** 增加 所属大厅 */
private Long salaIdIncrement;
/** 所属大厅列表 */
private List <Long> salaIdList;
/** 所属大厅排除列表 */
private List <Long> salaIdNotList;
/** 所属大厅名称 */
private List<String> salaNameList;
/** 所属大厅名称排除列表 */
private List <String> salaNameNotList;
/** 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<AttendanceLeaveRecordQuery> orConditionList; private List<AttendanceLeaveRecordQuery> orConditionList;
...@@ -1576,6 +1596,119 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -1576,6 +1596,119 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
this.sourceDingTimeNotList = sourceDingTimeNotList; this.sourceDingTimeNotList = sourceDingTimeNotList;
} }
/**
* 获取 开始 所属大厅
* @return salaIdStart
*/
public Long getSalaIdStart(){
return this.salaIdStart;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public void setSalaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
}
/**
* 获取 结束 所属大厅
* @return $salaIdEnd
*/
public Long getSalaIdEnd(){
return this.salaIdEnd;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public void setSalaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
}
/**
* 获取 增加 所属大厅
* @return salaIdIncrement
*/
public Long getSalaIdIncrement(){
return this.salaIdIncrement;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public void setSalaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
}
/**
* 获取 所属大厅
* @return salaIdList
*/
public List<Long> getSalaIdList(){
return this.salaIdList;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public void setSalaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
}
/**
* 获取 所属大厅
* @return salaIdNotList
*/
public List<Long> getSalaIdNotList(){
return this.salaIdNotList;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public void setSalaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
}
/**
* 获取 所属大厅名称
* @return salaNameList
*/
public List<String> getSalaNameList(){
return this.salaNameList;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public void setSalaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
}
/**
* 获取 所属大厅名称
* @return salaNameNotList
*/
public List<String> getSalaNameNotList(){
return this.salaNameNotList;
}
/**
* 设置 所属大厅名称
* @param salaNameNotList
*/
public void setSalaNameNotList(List<String> salaNameNotList){
this.salaNameNotList = salaNameNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2312,6 +2445,79 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity { ...@@ -2312,6 +2445,79 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
return this; return this;
} }
/**
* 设置 所属大厅
* @param salaId
*/
public AttendanceLeaveRecordQuery salaId(Long salaId){
setSalaId(salaId);
return this;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public AttendanceLeaveRecordQuery salaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
return this;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public AttendanceLeaveRecordQuery salaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
return this;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public AttendanceLeaveRecordQuery salaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
return this;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public AttendanceLeaveRecordQuery salaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
return this;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public AttendanceLeaveRecordQuery salaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
return this;
}
/**
* 设置 所属大厅名称
* @param salaName
*/
public AttendanceLeaveRecordQuery salaName(String salaName){
setSalaName(salaName);
return this;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public AttendanceLeaveRecordQuery salaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
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/AttendanceRecordEntity.java
View file @ a4eca9a8
...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
* 考勤打卡记录信息实体对象 * 考勤打卡记录信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-08-03 * @date 2024-01-11
*/ */
@Data @Data
public class AttendanceRecordEntity extends AttendanceRecordVo { public class AttendanceRecordEntity extends AttendanceRecordVo {
...@@ -97,6 +97,14 @@ public class AttendanceRecordEntity extends AttendanceRecordVo { ...@@ -97,6 +97,14 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
* 班次名称 * 班次名称
*/ */
private String className; private String className;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -131,5 +139,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo { ...@@ -131,5 +139,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
this.punchResult = 0; this.punchResult = 0;
this.classId = 0L; this.classId = 0L;
this.className = ""; this.className = "";
this.salaId = null;
this.salaName = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordErrorEntity.java
View file @ a4eca9a8
package com.mortals.xhx.module.attendance.model; package com.mortals.xhx.module.attendance.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; 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.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceRecordErrorVo; import com.mortals.xhx.module.attendance.model.vo.AttendanceRecordErrorVo;
import lombok.Data;
/** /**
* 考勤打卡记录异常信息实体对象 * 考勤打卡记录异常信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2024-01-11
*/ */
@Data
public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo { public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 员工ID * 员工ID
*/ */
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
private String workNum; private String workNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
private String deptName; private String deptName;
/** /**
* 职位ID * 职位ID
*/ */
private Long positionId; private Long positionId;
/** /**
* 职位名称 * 职位名称
*/ */
private String positionName; private String positionName;
/** /**
* 所属考勤组ID * 所属考勤组ID
*/ */
private Long attendanceGroupId; private Long attendanceGroupId;
/** /**
* 所属考勤组名称 * 所属考勤组名称
*/ */
private String attendanceGroupName; private String attendanceGroupName;
/** /**
* 班次ID * 班次ID
*/ */
private Long shiftsId; private Long shiftsId;
/** /**
* 班次名称 * 班次名称
*/ */
private String shiftsName; private String shiftsName;
/** /**
* 上下班时间 * 上下班时间
*/ */
@JsonFormat(pattern = "HH:mm") @JsonFormat(pattern = "HH:mm")
@JSONField(format = "HH:mm") @JSONField(format = "HH:mm")
private Date goOffDateTime; private Date goOffDateTime;
/** /**
* 异常时间 * 异常时间
*/ */
private Date errorDateTime; private Date errorDateTime;
/** /**
* 实际打卡时间 * 实际打卡时间
*/ */
private Date actualAttendanceDateTime; private Date actualAttendanceDateTime;
/** /**
* 处理时间 * 处理时间
*/ */
private Date operDateTime; private Date operDateTime;
/** /**
* 处理人 * 处理人
*/ */
private String opertor; private String opertor;
/** /**
* 异常状态(0.缺卡,1.早退,2.缺卡) * 异常状态(0.缺卡,1.早退,2.缺卡)
*/ */
private Integer errorStatus; private Integer errorStatus;
/** /**
* 处理状态(0.未处理,1.已处理) * 处理状态(0.未处理,1.已处理)
*/ */
private Integer processStatus; private Integer processStatus;
/** /**
* 处理结果 * 处理结果
*/ */
private String processResult; private String processResult;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
public AttendanceRecordErrorEntity(){}
/**
* 获取 员工ID
* @return Long
*/
public Long getStaffId(){
return staffId;
}
/**
* 设置 员工ID
* @param staffId
*/
public void setStaffId(Long staffId){
this.staffId = staffId;
}
/**
* 获取 员工姓名
* @return String
*/
public String getStaffName(){
return staffName;
}
/**
* 设置 员工姓名
* @param staffName
*/
public void setStaffName(String staffName){
this.staffName = staffName;
}
/**
* 获取 工号
* @return String
*/
public String getWorkNum(){
return workNum;
}
/**
* 设置 工号
* @param workNum
*/
public void setWorkNum(String workNum){
this.workNum = workNum;
}
/**
* 获取 所属部门
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 所属部门
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 所属部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 所属部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 职位ID
* @return Long
*/
public Long getPositionId(){
return positionId;
}
/** /**
* 设置 职位ID * 所属大厅
* @param positionId */
*/ private Long salaId;
public void setPositionId(Long positionId){
this.positionId = positionId;
}
/**
* 获取 职位名称
* @return String
*/
public String getPositionName(){
return positionName;
}
/**
* 设置 职位名称
* @param positionName
*/
public void setPositionName(String positionName){
this.positionName = positionName;
}
/**
* 获取 所属考勤组ID
* @return Long
*/
public Long getAttendanceGroupId(){
return attendanceGroupId;
}
/**
* 设置 所属考勤组ID
* @param attendanceGroupId
*/
public void setAttendanceGroupId(Long attendanceGroupId){
this.attendanceGroupId = attendanceGroupId;
}
/**
* 获取 所属考勤组名称
* @return String
*/
public String getAttendanceGroupName(){
return attendanceGroupName;
}
/**
* 设置 所属考勤组名称
* @param attendanceGroupName
*/
public void setAttendanceGroupName(String attendanceGroupName){
this.attendanceGroupName = attendanceGroupName;
}
/**
* 获取 班次ID
* @return Long
*/
public Long getShiftsId(){
return shiftsId;
}
/**
* 设置 班次ID
* @param shiftsId
*/
public void setShiftsId(Long shiftsId){
this.shiftsId = shiftsId;
}
/**
* 获取 班次名称
* @return String
*/
public String getShiftsName(){
return shiftsName;
}
/**
* 设置 班次名称
* @param shiftsName
*/
public void setShiftsName(String shiftsName){
this.shiftsName = shiftsName;
}
/** /**
* 获取 上下班时间 * 所属大厅名称
* @return Date */
*/ private String salaName;
public Date getGoOffDateTime(){
return goOffDateTime;
}
/**
* 设置 上下班时间
* @param goOffDateTime
*/
public void setGoOffDateTime(Date goOffDateTime){
this.goOffDateTime = goOffDateTime;
}
/**
* 获取 异常时间
* @return Date
*/
public Date getErrorDateTime(){
return errorDateTime;
}
/**
* 设置 异常时间
* @param errorDateTime
*/
public void setErrorDateTime(Date errorDateTime){
this.errorDateTime = errorDateTime;
}
/**
* 获取 实际打卡时间
* @return Date
*/
public Date getActualAttendanceDateTime(){
return actualAttendanceDateTime;
}
/**
* 设置 实际打卡时间
* @param actualAttendanceDateTime
*/
public void setActualAttendanceDateTime(Date actualAttendanceDateTime){
this.actualAttendanceDateTime = actualAttendanceDateTime;
}
/**
* 获取 处理时间
* @return Date
*/
public Date getOperDateTime(){
return operDateTime;
}
/**
* 设置 处理时间
* @param operDateTime
*/
public void setOperDateTime(Date operDateTime){
this.operDateTime = operDateTime;
}
/**
* 获取 处理人
* @return String
*/
public String getOpertor(){
return opertor;
}
/**
* 设置 处理人
* @param opertor
*/
public void setOpertor(String opertor){
this.opertor = opertor;
}
/**
* 获取 异常状态(0.缺卡,1.早退,2.缺卡)
* @return Integer
*/
public Integer getErrorStatus(){
return errorStatus;
}
/**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡)
* @param errorStatus
*/
public void setErrorStatus(Integer errorStatus){
this.errorStatus = errorStatus;
}
/**
* 获取 处理状态(0.未处理,1.已处理)
* @return Integer
*/
public Integer getProcessStatus(){
return processStatus;
}
/**
* 设置 处理状态(0.未处理,1.已处理)
* @param processStatus
*/
public void setProcessStatus(Integer processStatus){
this.processStatus = processStatus;
}
/**
* 获取 处理结果
* @return String
*/
public String getProcessResult(){
return processResult;
}
/**
* 设置 处理结果
* @param processResult
*/
public void setProcessResult(String processResult){
this.processResult = processResult;
}
/**
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -399,77 +122,34 @@ public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo { ...@@ -399,77 +122,34 @@ public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo {
if (obj instanceof AttendanceRecordErrorEntity) { if (obj instanceof AttendanceRecordErrorEntity) {
AttendanceRecordErrorEntity tmp = (AttendanceRecordErrorEntity) obj; AttendanceRecordErrorEntity tmp = (AttendanceRecordErrorEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",staffId:").append(getStaffId());
sb.append(",staffName:").append(getStaffName());
sb.append(",workNum:").append(getWorkNum());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",positionId:").append(getPositionId());
sb.append(",positionName:").append(getPositionName());
sb.append(",attendanceGroupId:").append(getAttendanceGroupId());
sb.append(",attendanceGroupName:").append(getAttendanceGroupName());
sb.append(",shiftsId:").append(getShiftsId());
sb.append(",shiftsName:").append(getShiftsName());
sb.append(",goOffDateTime:").append(getGoOffDateTime());
sb.append(",errorDateTime:").append(getErrorDateTime());
sb.append(",actualAttendanceDateTime:").append(getActualAttendanceDateTime());
sb.append(",operDateTime:").append(getOperDateTime());
sb.append(",opertor:").append(getOpertor());
sb.append(",errorStatus:").append(getErrorStatus());
sb.append(",processStatus:").append(getProcessStatus());
sb.append(",processResult:").append(getProcessResult());
sb.append(",remark:").append(getRemark());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.staffId = null;
this.staffId = null; this.staffName = "";
this.workNum = "";
this.staffName = ""; this.deptId = null;
this.deptName = "";
this.workNum = ""; this.positionId = null;
this.positionName = "";
this.deptId = null; this.attendanceGroupId = null;
this.attendanceGroupName = "";
this.deptName = ""; this.shiftsId = null;
this.shiftsName = "";
this.positionId = null; this.goOffDateTime = null;
this.errorDateTime = null;
this.positionName = ""; this.actualAttendanceDateTime = null;
this.operDateTime = null;
this.attendanceGroupId = null; this.opertor = "";
this.errorStatus = 0;
this.attendanceGroupName = ""; this.processStatus = 0;
this.processResult = "";
this.shiftsId = null; this.remark = "";
this.salaId = null;
this.shiftsName = ""; this.salaName = "";
}
this.goOffDateTime = null; }
\ No newline at end of file
this.errorDateTime = null;
this.actualAttendanceDateTime = null;
this.operDateTime = null;
this.opertor = "";
this.errorStatus = 0;
this.processStatus = 0;
this.processResult = "";
this.remark = "";
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordErrorQuery.java
View file @ a4eca9a8
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity;
/** /**
* 考勤打卡记录异常信息查询对象 * 考勤打卡记录异常信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2024-01-11
*/ */
public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity { public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -159,19 +159,19 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity { ...@@ -159,19 +159,19 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
/** 处理人排除列表 */ /** 处理人排除列表 */
private List <String> opertorNotList; private List <String> opertorNotList;
/** 开始 异常状态(0.缺卡,1.早退,2.缺卡) */ /** 开始 异常状态(0.缺卡,1.早退,2.迟到) */
private Integer errorStatusStart; private Integer errorStatusStart;
/** 结束 异常状态(0.缺卡,1.早退,2.缺卡) */ /** 结束 异常状态(0.缺卡,1.早退,2.迟到) */
private Integer errorStatusEnd; private Integer errorStatusEnd;
/** 增加 异常状态(0.缺卡,1.早退,2.缺卡) */ /** 增加 异常状态(0.缺卡,1.早退,2.迟到) */
private Integer errorStatusIncrement; private Integer errorStatusIncrement;
/** 异常状态(0.缺卡,1.早退,2.缺卡)列表 */ /** 异常状态(0.缺卡,1.早退,2.迟到)列表 */
private List <Integer> errorStatusList; private List <Integer> errorStatusList;
/** 异常状态(0.缺卡,1.早退,2.缺卡)排除列表 */ /** 异常状态(0.缺卡,1.早退,2.迟到)排除列表 */
private List <Integer> errorStatusNotList; private List <Integer> errorStatusNotList;
/** 开始 处理状态(0.未处理,1.已处理) */ /** 开始 处理状态(0.未处理,1.已处理) */
...@@ -241,6 +241,26 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity { ...@@ -241,6 +241,26 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 所属大厅 */
private Long salaIdStart;
/** 结束 所属大厅 */
private Long salaIdEnd;
/** 增加 所属大厅 */
private Long salaIdIncrement;
/** 所属大厅列表 */
private List <Long> salaIdList;
/** 所属大厅排除列表 */
private List <Long> salaIdNotList;
/** 所属大厅名称 */
private List<String> salaNameList;
/** 所属大厅名称排除列表 */
private List <String> salaNameNotList;
/** 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<AttendanceRecordErrorQuery> orConditionList; private List<AttendanceRecordErrorQuery> orConditionList;
...@@ -250,1731 +270,1844 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity { ...@@ -250,1731 +270,1844 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
public AttendanceRecordErrorQuery(){} public AttendanceRecordErrorQuery(){}
/** /**
* 获取 开始 序号，主键，自增长 * 获取 开始 序号，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 序号，主键，自增长 * 获取 结束 序号，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 序号，主键，自增长 * 获取 增加 序号，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 序号，主键，自增长 * 获取 序号，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 序号，主键，自增长 * 获取 序号，主键，自增长
* @return idNotList * @return idNotList
*/ */
public List<Long> getIdNotList(){ public List<Long> getIdNotList(){
return this.idNotList; return this.idNotList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idNotList * @param idNotList
*/ */
public void setIdNotList(List<Long> idNotList){ public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
} }
/** /**
* 获取 开始 员工ID * 获取 开始 员工ID
* @return staffIdStart * @return staffIdStart
*/ */
public Long getStaffIdStart(){ public Long getStaffIdStart(){
return this.staffIdStart; return this.staffIdStart;
} }
/** /**
* 设置 开始 员工ID * 设置 开始 员工ID
* @param staffIdStart * @param staffIdStart
*/ */
public void setStaffIdStart(Long staffIdStart){ public void setStaffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart; this.staffIdStart = staffIdStart;
} }
/** /**
* 获取 结束 员工ID * 获取 结束 员工ID
* @return $staffIdEnd * @return $staffIdEnd
*/ */
public Long getStaffIdEnd(){ public Long getStaffIdEnd(){
return this.staffIdEnd; return this.staffIdEnd;
} }
/** /**
* 设置 结束 员工ID * 设置 结束 员工ID
* @param staffIdEnd * @param staffIdEnd
*/ */
public void setStaffIdEnd(Long staffIdEnd){ public void setStaffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd; this.staffIdEnd = staffIdEnd;
} }
/** /**
* 获取 增加 员工ID * 获取 增加 员工ID
* @return staffIdIncrement * @return staffIdIncrement
*/ */
public Long getStaffIdIncrement(){ public Long getStaffIdIncrement(){
return this.staffIdIncrement; return this.staffIdIncrement;
} }
/** /**
* 设置 增加 员工ID * 设置 增加 员工ID
* @param staffIdIncrement * @param staffIdIncrement
*/ */
public void setStaffIdIncrement(Long staffIdIncrement){ public void setStaffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement; this.staffIdIncrement = staffIdIncrement;
} }
/** /**
* 获取 员工ID * 获取 员工ID
* @return staffIdList * @return staffIdList
*/ */
public List<Long> getStaffIdList(){ public List<Long> getStaffIdList(){
return this.staffIdList; return this.staffIdList;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdList * @param staffIdList
*/ */
public void setStaffIdList(List<Long> staffIdList){ public void setStaffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList; this.staffIdList = staffIdList;
} }
/** /**
* 获取 员工ID * 获取 员工ID
* @return staffIdNotList * @return staffIdNotList
*/ */
public List<Long> getStaffIdNotList(){ public List<Long> getStaffIdNotList(){
return this.staffIdNotList; return this.staffIdNotList;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdNotList * @param staffIdNotList
*/ */
public void setStaffIdNotList(List<Long> staffIdNotList){ public void setStaffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList; this.staffIdNotList = staffIdNotList;
} }
/** /**
* 获取 员工姓名 * 获取 员工姓名
* @return staffNameList * @return staffNameList
*/ */
public List<String> getStaffNameList(){ public List<String> getStaffNameList(){
return this.staffNameList; return this.staffNameList;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffNameList * @param staffNameList
*/ */
public void setStaffNameList(List<String> staffNameList){ public void setStaffNameList(List<String> staffNameList){
this.staffNameList = staffNameList; this.staffNameList = staffNameList;
} }
/** /**
* 获取 员工姓名 * 获取 员工姓名
* @return staffNameNotList * @return staffNameNotList
*/ */
public List<String> getStaffNameNotList(){ public List<String> getStaffNameNotList(){
return this.staffNameNotList; return this.staffNameNotList;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffNameNotList * @param staffNameNotList
*/ */
public void setStaffNameNotList(List<String> staffNameNotList){ public void setStaffNameNotList(List<String> staffNameNotList){
this.staffNameNotList = staffNameNotList; this.staffNameNotList = staffNameNotList;
} }
/** /**
* 获取 工号 * 获取 工号
* @return workNumList * @return workNumList
*/ */
public List<String> getWorkNumList(){ public List<String> getWorkNumList(){
return this.workNumList; return this.workNumList;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNumList * @param workNumList
*/ */
public void setWorkNumList(List<String> workNumList){ public void setWorkNumList(List<String> workNumList){
this.workNumList = workNumList; this.workNumList = workNumList;
} }
/** /**
* 获取 工号 * 获取 工号
* @return workNumNotList * @return workNumNotList
*/ */
public List<String> getWorkNumNotList(){ public List<String> getWorkNumNotList(){
return this.workNumNotList; return this.workNumNotList;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNumNotList * @param workNumNotList
*/ */
public void setWorkNumNotList(List<String> workNumNotList){ public void setWorkNumNotList(List<String> workNumNotList){
this.workNumNotList = workNumNotList; this.workNumNotList = workNumNotList;
} }
/** /**
* 获取 开始 所属部门 * 获取 开始 所属部门
* @return deptIdStart * @return deptIdStart
*/ */
public Long getDeptIdStart(){ public Long getDeptIdStart(){
return this.deptIdStart; return this.deptIdStart;
} }
/** /**
* 设置 开始 所属部门 * 设置 开始 所属部门
* @param deptIdStart * @param deptIdStart
*/ */
public void setDeptIdStart(Long deptIdStart){ public void setDeptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart; this.deptIdStart = deptIdStart;
} }
/** /**
* 获取 结束 所属部门 * 获取 结束 所属部门
* @return $deptIdEnd * @return $deptIdEnd
*/ */
public Long getDeptIdEnd(){ public Long getDeptIdEnd(){
return this.deptIdEnd; return this.deptIdEnd;
} }
/** /**
* 设置 结束 所属部门 * 设置 结束 所属部门
* @param deptIdEnd * @param deptIdEnd
*/ */
public void setDeptIdEnd(Long deptIdEnd){ public void setDeptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd; this.deptIdEnd = deptIdEnd;
} }
/** /**
* 获取 增加 所属部门 * 获取 增加 所属部门
* @return deptIdIncrement * @return deptIdIncrement
*/ */
public Long getDeptIdIncrement(){ public Long getDeptIdIncrement(){
return this.deptIdIncrement; return this.deptIdIncrement;
} }
/** /**
* 设置 增加 所属部门 * 设置 增加 所属部门
* @param deptIdIncrement * @param deptIdIncrement
*/ */
public void setDeptIdIncrement(Long deptIdIncrement){ public void setDeptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement; this.deptIdIncrement = deptIdIncrement;
} }
/** /**
* 获取 所属部门 * 获取 所属部门
* @return deptIdList * @return deptIdList
*/ */
public List<Long> getDeptIdList(){ public List<Long> getDeptIdList(){
return this.deptIdList; return this.deptIdList;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdList * @param deptIdList
*/ */
public void setDeptIdList(List<Long> deptIdList){ public void setDeptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList; this.deptIdList = deptIdList;
} }
/** /**
* 获取 所属部门 * 获取 所属部门
* @return deptIdNotList * @return deptIdNotList
*/ */
public List<Long> getDeptIdNotList(){ public List<Long> getDeptIdNotList(){
return this.deptIdNotList; return this.deptIdNotList;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdNotList * @param deptIdNotList
*/ */
public void setDeptIdNotList(List<Long> deptIdNotList){ public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList; this.deptIdNotList = deptIdNotList;
} }
/** /**
* 获取 所属部门名称 * 获取 所属部门名称
* @return deptNameList * @return deptNameList
*/ */
public List<String> getDeptNameList(){ public List<String> getDeptNameList(){
return this.deptNameList; return this.deptNameList;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptNameList * @param deptNameList
*/ */
public void setDeptNameList(List<String> deptNameList){ public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList; this.deptNameList = deptNameList;
} }
/** /**
* 获取 所属部门名称 * 获取 所属部门名称
* @return deptNameNotList * @return deptNameNotList
*/ */
public List<String> getDeptNameNotList(){ public List<String> getDeptNameNotList(){
return this.deptNameNotList; return this.deptNameNotList;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptNameNotList * @param deptNameNotList
*/ */
public void setDeptNameNotList(List<String> deptNameNotList){ public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList; this.deptNameNotList = deptNameNotList;
} }
/** /**
* 获取 开始 职位ID * 获取 开始 职位ID
* @return positionIdStart * @return positionIdStart
*/ */
public Long getPositionIdStart(){ public Long getPositionIdStart(){
return this.positionIdStart; return this.positionIdStart;
} }
/** /**
* 设置 开始 职位ID * 设置 开始 职位ID
* @param positionIdStart * @param positionIdStart
*/ */
public void setPositionIdStart(Long positionIdStart){ public void setPositionIdStart(Long positionIdStart){
this.positionIdStart = positionIdStart; this.positionIdStart = positionIdStart;
} }
/** /**
* 获取 结束 职位ID * 获取 结束 职位ID
* @return $positionIdEnd * @return $positionIdEnd
*/ */
public Long getPositionIdEnd(){ public Long getPositionIdEnd(){
return this.positionIdEnd; return this.positionIdEnd;
} }
/** /**
* 设置 结束 职位ID * 设置 结束 职位ID
* @param positionIdEnd * @param positionIdEnd
*/ */
public void setPositionIdEnd(Long positionIdEnd){ public void setPositionIdEnd(Long positionIdEnd){
this.positionIdEnd = positionIdEnd; this.positionIdEnd = positionIdEnd;
} }
/** /**
* 获取 增加 职位ID * 获取 增加 职位ID
* @return positionIdIncrement * @return positionIdIncrement
*/ */
public Long getPositionIdIncrement(){ public Long getPositionIdIncrement(){
return this.positionIdIncrement; return this.positionIdIncrement;
} }
/** /**
* 设置 增加 职位ID * 设置 增加 职位ID
* @param positionIdIncrement * @param positionIdIncrement
*/ */
public void setPositionIdIncrement(Long positionIdIncrement){ public void setPositionIdIncrement(Long positionIdIncrement){
this.positionIdIncrement = positionIdIncrement; this.positionIdIncrement = positionIdIncrement;
} }
/** /**
* 获取 职位ID * 获取 职位ID
* @return positionIdList * @return positionIdList
*/ */
public List<Long> getPositionIdList(){ public List<Long> getPositionIdList(){
return this.positionIdList; return this.positionIdList;
} }
/** /**
* 设置 职位ID * 设置 职位ID
* @param positionIdList * @param positionIdList
*/ */
public void setPositionIdList(List<Long> positionIdList){ public void setPositionIdList(List<Long> positionIdList){
this.positionIdList = positionIdList; this.positionIdList = positionIdList;
} }
/** /**
* 获取 职位ID * 获取 职位ID
* @return positionIdNotList * @return positionIdNotList
*/ */
public List<Long> getPositionIdNotList(){ public List<Long> getPositionIdNotList(){
return this.positionIdNotList; return this.positionIdNotList;
} }
/** /**
* 设置 职位ID * 设置 职位ID
* @param positionIdNotList * @param positionIdNotList
*/ */
public void setPositionIdNotList(List<Long> positionIdNotList){ public void setPositionIdNotList(List<Long> positionIdNotList){
this.positionIdNotList = positionIdNotList; this.positionIdNotList = positionIdNotList;
} }
/** /**
* 获取 职位名称 * 获取 职位名称
* @return positionNameList * @return positionNameList
*/ */
public List<String> getPositionNameList(){ public List<String> getPositionNameList(){
return this.positionNameList; return this.positionNameList;
} }
/** /**
* 设置 职位名称 * 设置 职位名称
* @param positionNameList * @param positionNameList
*/ */
public void setPositionNameList(List<String> positionNameList){ public void setPositionNameList(List<String> positionNameList){
this.positionNameList = positionNameList; this.positionNameList = positionNameList;
} }
/** /**
* 获取 职位名称 * 获取 职位名称
* @return positionNameNotList * @return positionNameNotList
*/ */
public List<String> getPositionNameNotList(){ public List<String> getPositionNameNotList(){
return this.positionNameNotList; return this.positionNameNotList;
} }
/** /**
* 设置 职位名称 * 设置 职位名称
* @param positionNameNotList * @param positionNameNotList
*/ */
public void setPositionNameNotList(List<String> positionNameNotList){ public void setPositionNameNotList(List<String> positionNameNotList){
this.positionNameNotList = positionNameNotList; this.positionNameNotList = positionNameNotList;
} }
/** /**
* 获取 开始 所属考勤组ID * 获取 开始 所属考勤组ID
* @return attendanceGroupIdStart * @return attendanceGroupIdStart
*/ */
public Long getAttendanceGroupIdStart(){ public Long getAttendanceGroupIdStart(){
return this.attendanceGroupIdStart; return this.attendanceGroupIdStart;
} }
/** /**
* 设置 开始 所属考勤组ID * 设置 开始 所属考勤组ID
* @param attendanceGroupIdStart * @param attendanceGroupIdStart
*/ */
public void setAttendanceGroupIdStart(Long attendanceGroupIdStart){ public void setAttendanceGroupIdStart(Long attendanceGroupIdStart){
this.attendanceGroupIdStart = attendanceGroupIdStart; this.attendanceGroupIdStart = attendanceGroupIdStart;
} }
/** /**
* 获取 结束 所属考勤组ID * 获取 结束 所属考勤组ID
* @return $attendanceGroupIdEnd * @return $attendanceGroupIdEnd
*/ */
public Long getAttendanceGroupIdEnd(){ public Long getAttendanceGroupIdEnd(){
return this.attendanceGroupIdEnd; return this.attendanceGroupIdEnd;
} }
/** /**
* 设置 结束 所属考勤组ID * 设置 结束 所属考勤组ID
* @param attendanceGroupIdEnd * @param attendanceGroupIdEnd
*/ */
public void setAttendanceGroupIdEnd(Long attendanceGroupIdEnd){ public void setAttendanceGroupIdEnd(Long attendanceGroupIdEnd){
this.attendanceGroupIdEnd = attendanceGroupIdEnd; this.attendanceGroupIdEnd = attendanceGroupIdEnd;
} }
/** /**
* 获取 增加 所属考勤组ID * 获取 增加 所属考勤组ID
* @return attendanceGroupIdIncrement * @return attendanceGroupIdIncrement
*/ */
public Long getAttendanceGroupIdIncrement(){ public Long getAttendanceGroupIdIncrement(){
return this.attendanceGroupIdIncrement; return this.attendanceGroupIdIncrement;
} }
/** /**
* 设置 增加 所属考勤组ID * 设置 增加 所属考勤组ID
* @param attendanceGroupIdIncrement * @param attendanceGroupIdIncrement
*/ */
public void setAttendanceGroupIdIncrement(Long attendanceGroupIdIncrement){ public void setAttendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
this.attendanceGroupIdIncrement = attendanceGroupIdIncrement; this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
} }
/** /**
* 获取 所属考勤组ID * 获取 所属考勤组ID
* @return attendanceGroupIdList * @return attendanceGroupIdList
*/ */
public List<Long> getAttendanceGroupIdList(){ public List<Long> getAttendanceGroupIdList(){
return this.attendanceGroupIdList; return this.attendanceGroupIdList;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdList * @param attendanceGroupIdList
*/ */
public void setAttendanceGroupIdList(List<Long> attendanceGroupIdList){ public void setAttendanceGroupIdList(List<Long> attendanceGroupIdList){
this.attendanceGroupIdList = attendanceGroupIdList; this.attendanceGroupIdList = attendanceGroupIdList;
} }
/** /**
* 获取 所属考勤组ID * 获取 所属考勤组ID
* @return attendanceGroupIdNotList * @return attendanceGroupIdNotList
*/ */
public List<Long> getAttendanceGroupIdNotList(){ public List<Long> getAttendanceGroupIdNotList(){
return this.attendanceGroupIdNotList; return this.attendanceGroupIdNotList;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdNotList * @param attendanceGroupIdNotList
*/ */
public void setAttendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){ public void setAttendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
this.attendanceGroupIdNotList = attendanceGroupIdNotList; this.attendanceGroupIdNotList = attendanceGroupIdNotList;
} }
/** /**
* 获取 所属考勤组名称 * 获取 所属考勤组名称
* @return attendanceGroupNameList * @return attendanceGroupNameList
*/ */
public List<String> getAttendanceGroupNameList(){ public List<String> getAttendanceGroupNameList(){
return this.attendanceGroupNameList; return this.attendanceGroupNameList;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupNameList * @param attendanceGroupNameList
*/ */
public void setAttendanceGroupNameList(List<String> attendanceGroupNameList){ public void setAttendanceGroupNameList(List<String> attendanceGroupNameList){
this.attendanceGroupNameList = attendanceGroupNameList; this.attendanceGroupNameList = attendanceGroupNameList;
} }
/** /**
* 获取 所属考勤组名称 * 获取 所属考勤组名称
* @return attendanceGroupNameNotList * @return attendanceGroupNameNotList
*/ */
public List<String> getAttendanceGroupNameNotList(){ public List<String> getAttendanceGroupNameNotList(){
return this.attendanceGroupNameNotList; return this.attendanceGroupNameNotList;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupNameNotList * @param attendanceGroupNameNotList
*/ */
public void setAttendanceGroupNameNotList(List<String> attendanceGroupNameNotList){ public void setAttendanceGroupNameNotList(List<String> attendanceGroupNameNotList){
this.attendanceGroupNameNotList = attendanceGroupNameNotList; this.attendanceGroupNameNotList = attendanceGroupNameNotList;
} }
/** /**
* 获取 开始 班次ID * 获取 开始 班次ID
* @return shiftsIdStart * @return shiftsIdStart
*/ */
public Long getShiftsIdStart(){ public Long getShiftsIdStart(){
return this.shiftsIdStart; return this.shiftsIdStart;
} }
/** /**
* 设置 开始 班次ID * 设置 开始 班次ID
* @param shiftsIdStart * @param shiftsIdStart
*/ */
public void setShiftsIdStart(Long shiftsIdStart){ public void setShiftsIdStart(Long shiftsIdStart){
this.shiftsIdStart = shiftsIdStart; this.shiftsIdStart = shiftsIdStart;
} }
/** /**
* 获取 结束 班次ID * 获取 结束 班次ID
* @return $shiftsIdEnd * @return $shiftsIdEnd
*/ */
public Long getShiftsIdEnd(){ public Long getShiftsIdEnd(){
return this.shiftsIdEnd; return this.shiftsIdEnd;
} }
/** /**
* 设置 结束 班次ID * 设置 结束 班次ID
* @param shiftsIdEnd * @param shiftsIdEnd
*/ */
public void setShiftsIdEnd(Long shiftsIdEnd){ public void setShiftsIdEnd(Long shiftsIdEnd){
this.shiftsIdEnd = shiftsIdEnd; this.shiftsIdEnd = shiftsIdEnd;
} }
/** /**
* 获取 增加 班次ID * 获取 增加 班次ID
* @return shiftsIdIncrement * @return shiftsIdIncrement
*/ */
public Long getShiftsIdIncrement(){ public Long getShiftsIdIncrement(){
return this.shiftsIdIncrement; return this.shiftsIdIncrement;
} }
/** /**
* 设置 增加 班次ID * 设置 增加 班次ID
* @param shiftsIdIncrement * @param shiftsIdIncrement
*/ */
public void setShiftsIdIncrement(Long shiftsIdIncrement){ public void setShiftsIdIncrement(Long shiftsIdIncrement){
this.shiftsIdIncrement = shiftsIdIncrement; this.shiftsIdIncrement = shiftsIdIncrement;
} }
/** /**
* 获取 班次ID * 获取 班次ID
* @return shiftsIdList * @return shiftsIdList
*/ */
public List<Long> getShiftsIdList(){ public List<Long> getShiftsIdList(){
return this.shiftsIdList; return this.shiftsIdList;
} }
/** /**
* 设置 班次ID * 设置 班次ID
* @param shiftsIdList * @param shiftsIdList
*/ */
public void setShiftsIdList(List<Long> shiftsIdList){ public void setShiftsIdList(List<Long> shiftsIdList){
this.shiftsIdList = shiftsIdList; this.shiftsIdList = shiftsIdList;
} }
/** /**
* 获取 班次ID * 获取 班次ID
* @return shiftsIdNotList * @return shiftsIdNotList
*/ */
public List<Long> getShiftsIdNotList(){ public List<Long> getShiftsIdNotList(){
return this.shiftsIdNotList; return this.shiftsIdNotList;
} }
/** /**
* 设置 班次ID * 设置 班次ID
* @param shiftsIdNotList * @param shiftsIdNotList
*/ */
public void setShiftsIdNotList(List<Long> shiftsIdNotList){ public void setShiftsIdNotList(List<Long> shiftsIdNotList){
this.shiftsIdNotList = shiftsIdNotList; this.shiftsIdNotList = shiftsIdNotList;
} }
/** /**
* 获取 班次名称 * 获取 班次名称
* @return shiftsNameList * @return shiftsNameList
*/ */
public List<String> getShiftsNameList(){ public List<String> getShiftsNameList(){
return this.shiftsNameList; return this.shiftsNameList;
} }
/** /**
* 设置 班次名称 * 设置 班次名称
* @param shiftsNameList * @param shiftsNameList
*/ */
public void setShiftsNameList(List<String> shiftsNameList){ public void setShiftsNameList(List<String> shiftsNameList){
this.shiftsNameList = shiftsNameList; this.shiftsNameList = shiftsNameList;
} }
/** /**
* 获取 班次名称 * 获取 班次名称
* @return shiftsNameNotList * @return shiftsNameNotList
*/ */
public List<String> getShiftsNameNotList(){ public List<String> getShiftsNameNotList(){
return this.shiftsNameNotList; return this.shiftsNameNotList;
} }
/** /**
* 设置 班次名称 * 设置 班次名称
* @param shiftsNameNotList * @param shiftsNameNotList
*/ */
public void setShiftsNameNotList(List<String> shiftsNameNotList){ public void setShiftsNameNotList(List<String> shiftsNameNotList){
this.shiftsNameNotList = shiftsNameNotList; this.shiftsNameNotList = shiftsNameNotList;
} }
/** /**
* 获取 开始 上下班时间 * 获取 开始 上下班时间
* @return goOffDateTimeStart * @return goOffDateTimeStart
*/ */
public String getGoOffDateTimeStart(){ public String getGoOffDateTimeStart(){
return this.goOffDateTimeStart; return this.goOffDateTimeStart;
} }
/** /**
* 设置 开始 上下班时间 * 设置 开始 上下班时间
* @param goOffDateTimeStart * @param goOffDateTimeStart
*/ */
public void setGoOffDateTimeStart(String goOffDateTimeStart){ public void setGoOffDateTimeStart(String goOffDateTimeStart){
this.goOffDateTimeStart = goOffDateTimeStart; this.goOffDateTimeStart = goOffDateTimeStart;
} }
/** /**
* 获取 结束 上下班时间 * 获取 结束 上下班时间
* @return goOffDateTimeEnd * @return goOffDateTimeEnd
*/ */
public String getGoOffDateTimeEnd(){ public String getGoOffDateTimeEnd(){
return this.goOffDateTimeEnd; return this.goOffDateTimeEnd;
} }
/** /**
* 设置 结束 上下班时间 * 设置 结束 上下班时间
* @param goOffDateTimeEnd * @param goOffDateTimeEnd
*/ */
public void setGoOffDateTimeEnd(String goOffDateTimeEnd){ public void setGoOffDateTimeEnd(String goOffDateTimeEnd){
this.goOffDateTimeEnd = goOffDateTimeEnd; this.goOffDateTimeEnd = goOffDateTimeEnd;
} }
/** /**
* 获取 开始 异常时间 * 获取 开始 异常时间
* @return errorDateTimeStart * @return errorDateTimeStart
*/ */
public String getErrorDateTimeStart(){ public String getErrorDateTimeStart(){
return this.errorDateTimeStart; return this.errorDateTimeStart;
} }
/** /**
* 设置 开始 异常时间 * 设置 开始 异常时间
* @param errorDateTimeStart * @param errorDateTimeStart
*/ */
public void setErrorDateTimeStart(String errorDateTimeStart){ public void setErrorDateTimeStart(String errorDateTimeStart){
this.errorDateTimeStart = errorDateTimeStart; this.errorDateTimeStart = errorDateTimeStart;
} }
/** /**
* 获取 结束 异常时间 * 获取 结束 异常时间
* @return errorDateTimeEnd * @return errorDateTimeEnd
*/ */
public String getErrorDateTimeEnd(){ public String getErrorDateTimeEnd(){
return this.errorDateTimeEnd; return this.errorDateTimeEnd;
} }
/** /**
* 设置 结束 异常时间 * 设置 结束 异常时间
* @param errorDateTimeEnd * @param errorDateTimeEnd
*/ */
public void setErrorDateTimeEnd(String errorDateTimeEnd){ public void setErrorDateTimeEnd(String errorDateTimeEnd){
this.errorDateTimeEnd = errorDateTimeEnd; this.errorDateTimeEnd = errorDateTimeEnd;
} }
/** /**
* 获取 开始 实际打卡时间 * 获取 开始 实际打卡时间
* @return actualAttendanceDateTimeStart * @return actualAttendanceDateTimeStart
*/ */
public String getActualAttendanceDateTimeStart(){ public String getActualAttendanceDateTimeStart(){
return this.actualAttendanceDateTimeStart; return this.actualAttendanceDateTimeStart;
} }
/** /**
* 设置 开始 实际打卡时间 * 设置 开始 实际打卡时间
* @param actualAttendanceDateTimeStart * @param actualAttendanceDateTimeStart
*/ */
public void setActualAttendanceDateTimeStart(String actualAttendanceDateTimeStart){ public void setActualAttendanceDateTimeStart(String actualAttendanceDateTimeStart){
this.actualAttendanceDateTimeStart = actualAttendanceDateTimeStart; this.actualAttendanceDateTimeStart = actualAttendanceDateTimeStart;
} }
/** /**
* 获取 结束 实际打卡时间 * 获取 结束 实际打卡时间
* @return actualAttendanceDateTimeEnd * @return actualAttendanceDateTimeEnd
*/ */
public String getActualAttendanceDateTimeEnd(){ public String getActualAttendanceDateTimeEnd(){
return this.actualAttendanceDateTimeEnd; return this.actualAttendanceDateTimeEnd;
} }
/** /**
* 设置 结束 实际打卡时间 * 设置 结束 实际打卡时间
* @param actualAttendanceDateTimeEnd * @param actualAttendanceDateTimeEnd
*/ */
public void setActualAttendanceDateTimeEnd(String actualAttendanceDateTimeEnd){ public void setActualAttendanceDateTimeEnd(String actualAttendanceDateTimeEnd){
this.actualAttendanceDateTimeEnd = actualAttendanceDateTimeEnd; this.actualAttendanceDateTimeEnd = actualAttendanceDateTimeEnd;
} }
/** /**
* 获取 开始 处理时间 * 获取 开始 处理时间
* @return operDateTimeStart * @return operDateTimeStart
*/ */
public String getOperDateTimeStart(){ public String getOperDateTimeStart(){
return this.operDateTimeStart; return this.operDateTimeStart;
} }
/** /**
* 设置 开始 处理时间 * 设置 开始 处理时间
* @param operDateTimeStart * @param operDateTimeStart
*/ */
public void setOperDateTimeStart(String operDateTimeStart){ public void setOperDateTimeStart(String operDateTimeStart){
this.operDateTimeStart = operDateTimeStart; this.operDateTimeStart = operDateTimeStart;
} }
/** /**
* 获取 结束 处理时间 * 获取 结束 处理时间
* @return operDateTimeEnd * @return operDateTimeEnd
*/ */
public String getOperDateTimeEnd(){ public String getOperDateTimeEnd(){
return this.operDateTimeEnd; return this.operDateTimeEnd;
} }
/** /**
* 设置 结束 处理时间 * 设置 结束 处理时间
* @param operDateTimeEnd * @param operDateTimeEnd
*/ */
public void setOperDateTimeEnd(String operDateTimeEnd){ public void setOperDateTimeEnd(String operDateTimeEnd){
this.operDateTimeEnd = operDateTimeEnd; this.operDateTimeEnd = operDateTimeEnd;
} }
/** /**
* 获取 处理人 * 获取 处理人
* @return opertorList * @return opertorList
*/ */
public List<String> getOpertorList(){ public List<String> getOpertorList(){
return this.opertorList; return this.opertorList;
} }
/** /**
* 设置 处理人 * 设置 处理人
* @param opertorList * @param opertorList
*/ */
public void setOpertorList(List<String> opertorList){ public void setOpertorList(List<String> opertorList){
this.opertorList = opertorList; this.opertorList = opertorList;
} }
/** /**
* 获取 处理人 * 获取 处理人
* @return opertorNotList * @return opertorNotList
*/ */
public List<String> getOpertorNotList(){ public List<String> getOpertorNotList(){
return this.opertorNotList; return this.opertorNotList;
} }
/** /**
* 设置 处理人 * 设置 处理人
* @param opertorNotList * @param opertorNotList
*/ */
public void setOpertorNotList(List<String> opertorNotList){ public void setOpertorNotList(List<String> opertorNotList){
this.opertorNotList = opertorNotList; this.opertorNotList = opertorNotList;
} }
/** /**
* 获取 开始 异常状态(0.缺卡,1.早退,2.缺卡) * 获取 开始 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusStart * @return errorStatusStart
*/ */
public Integer getErrorStatusStart(){ public Integer getErrorStatusStart(){
return this.errorStatusStart; return this.errorStatusStart;
} }
/** /**
* 设置 开始 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 开始 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusStart * @param errorStatusStart
*/ */
public void setErrorStatusStart(Integer errorStatusStart){ public void setErrorStatusStart(Integer errorStatusStart){
this.errorStatusStart = errorStatusStart; this.errorStatusStart = errorStatusStart;
} }
/** /**
* 获取 结束 异常状态(0.缺卡,1.早退,2.缺卡) * 获取 结束 异常状态(0.缺卡,1.早退,2.迟到)
* @return $errorStatusEnd * @return $errorStatusEnd
*/ */
public Integer getErrorStatusEnd(){ public Integer getErrorStatusEnd(){
return this.errorStatusEnd; return this.errorStatusEnd;
} }
/** /**
* 设置 结束 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 结束 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusEnd * @param errorStatusEnd
*/ */
public void setErrorStatusEnd(Integer errorStatusEnd){ public void setErrorStatusEnd(Integer errorStatusEnd){
this.errorStatusEnd = errorStatusEnd; this.errorStatusEnd = errorStatusEnd;
} }
/** /**
* 获取 增加 异常状态(0.缺卡,1.早退,2.缺卡) * 获取 增加 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusIncrement * @return errorStatusIncrement
*/ */
public Integer getErrorStatusIncrement(){ public Integer getErrorStatusIncrement(){
return this.errorStatusIncrement; return this.errorStatusIncrement;
} }
/** /**
* 设置 增加 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 增加 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusIncrement * @param errorStatusIncrement
*/ */
public void setErrorStatusIncrement(Integer errorStatusIncrement){ public void setErrorStatusIncrement(Integer errorStatusIncrement){
this.errorStatusIncrement = errorStatusIncrement; this.errorStatusIncrement = errorStatusIncrement;
} }
/** /**
* 获取 异常状态(0.缺卡,1.早退,2.缺卡) * 获取 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusList * @return errorStatusList
*/ */
public List<Integer> getErrorStatusList(){ public List<Integer> getErrorStatusList(){
return this.errorStatusList; return this.errorStatusList;
} }
/** /**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusList * @param errorStatusList
*/ */
public void setErrorStatusList(List<Integer> errorStatusList){ public void setErrorStatusList(List<Integer> errorStatusList){
this.errorStatusList = errorStatusList; this.errorStatusList = errorStatusList;
} }
/** /**
* 获取 异常状态(0.缺卡,1.早退,2.缺卡) * 获取 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusNotList * @return errorStatusNotList
*/ */
public List<Integer> getErrorStatusNotList(){ public List<Integer> getErrorStatusNotList(){
return this.errorStatusNotList; return this.errorStatusNotList;
} }
/** /**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusNotList * @param errorStatusNotList
*/ */
public void setErrorStatusNotList(List<Integer> errorStatusNotList){ public void setErrorStatusNotList(List<Integer> errorStatusNotList){
this.errorStatusNotList = errorStatusNotList; this.errorStatusNotList = errorStatusNotList;
} }
/** /**
* 获取 开始 处理状态(0.未处理,1.已处理) * 获取 开始 处理状态(0.未处理,1.已处理)
* @return processStatusStart * @return processStatusStart
*/ */
public Integer getProcessStatusStart(){ public Integer getProcessStatusStart(){
return this.processStatusStart; return this.processStatusStart;
} }
/** /**
* 设置 开始 处理状态(0.未处理,1.已处理) * 设置 开始 处理状态(0.未处理,1.已处理)
* @param processStatusStart * @param processStatusStart
*/ */
public void setProcessStatusStart(Integer processStatusStart){ public void setProcessStatusStart(Integer processStatusStart){
this.processStatusStart = processStatusStart; this.processStatusStart = processStatusStart;
} }
/** /**
* 获取 结束 处理状态(0.未处理,1.已处理) * 获取 结束 处理状态(0.未处理,1.已处理)
* @return $processStatusEnd * @return $processStatusEnd
*/ */
public Integer getProcessStatusEnd(){ public Integer getProcessStatusEnd(){
return this.processStatusEnd; return this.processStatusEnd;
} }
/** /**
* 设置 结束 处理状态(0.未处理,1.已处理) * 设置 结束 处理状态(0.未处理,1.已处理)
* @param processStatusEnd * @param processStatusEnd
*/ */
public void setProcessStatusEnd(Integer processStatusEnd){ public void setProcessStatusEnd(Integer processStatusEnd){
this.processStatusEnd = processStatusEnd; this.processStatusEnd = processStatusEnd;
} }
/** /**
* 获取 增加 处理状态(0.未处理,1.已处理) * 获取 增加 处理状态(0.未处理,1.已处理)
* @return processStatusIncrement * @return processStatusIncrement
*/ */
public Integer getProcessStatusIncrement(){ public Integer getProcessStatusIncrement(){
return this.processStatusIncrement; return this.processStatusIncrement;
} }
/** /**
* 设置 增加 处理状态(0.未处理,1.已处理) * 设置 增加 处理状态(0.未处理,1.已处理)
* @param processStatusIncrement * @param processStatusIncrement
*/ */
public void setProcessStatusIncrement(Integer processStatusIncrement){ public void setProcessStatusIncrement(Integer processStatusIncrement){
this.processStatusIncrement = processStatusIncrement; this.processStatusIncrement = processStatusIncrement;
} }
/** /**
* 获取 处理状态(0.未处理,1.已处理) * 获取 处理状态(0.未处理,1.已处理)
* @return processStatusList * @return processStatusList
*/ */
public List<Integer> getProcessStatusList(){ public List<Integer> getProcessStatusList(){
return this.processStatusList; return this.processStatusList;
} }
/** /**
* 设置 处理状态(0.未处理,1.已处理) * 设置 处理状态(0.未处理,1.已处理)
* @param processStatusList * @param processStatusList
*/ */
public void setProcessStatusList(List<Integer> processStatusList){ public void setProcessStatusList(List<Integer> processStatusList){
this.processStatusList = processStatusList; this.processStatusList = processStatusList;
} }
/** /**
* 获取 处理状态(0.未处理,1.已处理) * 获取 处理状态(0.未处理,1.已处理)
* @return processStatusNotList * @return processStatusNotList
*/ */
public List<Integer> getProcessStatusNotList(){ public List<Integer> getProcessStatusNotList(){
return this.processStatusNotList; return this.processStatusNotList;
} }
/** /**
* 设置 处理状态(0.未处理,1.已处理) * 设置 处理状态(0.未处理,1.已处理)
* @param processStatusNotList * @param processStatusNotList
*/ */
public void setProcessStatusNotList(List<Integer> processStatusNotList){ public void setProcessStatusNotList(List<Integer> processStatusNotList){
this.processStatusNotList = processStatusNotList; this.processStatusNotList = processStatusNotList;
} }
/** /**
* 获取 处理结果 * 获取 处理结果
* @return processResultList * @return processResultList
*/ */
public List<String> getProcessResultList(){ public List<String> getProcessResultList(){
return this.processResultList; return this.processResultList;
} }
/** /**
* 设置 处理结果 * 设置 处理结果
* @param processResultList * @param processResultList
*/ */
public void setProcessResultList(List<String> processResultList){ public void setProcessResultList(List<String> processResultList){
this.processResultList = processResultList; this.processResultList = processResultList;
} }
/** /**
* 获取 处理结果 * 获取 处理结果
* @return processResultNotList * @return processResultNotList
*/ */
public List<String> getProcessResultNotList(){ public List<String> getProcessResultNotList(){
return this.processResultNotList; return this.processResultNotList;
} }
/** /**
* 设置 处理结果 * 设置 处理结果
* @param processResultNotList * @param processResultNotList
*/ */
public void setProcessResultNotList(List<String> processResultNotList){ public void setProcessResultNotList(List<String> processResultNotList){
this.processResultNotList = processResultNotList; this.processResultNotList = processResultNotList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
*/ */
public List<String> getRemarkList(){ public List<String> getRemarkList(){
return this.remarkList; return this.remarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return remarkNotList * @return remarkNotList
*/ */
public List<String> getRemarkNotList(){ public List<String> getRemarkNotList(){
return this.remarkNotList; return this.remarkNotList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkNotList * @param remarkNotList
*/ */
public void setRemarkNotList(List<String> remarkNotList){ public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList; this.remarkNotList = remarkNotList;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdNotList * @return createUserIdNotList
*/ */
public List<Long> getCreateUserIdNotList(){ public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList; return this.createUserIdNotList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdNotList * @return updateUserIdNotList
*/ */
public List<Long> getUpdateUserIdNotList(){ public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList; return this.updateUserIdNotList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){ public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 序号，主键，自增长 * 获取 开始 所属大厅
* @param id * @return salaIdStart
*/ */
public Long getSalaIdStart(){
return this.salaIdStart;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public void setSalaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
}
/**
* 获取 结束 所属大厅
* @return $salaIdEnd
*/
public Long getSalaIdEnd(){
return this.salaIdEnd;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public void setSalaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
}
/**
* 获取 增加 所属大厅
* @return salaIdIncrement
*/
public Long getSalaIdIncrement(){
return this.salaIdIncrement;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public void setSalaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
}
/**
* 获取 所属大厅
* @return salaIdList
*/
public List<Long> getSalaIdList(){
return this.salaIdList;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public void setSalaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
}
/**
* 获取 所属大厅
* @return salaIdNotList
*/
public List<Long> getSalaIdNotList(){
return this.salaIdNotList;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public void setSalaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
}
/**
* 获取 所属大厅名称
* @return salaNameList
*/
public List<String> getSalaNameList(){
return this.salaNameList;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public void setSalaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
}
/**
* 获取 所属大厅名称
* @return salaNameNotList
*/
public List<String> getSalaNameNotList(){
return this.salaNameNotList;
}
/**
* 设置 所属大厅名称
* @param salaNameNotList
*/
public void setSalaNameNotList(List<String> salaNameNotList){
this.salaNameNotList = salaNameNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public AttendanceRecordErrorQuery id(Long id){ public AttendanceRecordErrorQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public AttendanceRecordErrorQuery idStart(Long idStart){ public AttendanceRecordErrorQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public AttendanceRecordErrorQuery idEnd(Long idEnd){ public AttendanceRecordErrorQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public AttendanceRecordErrorQuery idIncrement(Long idIncrement){ public AttendanceRecordErrorQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public AttendanceRecordErrorQuery idList(List<Long> idList){ public AttendanceRecordErrorQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idNotList * @param idNotList
*/ */
public AttendanceRecordErrorQuery idNotList(List<Long> idNotList){ public AttendanceRecordErrorQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList; this.idNotList = idNotList;
return this; return this;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffId * @param staffId
*/ */
public AttendanceRecordErrorQuery staffId(Long staffId){ public AttendanceRecordErrorQuery staffId(Long staffId){
setStaffId(staffId); setStaffId(staffId);
return this; return this;
} }
/** /**
* 设置 开始 员工ID * 设置 开始 员工ID
* @param staffIdStart * @param staffIdStart
*/ */
public AttendanceRecordErrorQuery staffIdStart(Long staffIdStart){ public AttendanceRecordErrorQuery staffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart; this.staffIdStart = staffIdStart;
return this; return this;
} }
/** /**
* 设置 结束 员工ID * 设置 结束 员工ID
* @param staffIdEnd * @param staffIdEnd
*/ */
public AttendanceRecordErrorQuery staffIdEnd(Long staffIdEnd){ public AttendanceRecordErrorQuery staffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd; this.staffIdEnd = staffIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 员工ID * 设置 增加 员工ID
* @param staffIdIncrement * @param staffIdIncrement
*/ */
public AttendanceRecordErrorQuery staffIdIncrement(Long staffIdIncrement){ public AttendanceRecordErrorQuery staffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement; this.staffIdIncrement = staffIdIncrement;
return this; return this;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdList * @param staffIdList
*/ */
public AttendanceRecordErrorQuery staffIdList(List<Long> staffIdList){ public AttendanceRecordErrorQuery staffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList; this.staffIdList = staffIdList;
return this; return this;
} }
/** /**
* 设置 员工ID * 设置 员工ID
* @param staffIdNotList * @param staffIdNotList
*/ */
public AttendanceRecordErrorQuery staffIdNotList(List<Long> staffIdNotList){ public AttendanceRecordErrorQuery staffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList; this.staffIdNotList = staffIdNotList;
return this; return this;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffName * @param staffName
*/ */
public AttendanceRecordErrorQuery staffName(String staffName){ public AttendanceRecordErrorQuery staffName(String staffName){
setStaffName(staffName); setStaffName(staffName);
return this; return this;
} }
/** /**
* 设置 员工姓名 * 设置 员工姓名
* @param staffNameList * @param staffNameList
*/ */
public AttendanceRecordErrorQuery staffNameList(List<String> staffNameList){ public AttendanceRecordErrorQuery staffNameList(List<String> staffNameList){
this.staffNameList = staffNameList; this.staffNameList = staffNameList;
return this; return this;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNum * @param workNum
*/ */
public AttendanceRecordErrorQuery workNum(String workNum){ public AttendanceRecordErrorQuery workNum(String workNum){
setWorkNum(workNum); setWorkNum(workNum);
return this; return this;
} }
/** /**
* 设置 工号 * 设置 工号
* @param workNumList * @param workNumList
*/ */
public AttendanceRecordErrorQuery workNumList(List<String> workNumList){ public AttendanceRecordErrorQuery workNumList(List<String> workNumList){
this.workNumList = workNumList; this.workNumList = workNumList;
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptId * @param deptId
*/ */
public AttendanceRecordErrorQuery deptId(Long deptId){ public AttendanceRecordErrorQuery deptId(Long deptId){
setDeptId(deptId); setDeptId(deptId);
return this; return this;
} }
/** /**
* 设置 开始 所属部门 * 设置 开始 所属部门
* @param deptIdStart * @param deptIdStart
*/ */
public AttendanceRecordErrorQuery deptIdStart(Long deptIdStart){ public AttendanceRecordErrorQuery deptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart; this.deptIdStart = deptIdStart;
return this; return this;
} }
/** /**
* 设置 结束 所属部门 * 设置 结束 所属部门
* @param deptIdEnd * @param deptIdEnd
*/ */
public AttendanceRecordErrorQuery deptIdEnd(Long deptIdEnd){ public AttendanceRecordErrorQuery deptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd; this.deptIdEnd = deptIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 所属部门 * 设置 增加 所属部门
* @param deptIdIncrement * @param deptIdIncrement
*/ */
public AttendanceRecordErrorQuery deptIdIncrement(Long deptIdIncrement){ public AttendanceRecordErrorQuery deptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement; this.deptIdIncrement = deptIdIncrement;
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdList * @param deptIdList
*/ */
public AttendanceRecordErrorQuery deptIdList(List<Long> deptIdList){ public AttendanceRecordErrorQuery deptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList; this.deptIdList = deptIdList;
return this; return this;
} }
/** /**
* 设置 所属部门 * 设置 所属部门
* @param deptIdNotList * @param deptIdNotList
*/ */
public AttendanceRecordErrorQuery deptIdNotList(List<Long> deptIdNotList){ public AttendanceRecordErrorQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList; this.deptIdNotList = deptIdNotList;
return this; return this;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptName * @param deptName
*/ */
public AttendanceRecordErrorQuery deptName(String deptName){ public AttendanceRecordErrorQuery deptName(String deptName){
setDeptName(deptName); setDeptName(deptName);
return this; return this;
} }
/** /**
* 设置 所属部门名称 * 设置 所属部门名称
* @param deptNameList * @param deptNameList
*/ */
public AttendanceRecordErrorQuery deptNameList(List<String> deptNameList){ public AttendanceRecordErrorQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList; this.deptNameList = deptNameList;
return this; return this;
} }
/** /**
* 设置 职位ID * 设置 职位ID
* @param positionId * @param positionId
*/ */
public AttendanceRecordErrorQuery positionId(Long positionId){ public AttendanceRecordErrorQuery positionId(Long positionId){
setPositionId(positionId); setPositionId(positionId);
return this; return this;
} }
/** /**
* 设置 开始 职位ID * 设置 开始 职位ID
* @param positionIdStart * @param positionIdStart
*/ */
public AttendanceRecordErrorQuery positionIdStart(Long positionIdStart){ public AttendanceRecordErrorQuery positionIdStart(Long positionIdStart){
this.positionIdStart = positionIdStart; this.positionIdStart = positionIdStart;
return this; return this;
} }
/** /**
* 设置 结束 职位ID * 设置 结束 职位ID
* @param positionIdEnd * @param positionIdEnd
*/ */
public AttendanceRecordErrorQuery positionIdEnd(Long positionIdEnd){ public AttendanceRecordErrorQuery positionIdEnd(Long positionIdEnd){
this.positionIdEnd = positionIdEnd; this.positionIdEnd = positionIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 职位ID * 设置 增加 职位ID
* @param positionIdIncrement * @param positionIdIncrement
*/ */
public AttendanceRecordErrorQuery positionIdIncrement(Long positionIdIncrement){ public AttendanceRecordErrorQuery positionIdIncrement(Long positionIdIncrement){
this.positionIdIncrement = positionIdIncrement; this.positionIdIncrement = positionIdIncrement;
return this; return this;
} }
/** /**
* 设置 职位ID * 设置 职位ID
* @param positionIdList * @param positionIdList
*/ */
public AttendanceRecordErrorQuery positionIdList(List<Long> positionIdList){ public AttendanceRecordErrorQuery positionIdList(List<Long> positionIdList){
this.positionIdList = positionIdList; this.positionIdList = positionIdList;
return this; return this;
} }
/** /**
* 设置 职位ID * 设置 职位ID
* @param positionIdNotList * @param positionIdNotList
*/ */
public AttendanceRecordErrorQuery positionIdNotList(List<Long> positionIdNotList){ public AttendanceRecordErrorQuery positionIdNotList(List<Long> positionIdNotList){
this.positionIdNotList = positionIdNotList; this.positionIdNotList = positionIdNotList;
return this; return this;
} }
/** /**
* 设置 职位名称 * 设置 职位名称
* @param positionName * @param positionName
*/ */
public AttendanceRecordErrorQuery positionName(String positionName){ public AttendanceRecordErrorQuery positionName(String positionName){
setPositionName(positionName); setPositionName(positionName);
return this; return this;
} }
/** /**
* 设置 职位名称 * 设置 职位名称
* @param positionNameList * @param positionNameList
*/ */
public AttendanceRecordErrorQuery positionNameList(List<String> positionNameList){ public AttendanceRecordErrorQuery positionNameList(List<String> positionNameList){
this.positionNameList = positionNameList; this.positionNameList = positionNameList;
return this; return this;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupId * @param attendanceGroupId
*/ */
public AttendanceRecordErrorQuery attendanceGroupId(Long attendanceGroupId){ public AttendanceRecordErrorQuery attendanceGroupId(Long attendanceGroupId){
setAttendanceGroupId(attendanceGroupId); setAttendanceGroupId(attendanceGroupId);
return this; return this;
} }
/** /**
* 设置 开始 所属考勤组ID * 设置 开始 所属考勤组ID
* @param attendanceGroupIdStart * @param attendanceGroupIdStart
*/ */
public AttendanceRecordErrorQuery attendanceGroupIdStart(Long attendanceGroupIdStart){ public AttendanceRecordErrorQuery attendanceGroupIdStart(Long attendanceGroupIdStart){
this.attendanceGroupIdStart = attendanceGroupIdStart; this.attendanceGroupIdStart = attendanceGroupIdStart;
return this; return this;
} }
/** /**
* 设置 结束 所属考勤组ID * 设置 结束 所属考勤组ID
* @param attendanceGroupIdEnd * @param attendanceGroupIdEnd
*/ */
public AttendanceRecordErrorQuery attendanceGroupIdEnd(Long attendanceGroupIdEnd){ public AttendanceRecordErrorQuery attendanceGroupIdEnd(Long attendanceGroupIdEnd){
this.attendanceGroupIdEnd = attendanceGroupIdEnd; this.attendanceGroupIdEnd = attendanceGroupIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 所属考勤组ID * 设置 增加 所属考勤组ID
* @param attendanceGroupIdIncrement * @param attendanceGroupIdIncrement
*/ */
public AttendanceRecordErrorQuery attendanceGroupIdIncrement(Long attendanceGroupIdIncrement){ public AttendanceRecordErrorQuery attendanceGroupIdIncrement(Long attendanceGroupIdIncrement){
this.attendanceGroupIdIncrement = attendanceGroupIdIncrement; this.attendanceGroupIdIncrement = attendanceGroupIdIncrement;
return this; return this;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdList * @param attendanceGroupIdList
*/ */
public AttendanceRecordErrorQuery attendanceGroupIdList(List<Long> attendanceGroupIdList){ public AttendanceRecordErrorQuery attendanceGroupIdList(List<Long> attendanceGroupIdList){
this.attendanceGroupIdList = attendanceGroupIdList; this.attendanceGroupIdList = attendanceGroupIdList;
return this; return this;
} }
/** /**
* 设置 所属考勤组ID * 设置 所属考勤组ID
* @param attendanceGroupIdNotList * @param attendanceGroupIdNotList
*/ */
public AttendanceRecordErrorQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){ public AttendanceRecordErrorQuery attendanceGroupIdNotList(List<Long> attendanceGroupIdNotList){
this.attendanceGroupIdNotList = attendanceGroupIdNotList; this.attendanceGroupIdNotList = attendanceGroupIdNotList;
return this; return this;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupName * @param attendanceGroupName
*/ */
public AttendanceRecordErrorQuery attendanceGroupName(String attendanceGroupName){ public AttendanceRecordErrorQuery attendanceGroupName(String attendanceGroupName){
setAttendanceGroupName(attendanceGroupName); setAttendanceGroupName(attendanceGroupName);
return this; return this;
} }
/** /**
* 设置 所属考勤组名称 * 设置 所属考勤组名称
* @param attendanceGroupNameList * @param attendanceGroupNameList
*/ */
public AttendanceRecordErrorQuery attendanceGroupNameList(List<String> attendanceGroupNameList){ public AttendanceRecordErrorQuery attendanceGroupNameList(List<String> attendanceGroupNameList){
this.attendanceGroupNameList = attendanceGroupNameList; this.attendanceGroupNameList = attendanceGroupNameList;
return this; return this;
} }
/** /**
* 设置 班次ID * 设置 班次ID
* @param shiftsId * @param shiftsId
*/ */
public AttendanceRecordErrorQuery shiftsId(Long shiftsId){ public AttendanceRecordErrorQuery shiftsId(Long shiftsId){
setShiftsId(shiftsId); setShiftsId(shiftsId);
return this; return this;
} }
/** /**
* 设置 开始 班次ID * 设置 开始 班次ID
* @param shiftsIdStart * @param shiftsIdStart
*/ */
public AttendanceRecordErrorQuery shiftsIdStart(Long shiftsIdStart){ public AttendanceRecordErrorQuery shiftsIdStart(Long shiftsIdStart){
this.shiftsIdStart = shiftsIdStart; this.shiftsIdStart = shiftsIdStart;
return this; return this;
} }
/** /**
* 设置 结束 班次ID * 设置 结束 班次ID
* @param shiftsIdEnd * @param shiftsIdEnd
*/ */
public AttendanceRecordErrorQuery shiftsIdEnd(Long shiftsIdEnd){ public AttendanceRecordErrorQuery shiftsIdEnd(Long shiftsIdEnd){
this.shiftsIdEnd = shiftsIdEnd; this.shiftsIdEnd = shiftsIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 班次ID * 设置 增加 班次ID
* @param shiftsIdIncrement * @param shiftsIdIncrement
*/ */
public AttendanceRecordErrorQuery shiftsIdIncrement(Long shiftsIdIncrement){ public AttendanceRecordErrorQuery shiftsIdIncrement(Long shiftsIdIncrement){
this.shiftsIdIncrement = shiftsIdIncrement; this.shiftsIdIncrement = shiftsIdIncrement;
return this; return this;
} }
/** /**
* 设置 班次ID * 设置 班次ID
* @param shiftsIdList * @param shiftsIdList
*/ */
public AttendanceRecordErrorQuery shiftsIdList(List<Long> shiftsIdList){ public AttendanceRecordErrorQuery shiftsIdList(List<Long> shiftsIdList){
this.shiftsIdList = shiftsIdList; this.shiftsIdList = shiftsIdList;
return this; return this;
} }
/** /**
* 设置 班次ID * 设置 班次ID
* @param shiftsIdNotList * @param shiftsIdNotList
*/ */
public AttendanceRecordErrorQuery shiftsIdNotList(List<Long> shiftsIdNotList){ public AttendanceRecordErrorQuery shiftsIdNotList(List<Long> shiftsIdNotList){
this.shiftsIdNotList = shiftsIdNotList; this.shiftsIdNotList = shiftsIdNotList;
return this; return this;
} }
/** /**
* 设置 班次名称 * 设置 班次名称
* @param shiftsName * @param shiftsName
*/ */
public AttendanceRecordErrorQuery shiftsName(String shiftsName){ public AttendanceRecordErrorQuery shiftsName(String shiftsName){
setShiftsName(shiftsName); setShiftsName(shiftsName);
return this; return this;
} }
/** /**
* 设置 班次名称 * 设置 班次名称
* @param shiftsNameList * @param shiftsNameList
*/ */
public AttendanceRecordErrorQuery shiftsNameList(List<String> shiftsNameList){ public AttendanceRecordErrorQuery shiftsNameList(List<String> shiftsNameList){
this.shiftsNameList = shiftsNameList; this.shiftsNameList = shiftsNameList;
return this; return this;
} }
...@@ -1982,308 +2115,381 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity { ...@@ -1982,308 +2115,381 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
/** /**
* 设置 处理人 * 设置 处理人
* @param opertor * @param opertor
*/ */
public AttendanceRecordErrorQuery opertor(String opertor){ public AttendanceRecordErrorQuery opertor(String opertor){
setOpertor(opertor); setOpertor(opertor);
return this; return this;
} }
/** /**
* 设置 处理人 * 设置 处理人
* @param opertorList * @param opertorList
*/ */
public AttendanceRecordErrorQuery opertorList(List<String> opertorList){ public AttendanceRecordErrorQuery opertorList(List<String> opertorList){
this.opertorList = opertorList; this.opertorList = opertorList;
return this; return this;
} }
/** /**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatus * @param errorStatus
*/ */
public AttendanceRecordErrorQuery errorStatus(Integer errorStatus){ public AttendanceRecordErrorQuery errorStatus(Integer errorStatus){
setErrorStatus(errorStatus); setErrorStatus(errorStatus);
return this; return this;
} }
/** /**
* 设置 开始 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 开始 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusStart * @param errorStatusStart
*/ */
public AttendanceRecordErrorQuery errorStatusStart(Integer errorStatusStart){ public AttendanceRecordErrorQuery errorStatusStart(Integer errorStatusStart){
this.errorStatusStart = errorStatusStart; this.errorStatusStart = errorStatusStart;
return this; return this;
} }
/** /**
* 设置 结束 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 结束 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusEnd * @param errorStatusEnd
*/ */
public AttendanceRecordErrorQuery errorStatusEnd(Integer errorStatusEnd){ public AttendanceRecordErrorQuery errorStatusEnd(Integer errorStatusEnd){
this.errorStatusEnd = errorStatusEnd; this.errorStatusEnd = errorStatusEnd;
return this; return this;
} }
/** /**
* 设置 增加 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 增加 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusIncrement * @param errorStatusIncrement
*/ */
public AttendanceRecordErrorQuery errorStatusIncrement(Integer errorStatusIncrement){ public AttendanceRecordErrorQuery errorStatusIncrement(Integer errorStatusIncrement){
this.errorStatusIncrement = errorStatusIncrement; this.errorStatusIncrement = errorStatusIncrement;
return this; return this;
} }
/** /**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusList * @param errorStatusList
*/ */
public AttendanceRecordErrorQuery errorStatusList(List<Integer> errorStatusList){ public AttendanceRecordErrorQuery errorStatusList(List<Integer> errorStatusList){
this.errorStatusList = errorStatusList; this.errorStatusList = errorStatusList;
return this; return this;
} }
/** /**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡) * 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusNotList * @param errorStatusNotList
*/ */
public AttendanceRecordErrorQuery errorStatusNotList(List<Integer> errorStatusNotList){ public AttendanceRecordErrorQuery errorStatusNotList(List<Integer> errorStatusNotList){
this.errorStatusNotList = errorStatusNotList; this.errorStatusNotList = errorStatusNotList;
return this; return this;
} }
/** /**
* 设置 处理状态(0.未处理,1.已处理) * 设置 处理状态(0.未处理,1.已处理)
* @param processStatus * @param processStatus
*/ */
public AttendanceRecordErrorQuery processStatus(Integer processStatus){ public AttendanceRecordErrorQuery processStatus(Integer processStatus){
setProcessStatus(processStatus); setProcessStatus(processStatus);
return this; return this;
} }
/** /**
* 设置 开始 处理状态(0.未处理,1.已处理) * 设置 开始 处理状态(0.未处理,1.已处理)
* @param processStatusStart * @param processStatusStart
*/ */
public AttendanceRecordErrorQuery processStatusStart(Integer processStatusStart){ public AttendanceRecordErrorQuery processStatusStart(Integer processStatusStart){
this.processStatusStart = processStatusStart; this.processStatusStart = processStatusStart;
return this; return this;
} }
/** /**
* 设置 结束 处理状态(0.未处理,1.已处理) * 设置 结束 处理状态(0.未处理,1.已处理)
* @param processStatusEnd * @param processStatusEnd
*/ */
public AttendanceRecordErrorQuery processStatusEnd(Integer processStatusEnd){ public AttendanceRecordErrorQuery processStatusEnd(Integer processStatusEnd){
this.processStatusEnd = processStatusEnd; this.processStatusEnd = processStatusEnd;
return this; return this;
} }
/** /**
* 设置 增加 处理状态(0.未处理,1.已处理) * 设置 增加 处理状态(0.未处理,1.已处理)
* @param processStatusIncrement * @param processStatusIncrement
*/ */
public AttendanceRecordErrorQuery processStatusIncrement(Integer processStatusIncrement){ public AttendanceRecordErrorQuery processStatusIncrement(Integer processStatusIncrement){
this.processStatusIncrement = processStatusIncrement; this.processStatusIncrement = processStatusIncrement;
return this; return this;
} }
/** /**
* 设置 处理状态(0.未处理,1.已处理) * 设置 处理状态(0.未处理,1.已处理)
* @param processStatusList * @param processStatusList
*/ */
public AttendanceRecordErrorQuery processStatusList(List<Integer> processStatusList){ public AttendanceRecordErrorQuery processStatusList(List<Integer> processStatusList){
this.processStatusList = processStatusList; this.processStatusList = processStatusList;
return this; return this;
} }
/** /**
* 设置 处理状态(0.未处理,1.已处理) * 设置 处理状态(0.未处理,1.已处理)
* @param processStatusNotList * @param processStatusNotList
*/ */
public AttendanceRecordErrorQuery processStatusNotList(List<Integer> processStatusNotList){ public AttendanceRecordErrorQuery processStatusNotList(List<Integer> processStatusNotList){
this.processStatusNotList = processStatusNotList; this.processStatusNotList = processStatusNotList;
return this; return this;
} }
/** /**
* 设置 处理结果 * 设置 处理结果
* @param processResult * @param processResult
*/ */
public AttendanceRecordErrorQuery processResult(String processResult){ public AttendanceRecordErrorQuery processResult(String processResult){
setProcessResult(processResult); setProcessResult(processResult);
return this; return this;
} }
/** /**
* 设置 处理结果 * 设置 处理结果
* @param processResultList * @param processResultList
*/ */
public AttendanceRecordErrorQuery processResultList(List<String> processResultList){ public AttendanceRecordErrorQuery processResultList(List<String> processResultList){
this.processResultList = processResultList; this.processResultList = processResultList;
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public AttendanceRecordErrorQuery remark(String remark){ public AttendanceRecordErrorQuery remark(String remark){
setRemark(remark); setRemark(remark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public AttendanceRecordErrorQuery remarkList(List<String> remarkList){ public AttendanceRecordErrorQuery remarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public AttendanceRecordErrorQuery createUserId(Long createUserId){ public AttendanceRecordErrorQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public AttendanceRecordErrorQuery createUserIdStart(Long createUserIdStart){ public AttendanceRecordErrorQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public AttendanceRecordErrorQuery createUserIdEnd(Long createUserIdEnd){ public AttendanceRecordErrorQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public AttendanceRecordErrorQuery createUserIdIncrement(Long createUserIdIncrement){ public AttendanceRecordErrorQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public AttendanceRecordErrorQuery createUserIdList(List<Long> createUserIdList){ public AttendanceRecordErrorQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdNotList * @param createUserIdNotList
*/ */
public AttendanceRecordErrorQuery createUserIdNotList(List<Long> createUserIdNotList){ public AttendanceRecordErrorQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList; this.createUserIdNotList = createUserIdNotList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public AttendanceRecordErrorQuery updateUserId(Long updateUserId){ public AttendanceRecordErrorQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public AttendanceRecordErrorQuery updateUserIdStart(Long updateUserIdStart){ public AttendanceRecordErrorQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public AttendanceRecordErrorQuery updateUserIdEnd(Long updateUserIdEnd){ public AttendanceRecordErrorQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public AttendanceRecordErrorQuery updateUserIdIncrement(Long updateUserIdIncrement){ public AttendanceRecordErrorQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public AttendanceRecordErrorQuery updateUserIdList(List<Long> updateUserIdList){ public AttendanceRecordErrorQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdNotList * @param updateUserIdNotList
*/ */
public AttendanceRecordErrorQuery updateUserIdNotList(List<Long> updateUserIdNotList){ public AttendanceRecordErrorQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList; this.updateUserIdNotList = updateUserIdNotList;
return this; return this;
} }
/**
* 设置 所属大厅
* @param salaId
*/
public AttendanceRecordErrorQuery salaId(Long salaId){
setSalaId(salaId);
return this;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public AttendanceRecordErrorQuery salaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
return this;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public AttendanceRecordErrorQuery salaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
return this;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public AttendanceRecordErrorQuery salaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
return this;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public AttendanceRecordErrorQuery salaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
return this;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public AttendanceRecordErrorQuery salaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
return this;
}
/**
* 设置 所属大厅名称
* @param salaName
*/
public AttendanceRecordErrorQuery salaName(String salaName){
setSalaName(salaName);
return this;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public AttendanceRecordErrorQuery salaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
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
*/ */
public List<AttendanceRecordErrorQuery> getOrConditionList(){ public List<AttendanceRecordErrorQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 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)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<AttendanceRecordErrorQuery> orConditionList){ public void setOrConditionList(List<AttendanceRecordErrorQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<AttendanceRecordErrorQuery> getAndConditionList(){ public List<AttendanceRecordErrorQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<AttendanceRecordErrorQuery> andConditionList){ public void setAndConditionList(List<AttendanceRecordErrorQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordHikEntity.java
View file @ a4eca9a8
...@@ -2,6 +2,9 @@ package com.mortals.xhx.module.attendance.model; ...@@ -2,6 +2,9 @@ package com.mortals.xhx.module.attendance.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.framework.model.BaseEntityLong;
...@@ -11,7 +14,7 @@ import lombok.Data; ...@@ -11,7 +14,7 @@ import lombok.Data;
* 基础考勤打卡记录汇总信息实体对象 * 基础考勤打卡记录汇总信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-18 * @date 2024-01-11
*/ */
@Data @Data
public class AttendanceRecordHikEntity extends AttendanceRecordHikVo { public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
...@@ -38,7 +41,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo { ...@@ -38,7 +41,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门") @Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 职位ID * 职位ID
...@@ -99,6 +102,15 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo { ...@@ -99,6 +102,15 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
* 打卡结果(0.否,1.是) * 打卡结果(0.否,1.是)
*/ */
private Integer punchResult; private Integer punchResult;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "所属大厅")
private String salaName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -116,43 +128,26 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo { ...@@ -116,43 +128,26 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
} }
public void initAttrValue(){ public void initAttrValue(){
this.staffId = 0L; this.staffId = 0L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.deptId = 0L; this.deptId = 0L;
this.deptName = ""; this.deptName = "";
this.positionId = 0L; this.positionId = 0L;
this.positionName = ""; this.positionName = "";
this.attendanceGroupId = 0L; this.attendanceGroupId = 0L;
this.attendanceGroupName = ""; this.attendanceGroupName = "";
this.shiftsId = 0L; this.shiftsId = 0L;
this.shiftsName = ""; this.shiftsName = "";
this.attendanceDate = null; this.attendanceDate = null;
this.attendanceAddress = ""; this.attendanceAddress = "";
this.eventSource = ""; this.eventSource = "";
this.remark = ""; this.remark = "";
this.signInResult = 0; this.signInResult = 0;
this.signOutResult = 0; this.signOutResult = 0;
this.attendType = ""; this.attendType = "";
this.punchResult = 0; this.punchResult = 0;
this.salaId = null;
this.salaName = "";
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordHikQuery.java
View file @ a4eca9a8
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
* 基础考勤打卡记录汇总信息查询对象 * 基础考勤打卡记录汇总信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-18 * @date 2024-01-11
*/ */
public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity { public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -243,6 +243,26 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity { ...@@ -243,6 +243,26 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity {
/** 打卡结果(0.否,1.是)排除列表 */ /** 打卡结果(0.否,1.是)排除列表 */
private List <Integer> punchResultNotList; private List <Integer> punchResultNotList;
/** 开始 所属大厅 */
private Long salaIdStart;
/** 结束 所属大厅 */
private Long salaIdEnd;
/** 增加 所属大厅 */
private Long salaIdIncrement;
/** 所属大厅列表 */
private List <Long> salaIdList;
/** 所属大厅排除列表 */
private List <Long> salaIdNotList;
/** 所属大厅名称 */
private List<String> salaNameList;
/** 所属大厅名称排除列表 */
private List <String> salaNameNotList;
/** 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<AttendanceRecordHikQuery> orConditionList; private List<AttendanceRecordHikQuery> orConditionList;
...@@ -1558,6 +1578,119 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity { ...@@ -1558,6 +1578,119 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity {
} }
/**
* 获取 开始 所属大厅
* @return salaIdStart
*/
public Long getSalaIdStart(){
return this.salaIdStart;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public void setSalaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
}
/**
* 获取 结束 所属大厅
* @return $salaIdEnd
*/
public Long getSalaIdEnd(){
return this.salaIdEnd;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public void setSalaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
}
/**
* 获取 增加 所属大厅
* @return salaIdIncrement
*/
public Long getSalaIdIncrement(){
return this.salaIdIncrement;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public void setSalaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
}
/**
* 获取 所属大厅
* @return salaIdList
*/
public List<Long> getSalaIdList(){
return this.salaIdList;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public void setSalaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
}
/**
* 获取 所属大厅
* @return salaIdNotList
*/
public List<Long> getSalaIdNotList(){
return this.salaIdNotList;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public void setSalaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
}
/**
* 获取 所属大厅名称
* @return salaNameList
*/
public List<String> getSalaNameList(){
return this.salaNameList;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public void setSalaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
}
/**
* 获取 所属大厅名称
* @return salaNameNotList
*/
public List<String> getSalaNameNotList(){
return this.salaNameNotList;
}
/**
* 设置 所属大厅名称
* @param salaNameNotList
*/
public void setSalaNameNotList(List<String> salaNameNotList){
this.salaNameNotList = salaNameNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2345,6 +2478,79 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity { ...@@ -2345,6 +2478,79 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity {
return this; return this;
} }
/**
* 设置 所属大厅
* @param salaId
*/
public AttendanceRecordHikQuery salaId(Long salaId){
setSalaId(salaId);
return this;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public AttendanceRecordHikQuery salaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
return this;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public AttendanceRecordHikQuery salaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
return this;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public AttendanceRecordHikQuery salaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
return this;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public AttendanceRecordHikQuery salaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
return this;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public AttendanceRecordHikQuery salaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
return this;
}
/**
* 设置 所属大厅名称
* @param salaName
*/
public AttendanceRecordHikQuery salaName(String salaName){
setSalaName(salaName);
return this;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public AttendanceRecordHikQuery salaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
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/AttendanceRecordQuery.java
View file @ a4eca9a8
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity;
* 考勤打卡记录信息查询对象 * 考勤打卡记录信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-08-03 * @date 2024-01-11
*/ */
public class AttendanceRecordQuery extends AttendanceRecordEntity { public class AttendanceRecordQuery extends AttendanceRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -233,6 +233,26 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity { ...@@ -233,6 +233,26 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity {
/** 班次名称排除列表 */ /** 班次名称排除列表 */
private List <String> classNameNotList; private List <String> classNameNotList;
/** 开始 所属大厅 */
private Long salaIdStart;
/** 结束 所属大厅 */
private Long salaIdEnd;
/** 增加 所属大厅 */
private Long salaIdIncrement;
/** 所属大厅列表 */
private List <Long> salaIdList;
/** 所属大厅排除列表 */
private List <Long> salaIdNotList;
/** 所属大厅名称 */
private List<String> salaNameList;
/** 所属大厅名称排除列表 */
private List <String> salaNameNotList;
/** 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<AttendanceRecordQuery> orConditionList; private List<AttendanceRecordQuery> orConditionList;
...@@ -1484,6 +1504,119 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity { ...@@ -1484,6 +1504,119 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity {
this.classNameNotList = classNameNotList; this.classNameNotList = classNameNotList;
} }
/**
* 获取 开始 所属大厅
* @return salaIdStart
*/
public Long getSalaIdStart(){
return this.salaIdStart;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public void setSalaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
}
/**
* 获取 结束 所属大厅
* @return $salaIdEnd
*/
public Long getSalaIdEnd(){
return this.salaIdEnd;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public void setSalaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
}
/**
* 获取 增加 所属大厅
* @return salaIdIncrement
*/
public Long getSalaIdIncrement(){
return this.salaIdIncrement;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public void setSalaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
}
/**
* 获取 所属大厅
* @return salaIdList
*/
public List<Long> getSalaIdList(){
return this.salaIdList;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public void setSalaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
}
/**
* 获取 所属大厅
* @return salaIdNotList
*/
public List<Long> getSalaIdNotList(){
return this.salaIdNotList;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public void setSalaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
}
/**
* 获取 所属大厅名称
* @return salaNameList
*/
public List<String> getSalaNameList(){
return this.salaNameList;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public void setSalaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
}
/**
* 获取 所属大厅名称
* @return salaNameNotList
*/
public List<String> getSalaNameNotList(){
return this.salaNameNotList;
}
/**
* 设置 所属大厅名称
* @param salaNameNotList
*/
public void setSalaNameNotList(List<String> salaNameNotList){
this.salaNameNotList = salaNameNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2233,6 +2366,79 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity { ...@@ -2233,6 +2366,79 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity {
return this; return this;
} }
/**
* 设置 所属大厅
* @param salaId
*/
public AttendanceRecordQuery salaId(Long salaId){
setSalaId(salaId);
return this;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public AttendanceRecordQuery salaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
return this;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public AttendanceRecordQuery salaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
return this;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public AttendanceRecordQuery salaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
return this;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public AttendanceRecordQuery salaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
return this;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public AttendanceRecordQuery salaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
return this;
}
/**
* 设置 所属大厅名称
* @param salaName
*/
public AttendanceRecordQuery salaName(String salaName){
setSalaName(salaName);
return this;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public AttendanceRecordQuery salaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
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/AttendanceStatEntity.java
View file @ a4eca9a8
...@@ -241,6 +241,15 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -241,6 +241,15 @@ public class AttendanceStatEntity extends AttendanceStatVo {
*/ */
@Excel(name = "陪产假") @Excel(name = "陪产假")
private BigDecimal paternityLeaveDays; private BigDecimal paternityLeaveDays;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "所属大厅")
private String salaName;
@Override @Override
public int hashCode() { public int hashCode() {
...@@ -349,6 +358,10 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -349,6 +358,10 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.morningTimes = 0; this.morningTimes = 0;
this.afternoonTimes = 0; this.afternoonTimes = 0;
this.salaId = null;
this.salaName = "";
} }
public static void main(String[] args) { public static void main(String[] args) {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatQuery.java
View file @ a4eca9a8
...@@ -692,6 +692,27 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -692,6 +692,27 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
/** 下午缺卡次数排除列表 */ /** 下午缺卡次数排除列表 */
private List <Integer> afternoonTimesNotList; private List <Integer> afternoonTimesNotList;
/** 开始 所属大厅 */
private Long salaIdStart;
/** 结束 所属大厅 */
private Long salaIdEnd;
/** 增加 所属大厅 */
private Long salaIdIncrement;
/** 所属大厅列表 */
private List <Long> salaIdList;
/** 所属大厅排除列表 */
private List <Long> salaIdNotList;
/** 所属大厅名称 */
private List<String> salaNameList;
/** 所属大厅名称排除列表 */
private List <String> salaNameNotList;
/** 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;
...@@ -4406,6 +4427,118 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -4406,6 +4427,118 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
this.afternoonTimesNotList = afternoonTimesNotList; this.afternoonTimesNotList = afternoonTimesNotList;
} }
/**
* 获取 开始 所属大厅
* @return salaIdStart
*/
public Long getSalaIdStart(){
return this.salaIdStart;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public void setSalaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
}
/**
* 获取 结束 所属大厅
* @return $salaIdEnd
*/
public Long getSalaIdEnd(){
return this.salaIdEnd;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public void setSalaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
}
/**
* 获取 增加 所属大厅
* @return salaIdIncrement
*/
public Long getSalaIdIncrement(){
return this.salaIdIncrement;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public void setSalaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
}
/**
* 获取 所属大厅
* @return salaIdList
*/
public List<Long> getSalaIdList(){
return this.salaIdList;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public void setSalaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
}
/**
* 获取 所属大厅
* @return salaIdNotList
*/
public List<Long> getSalaIdNotList(){
return this.salaIdNotList;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public void setSalaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
}
/**
* 获取 所属大厅名称
* @return salaNameList
*/
public List<String> getSalaNameList(){
return this.salaNameList;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public void setSalaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
}
/**
* 获取 所属大厅名称
* @return salaNameNotList
*/
public List<String> getSalaNameNotList(){
return this.salaNameNotList;
}
/**
* 设置 所属大厅名称
* @param salaNameNotList
*/
public void setSalaNameNotList(List<String> salaNameNotList){
this.salaNameNotList = salaNameNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
...@@ -6826,6 +6959,79 @@ public class AttendanceStatQuery extends AttendanceStatEntity { ...@@ -6826,6 +6959,79 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
return this; return this;
} }
/**
* 设置 所属大厅
* @param salaId
*/
public AttendanceStatQuery salaId(Long salaId){
setSalaId(salaId);
return this;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public AttendanceStatQuery salaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
return this;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public AttendanceStatQuery salaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
return this;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public AttendanceStatQuery salaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
return this;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public AttendanceStatQuery salaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
return this;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public AttendanceStatQuery salaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
return this;
}
/**
* 设置 所属大厅名称
* @param salaName
*/
public AttendanceStatQuery salaName(String salaName){
setSalaName(salaName);
return this;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public AttendanceStatQuery salaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
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/vo/VacationBalanceSummaryVo.java
View file @ a4eca9a8
...@@ -138,4 +138,12 @@ public class VacationBalanceSummaryVo { ...@@ -138,4 +138,12 @@ public class VacationBalanceSummaryVo {
* 离职时间 * 离职时间
*/ */
private Date leaveDate; private Date leaveDate;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
View file @ a4eca9a8
...@@ -160,6 +160,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -160,6 +160,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
attendanceRecordEntity.setStaffName(item.getStaffName()); attendanceRecordEntity.setStaffName(item.getStaffName());
attendanceRecordEntity.setDeptId(item.getDeptId()); attendanceRecordEntity.setDeptId(item.getDeptId());
attendanceRecordEntity.setDeptName(item.getDeptName()); attendanceRecordEntity.setDeptName(item.getDeptName());
attendanceRecordEntity.setSalaId(item.getSalaId());
attendanceRecordEntity.setSalaName(item.getSalaName());
attendanceRecordEntity.setPositionId(item.getPositionId()); attendanceRecordEntity.setPositionId(item.getPositionId());
attendanceRecordEntity.setPositionName(item.getPositionName()); attendanceRecordEntity.setPositionName(item.getPositionName());
attendanceRecordEntity.setWorkNum(item.getWorkNum()); attendanceRecordEntity.setWorkNum(item.getWorkNum());
...@@ -311,6 +313,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -311,6 +313,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
attendanceRecordEntity.setStaffName(item.getStaffName()); attendanceRecordEntity.setStaffName(item.getStaffName());
attendanceRecordEntity.setDeptId(item.getDeptId()); attendanceRecordEntity.setDeptId(item.getDeptId());
attendanceRecordEntity.setDeptName(item.getDeptName()); attendanceRecordEntity.setDeptName(item.getDeptName());
attendanceRecordEntity.setSalaId(item.getSalaId());
attendanceRecordEntity.setSalaName(item.getSalaName());
attendanceRecordEntity.setPositionId(item.getPositionId()); attendanceRecordEntity.setPositionId(item.getPositionId());
attendanceRecordEntity.setPositionName(item.getPositionName()); attendanceRecordEntity.setPositionName(item.getPositionName());
attendanceRecordEntity.setWorkNum(item.getWorkNum()); attendanceRecordEntity.setWorkNum(item.getWorkNum());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @ a4eca9a8
...@@ -263,6 +263,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -263,6 +263,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
attendanceStatEntity.setStaffName(item.getStaffName()); attendanceStatEntity.setStaffName(item.getStaffName());
attendanceStatEntity.setDeptId(item.getDeptId()); attendanceStatEntity.setDeptId(item.getDeptId());
attendanceStatEntity.setDeptName(item.getDeptName()); attendanceStatEntity.setDeptName(item.getDeptName());
attendanceStatEntity.setSalaId(item.getSalaId());
attendanceStatEntity.setSalaName(item.getSalaName());
attendanceStatEntity.setPhoneNumer(item.getPhoneNumber()); attendanceStatEntity.setPhoneNumer(item.getPhoneNumber());
attendanceStatEntity.setYear(item.getYear()); attendanceStatEntity.setYear(item.getYear());
attendanceStatEntity.setMonth(item.getMonth()); attendanceStatEntity.setMonth(item.getMonth());
...@@ -283,6 +285,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -283,6 +285,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
attendanceStatEntity.setStaffName(item.getStaffName()); attendanceStatEntity.setStaffName(item.getStaffName());
attendanceStatEntity.setDeptId(item.getDeptId()); attendanceStatEntity.setDeptId(item.getDeptId());
attendanceStatEntity.setDeptName(item.getDeptName()); attendanceStatEntity.setDeptName(item.getDeptName());
attendanceStatEntity.setSalaId(item.getSalaId());
attendanceStatEntity.setSalaName(item.getSalaName());
attendanceStatEntity.setPhoneNumer(item.getPhoneNumber()); attendanceStatEntity.setPhoneNumer(item.getPhoneNumber());
attendanceStatEntity.setYear(item.getYear()); attendanceStatEntity.setYear(item.getYear());
attendanceStatEntity.setMonth(item.getMonth()); attendanceStatEntity.setMonth(item.getMonth());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java
View file @ a4eca9a8
...@@ -118,6 +118,8 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro ...@@ -118,6 +118,8 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
item.setStaffId(staffEntity.getId()); item.setStaffId(staffEntity.getId());
item.setDeptId(deptId); item.setDeptId(deptId);
item.setDeptName(deptName); item.setDeptName(deptName);
item.setSalaId(staffEntity.getSalaId());
item.setSalaName(staffEntity.getSalaName());
item.setPositionId(staffEntity.getPositionId()); item.setPositionId(staffEntity.getPositionId());
item.setPositionName(staffEntity.getPositionName()); item.setPositionName(staffEntity.getPositionName());
}); });
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/DeptService.java
View file @ a4eca9a8
...@@ -70,5 +70,17 @@ public interface DeptService extends ICRUDService<DeptEntity, Long> { ...@@ -70,5 +70,17 @@ public interface DeptService extends ICRUDService<DeptEntity, Long> {
* */ * */
List<DeptEntity> getAllChildrenDept(Long deptId) throws AppException; List<DeptEntity> getAllChildrenDept(Long deptId) throws AppException;
/**
* 查询大厅列表
* @return
* @throws AppException
*/
List<DeptEntity> getAllSala() throws AppException;
/**
* 查询大厅下所有部门列表
* @return
* @throws AppException
*/
List<DeptEntity> getDeptBySalaId(Long salaId) throws AppException;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @ a4eca9a8
...@@ -7,6 +7,7 @@ import com.mortals.xhx.common.code.StaffSatusEnum; ...@@ -7,6 +7,7 @@ import com.mortals.xhx.common.code.StaffSatusEnum;
import com.mortals.xhx.module.staff.model.StaffEntity; import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.StaffQuery; import com.mortals.xhx.module.staff.model.StaffQuery;
import com.mortals.xhx.module.staff.service.StaffService; import com.mortals.xhx.module.staff.service.StaffService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -269,4 +270,25 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -269,4 +270,25 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
return dao.getAllChildrenDept(deptId); return dao.getAllChildrenDept(deptId);
} }
@Override
public List<DeptEntity> getAllSala() throws AppException {
return dao.getList(new DeptQuery().parentId(71l));
}
@Override
public List<DeptEntity> getDeptBySalaId(Long salaId) throws AppException {
DeptQuery query = new DeptQuery();
if(salaId == null){
List<DeptEntity> allSala = dao.getList(new DeptQuery().parentId(71l));
List<Long> salaList = new ArrayList<>();
for(DeptEntity item:allSala){
salaList.add(item.getId());
}
query.setParentIdList(salaList);
}else {
query.setParentId(salaId);
}
return dao.getList(query);
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
View file @ a4eca9a8
...@@ -3,6 +3,9 @@ import java.math.BigDecimal; ...@@ -3,6 +3,9 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.annotation.desensitization.IdCardDesensitize; import com.mortals.framework.annotation.desensitization.IdCardDesensitize;
...@@ -14,7 +17,7 @@ import lombok.Data; ...@@ -14,7 +17,7 @@ import lombok.Data;
* 员工基本信息实体对象 * 员工基本信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-18 * @date 2024-01-11
*/ */
@Data @Data
public class StaffEntity extends StaffVo { public class StaffEntity extends StaffVo {
...@@ -28,7 +31,7 @@ public class StaffEntity extends StaffVo { ...@@ -28,7 +31,7 @@ public class StaffEntity extends StaffVo {
/** /**
* 性别(1.男,2.女) * 性别(1.男,2.女)
*/ */
@Excel(name = "性别", readConverterExp = "1=男,2.女") @Excel(name = "性别", readConverterExp = "1=男,2=女")
private Integer gender; private Integer gender;
/** /**
* 出生日期 * 出生日期
...@@ -140,7 +143,6 @@ public class StaffEntity extends StaffVo { ...@@ -140,7 +143,6 @@ public class StaffEntity extends StaffVo {
* 最后登录时间 * 最后登录时间
*/ */
private Date lastLoginTime; private Date lastLoginTime;
/** /**
* 考勤授权(0.不启用,1.启用) * 考勤授权(0.不启用,1.启用)
*/ */
...@@ -165,7 +167,14 @@ public class StaffEntity extends StaffVo { ...@@ -165,7 +167,14 @@ public class StaffEntity extends StaffVo {
* 其他授权(0.不启用,1.启用) * 其他授权(0.不启用,1.启用)
*/ */
private Integer otherCheck; private Integer otherCheck;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -183,71 +192,40 @@ public class StaffEntity extends StaffVo { ...@@ -183,71 +192,40 @@ public class StaffEntity extends StaffVo {
} }
public void initAttrValue(){ public void initAttrValue(){
this.name = ""; this.name = "";
this.gender = 1; this.gender = 1;
this.birthday = null; this.birthday = null;
this.photoPath = ""; this.photoPath = "";
this.phoneNumber = ""; this.phoneNumber = "";
this.idCard = ""; this.idCard = "";
this.workNum = ""; this.workNum = "";
this.politicalstatus = 1; this.politicalstatus = 1;
this.deptId = null; this.deptId = null;
this.deptName = ""; this.deptName = "";
this.positionId = null; this.positionId = null;
this.positionName = ""; this.positionName = "";
this.staffType = 1; this.staffType = 1;
this.status = 1; this.status = 1;
this.source = 1; this.source = 1;
this.registerPath = ""; this.registerPath = "";
this.entryDate = null; this.entryDate = null;
this.regularDate = null; this.regularDate = null;
this.leaveDate = null; this.leaveDate = null;
this.remark = ""; this.remark = "";
this.remarkId = ""; this.remarkId = "";
this.picUri = ""; this.picUri = "";
this.serverIndexCode = ""; this.serverIndexCode = "";
this.score = BigDecimal.ZERO;
this.score = new BigDecimal(0);
this.loginName = ""; this.loginName = "";
this.loginPwd = ""; this.loginPwd = "";
this.lastLoginTime = null; this.lastLoginTime = null;
this.attendCheck = 1;
this.attendCheck = 0; this.complainCheck = 1;
this.reviewCheck = 1;
this.complainCheck = 0; this.goworkCheck = 1;
this.effectCheck = 1;
this.reviewCheck = 0; this.otherCheck = 1;
this.salaId = null;
this.goworkCheck = 0; this.salaName = "";
this.effectCheck = 0;
this.otherCheck = 0;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
View file @ a4eca9a8
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity;
* 员工基本信息查询对象 * 员工基本信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-07 * @date 2024-01-11
*/ */
public class StaffQuery extends StaffEntity { public class StaffQuery extends StaffEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -378,6 +378,26 @@ public class StaffQuery extends StaffEntity { ...@@ -378,6 +378,26 @@ public class StaffQuery extends StaffEntity {
/** 其他授权(0.不启用,1.启用)排除列表 */ /** 其他授权(0.不启用,1.启用)排除列表 */
private List <Integer> otherCheckNotList; private List <Integer> otherCheckNotList;
/** 开始 所属大厅 */
private Long salaIdStart;
/** 结束 所属大厅 */
private Long salaIdEnd;
/** 增加 所属大厅 */
private Long salaIdIncrement;
/** 所属大厅列表 */
private List <Long> salaIdList;
/** 所属大厅排除列表 */
private List <Long> salaIdNotList;
/** 所属大厅名称 */
private List<String> salaNameList;
/** 所属大厅名称排除列表 */
private List <String> salaNameNotList;
/** 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<StaffQuery> orConditionList; private List<StaffQuery> orConditionList;
...@@ -2434,6 +2454,120 @@ public class StaffQuery extends StaffEntity { ...@@ -2434,6 +2454,120 @@ public class StaffQuery extends StaffEntity {
this.otherCheckNotList = otherCheckNotList; this.otherCheckNotList = otherCheckNotList;
} }
/**
* 获取 开始 所属大厅
* @return salaIdStart
*/
public Long getSalaIdStart(){
return this.salaIdStart;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public void setSalaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
}
/**
* 获取 结束 所属大厅
* @return $salaIdEnd
*/
public Long getSalaIdEnd(){
return this.salaIdEnd;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public void setSalaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
}
/**
* 获取 增加 所属大厅
* @return salaIdIncrement
*/
public Long getSalaIdIncrement(){
return this.salaIdIncrement;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public void setSalaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
}
/**
* 获取 所属大厅
* @return salaIdList
*/
public List<Long> getSalaIdList(){
return this.salaIdList;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public void setSalaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
}
/**
* 获取 所属大厅
* @return salaIdNotList
*/
public List<Long> getSalaIdNotList(){
return this.salaIdNotList;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public void setSalaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
}
/**
* 获取 所属大厅名称
* @return salaNameList
*/
public List<String> getSalaNameList(){
return this.salaNameList;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public void setSalaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
}
/**
* 获取 所属大厅名称
* @return salaNameNotList
*/
public List<String> getSalaNameNotList(){
return this.salaNameNotList;
}
/**
* 设置 所属大厅名称
* @param salaNameNotList
*/
public void setSalaNameNotList(List<String> salaNameNotList){
this.salaNameNotList = salaNameNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -3300,6 +3434,7 @@ public class StaffQuery extends StaffEntity { ...@@ -3300,6 +3434,7 @@ public class StaffQuery extends StaffEntity {
return this; return this;
} }
/** /**
* 设置 考勤授权(0.不启用,1.启用) * 设置 考勤授权(0.不启用,1.启用)
* @param attendCheck * @param attendCheck
...@@ -3624,6 +3759,79 @@ public class StaffQuery extends StaffEntity { ...@@ -3624,6 +3759,79 @@ public class StaffQuery extends StaffEntity {
return this; return this;
} }
/**
* 设置 所属大厅
* @param salaId
*/
public StaffQuery salaId(Long salaId){
setSalaId(salaId);
return this;
}
/**
* 设置 开始 所属大厅
* @param salaIdStart
*/
public StaffQuery salaIdStart(Long salaIdStart){
this.salaIdStart = salaIdStart;
return this;
}
/**
* 设置 结束 所属大厅
* @param salaIdEnd
*/
public StaffQuery salaIdEnd(Long salaIdEnd){
this.salaIdEnd = salaIdEnd;
return this;
}
/**
* 设置 增加 所属大厅
* @param salaIdIncrement
*/
public StaffQuery salaIdIncrement(Long salaIdIncrement){
this.salaIdIncrement = salaIdIncrement;
return this;
}
/**
* 设置 所属大厅
* @param salaIdList
*/
public StaffQuery salaIdList(List<Long> salaIdList){
this.salaIdList = salaIdList;
return this;
}
/**
* 设置 所属大厅
* @param salaIdNotList
*/
public StaffQuery salaIdNotList(List<Long> salaIdNotList){
this.salaIdNotList = salaIdNotList;
return this;
}
/**
* 设置 所属大厅名称
* @param salaName
*/
public StaffQuery salaName(String salaName){
setSalaName(salaName);
return this;
}
/**
* 设置 所属大厅名称
* @param salaNameList
*/
public StaffQuery salaNameList(List<String> salaNameList){
this.salaNameList = salaNameList;
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/staff/service/StaffService.java
View file @ a4eca9a8
...@@ -39,4 +39,9 @@ public interface StaffService extends ICRUDCacheService<StaffEntity,Long> { ...@@ -39,4 +39,9 @@ public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
*/ */
int checkAuthorize(StaffCheckAuthorizePdu pdu,Context context) throws AppException; int checkAuthorize(StaffCheckAuthorizePdu pdu,Context context) throws AppException;
/**
* 更新人员大厅数据
*/
void doUpdateSala();
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @ a4eca9a8
...@@ -168,6 +168,17 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -168,6 +168,17 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
staffEntity.initAttrValue(); staffEntity.initAttrValue();
if (!ObjectUtils.isEmpty(deptEntity)) { if (!ObjectUtils.isEmpty(deptEntity)) {
staffEntity.setDeptId(deptEntity.getId()); staffEntity.setDeptId(deptEntity.getId());
if(deptEntity.getParentId()==71l){
//市民中心id为71，代表是大厅
staffEntity.setSalaId(deptEntity.getId());
staffEntity.setSalaName(deptEntity.getDeptName());
}else {
DeptEntity salaEntity = deptService.get(deptEntity.getParentId());
if(!ObjectUtils.isEmpty(salaEntity)){
staffEntity.setSalaId(salaEntity.getId());
staffEntity.setSalaName(salaEntity.getDeptName());
}
}
} }
staffEntity.setName(personInfo.getPersonName()); staffEntity.setName(personInfo.getPersonName());
staffEntity.setRemarkId(personInfo.getPersonId()); staffEntity.setRemarkId(personInfo.getPersonId());
...@@ -185,6 +196,17 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -185,6 +196,17 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
//更新 //更新
if (!ObjectUtils.isEmpty(deptEntity)) { if (!ObjectUtils.isEmpty(deptEntity)) {
staffEntity.setDeptId(deptEntity.getId()); staffEntity.setDeptId(deptEntity.getId());
if(deptEntity.getParentId()==71l){
//市民中心id为71，代表是大厅
staffEntity.setSalaId(deptEntity.getId());
staffEntity.setSalaName(deptEntity.getDeptName());
}else {
DeptEntity salaEntity = deptService.get(deptEntity.getParentId());
if(!ObjectUtils.isEmpty(salaEntity)){
staffEntity.setSalaId(salaEntity.getId());
staffEntity.setSalaName(salaEntity.getDeptName());
}
}
} }
staffEntity.setName(personInfo.getPersonName()); staffEntity.setName(personInfo.getPersonName());
staffEntity.setRemarkId(personInfo.getPersonId()); staffEntity.setRemarkId(personInfo.getPersonId());
...@@ -437,6 +459,27 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -437,6 +459,27 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
return dao.update(update); return dao.update(update);
} }
@Override
public void doUpdateSala() {
List<StaffEntity> staffList = this.getAllList();
for(StaffEntity staffEntity:staffList){
DeptEntity deptEntity = deptService.get(staffEntity.getDeptId());
if(deptEntity.getParentId()==71l){
//市民中心id为71，代表是大厅
staffEntity.setSalaId(deptEntity.getId());
staffEntity.setSalaName(deptEntity.getDeptName());
}else {
DeptEntity salaEntity = deptService.get(deptEntity.getParentId());
if(!ObjectUtils.isEmpty(salaEntity)){
staffEntity.setSalaId(salaEntity.getId());
staffEntity.setSalaName(salaEntity.getDeptName());
}
}
this.update(staffEntity);
}
}
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("1" + StrUtil.padPre("125", 7, "0")); System.out.println("1" + StrUtil.padPre("125", 7, "0"));
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @ a4eca9a8
...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.staff.web; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.staff.web;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
...@@ -252,5 +253,26 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -252,5 +253,26 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
return ret.toJSONString(); return ret.toJSONString();
} }
} }
/**
* 更新人员大厅数据
*/
@PostMapping(value = "updateSala")
@UnAuth
public String doUpdateSala() {
JSONObject jsonObject = new JSONObject();
String busiDesc = "更新人员大厅数据";
try {
this.service.doUpdateSala();
recordSysLog(request, busiDesc + " 【成功】");
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
jsonObject.put(KEY_RESULT_MSG, busiDesc + " 【成功】");
} catch (Exception e) {
log.error("同步人员", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
}
return jsonObject.toJSONString();
}
} }
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceLeaveRecordMapper.xml
View file @ a4eca9a8
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<result property="auditTime" column="auditTime" /> <result property="auditTime" column="auditTime" />
<result property="processStatus" column="processStatus" /> <result property="processStatus" column="processStatus" />
<result property="sourceDingTime" column="sourceDingTime" /> <result property="sourceDingTime" column="sourceDingTime" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap> </resultMap>
...@@ -116,23 +118,29 @@ ...@@ -116,23 +118,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sourceDingTime') or colPickMode == 1 and data.containsKey('sourceDingTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sourceDingTime') or colPickMode == 1 and data.containsKey('sourceDingTime')))">
a.sourceDingTime, a.sourceDingTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaId') or colPickMode == 1 and data.containsKey('salaId')))">
a.salaId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))">
a.salaName,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceLeaveRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceLeaveRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_leave_record insert into mortals_xhx_attendance_leave_record
(leavePersonId,leavePerson,deptId,deptName,phoneNumber,leaveType,startTime,endTime,duration,reason,approverId,approver,attachment,attachmentPath,remark,createUserId,createTime,updateUserId,updateTime,appealTime,auditResult,auditDesc,auditTime,processStatus,sourceDingTime) (leavePersonId,leavePerson,deptId,deptName,phoneNumber,leaveType,startTime,endTime,duration,reason,approverId,approver,attachment,attachmentPath,remark,createUserId,createTime,updateUserId,updateTime,appealTime,auditResult,auditDesc,auditTime,processStatus,sourceDingTime,salaId,salaName)
VALUES VALUES
(#{leavePersonId},#{leavePerson},#{deptId},#{deptName},#{phoneNumber},#{leaveType},#{startTime},#{endTime},#{duration},#{reason},#{approverId},#{approver},#{attachment},#{attachmentPath},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{appealTime},#{auditResult},#{auditDesc},#{auditTime},#{processStatus},#{sourceDingTime}) (#{leavePersonId},#{leavePerson},#{deptId},#{deptName},#{phoneNumber},#{leaveType},#{startTime},#{endTime},#{duration},#{reason},#{approverId},#{approver},#{attachment},#{attachmentPath},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{appealTime},#{auditResult},#{auditDesc},#{auditTime},#{processStatus},#{sourceDingTime},#{salaId},#{salaName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_leave_record insert into mortals_xhx_attendance_leave_record
(leavePersonId,leavePerson,deptId,deptName,phoneNumber,leaveType,startTime,endTime,duration,reason,approverId,approver,attachment,attachmentPath,remark,createUserId,createTime,updateUserId,updateTime,appealTime,auditResult,auditDesc,auditTime,processStatus,sourceDingTime) (leavePersonId,leavePerson,deptId,deptName,phoneNumber,leaveType,startTime,endTime,duration,reason,approverId,approver,attachment,attachmentPath,remark,createUserId,createTime,updateUserId,updateTime,appealTime,auditResult,auditDesc,auditTime,processStatus,sourceDingTime,salaId,salaName)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.leavePersonId},#{item.leavePerson},#{item.deptId},#{item.deptName},#{item.phoneNumber},#{item.leaveType},#{item.startTime},#{item.endTime},#{item.duration},#{item.reason},#{item.approverId},#{item.approver},#{item.attachment},#{item.attachmentPath},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.appealTime},#{item.auditResult},#{item.auditDesc},#{item.auditTime},#{item.processStatus},#{item.sourceDingTime}) (#{item.leavePersonId},#{item.leavePerson},#{item.deptId},#{item.deptName},#{item.phoneNumber},#{item.leaveType},#{item.startTime},#{item.endTime},#{item.duration},#{item.reason},#{item.approverId},#{item.approver},#{item.attachment},#{item.attachmentPath},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.appealTime},#{item.auditResult},#{item.auditDesc},#{item.auditTime},#{item.processStatus},#{item.sourceDingTime},#{item.salaId},#{item.salaName})
</foreach> </foreach>
</insert> </insert>
...@@ -244,6 +252,15 @@ ...@@ -244,6 +252,15 @@
<if test="(colPickMode==0 and data.containsKey('sourceDingTime')) or (colPickMode==1 and !data.containsKey('sourceDingTime'))"> <if test="(colPickMode==0 and data.containsKey('sourceDingTime')) or (colPickMode==1 and !data.containsKey('sourceDingTime'))">
a.sourceDingTime=#{data.sourceDingTime}, a.sourceDingTime=#{data.sourceDingTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('salaId')) or (colPickMode==1 and !data.containsKey('salaId'))">
a.salaId=#{data.salaId},
</if>
<if test="(colPickMode==0 and data.containsKey('salaIdIncrement')) or (colPickMode==1 and !data.containsKey('salaIdIncrement'))">
a.salaId=ifnull(a.salaId,0) + #{data.salaIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))">
a.salaName=#{data.salaName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -476,6 +493,25 @@ ...@@ -476,6 +493,25 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="salaId=(case" suffix="ELSE salaId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('salaId')) or (colPickMode==1 and !item.containsKey('salaId'))">
when a.id=#{item.id} then #{item.salaId}
</when>
<when test="(colPickMode==0 and item.containsKey('salaIdIncrement')) or (colPickMode==1 and !item.containsKey('salaIdIncrement'))">
when a.id=#{item.id} then ifnull(a.salaId,0) + #{item.salaIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="salaName=(case" suffix="ELSE salaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('salaName')) or (colPickMode==1 and !item.containsKey('salaName'))">
when a.id=#{item.id} then #{item.salaName}
</if>
</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=")">
...@@ -1162,18 +1198,220 @@ ...@@ -1162,18 +1198,220 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('salaId')">
<if test="conditionParamRef.salaId != null ">
${_conditionType_} a.salaId = #{${_conditionParam_}.salaId}
</if>
<if test="conditionParamRef.salaId == null">
${_conditionType_} a.salaId is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
${_conditionType_} a.salaId in
<foreach collection="conditionParamRef.salaIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdNotList') and conditionParamRef.salaIdNotList.size() > 0">
${_conditionType_} a.salaId not in
<foreach collection="conditionParamRef.salaIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdStart') and conditionParamRef.salaIdStart != null">
${_conditionType_} a.salaId <![CDATA[ >= ]]> #{${_conditionParam_}.salaIdStart}
</if>
<if test="conditionParamRef.containsKey('salaIdEnd') and conditionParamRef.salaIdEnd != null">
${_conditionType_} a.salaId <![CDATA[ <= ]]> #{${_conditionParam_}.salaIdEnd}
</if>
<if test="conditionParamRef.containsKey('salaName')">
<if test="conditionParamRef.salaName != null and conditionParamRef.salaName != ''">
${_conditionType_} a.salaName like #{${_conditionParam_}.salaName}
</if>
<if test="conditionParamRef.salaName == null">
${_conditionType_} a.salaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaNameList') and conditionParamRef.salaNameList.size() > 0">
${_conditionType_} a.salaName in
<foreach collection="conditionParamRef.salaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaNameNotList') and conditionParamRef.salaNameNotList.size() > 0">
${_conditionType_} a.salaName not in
<foreach collection="conditionParamRef.salaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('leavePersonIdList') and conditionParamRef.leavePersonIdList.size() > 0">
field(a.leavePersonId,
<foreach collection="conditionParamRef.leavePersonIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('leaveTypeList') and conditionParamRef.leaveTypeList.size() > 0">
field(a.leaveType,
<foreach collection="conditionParamRef.leaveTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('durationList') and conditionParamRef.durationList.size() > 0">
field(a.duration,
<foreach collection="conditionParamRef.durationList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('approverIdList') and conditionParamRef.approverIdList.size() > 0">
field(a.approverId,
<foreach collection="conditionParamRef.approverIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('auditResultList') and conditionParamRef.auditResultList.size() > 0">
field(a.auditResult,
<foreach collection="conditionParamRef.auditResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('processStatusList') and conditionParamRef.processStatusList.size() > 0">
field(a.processStatus,
<foreach collection="conditionParamRef.processStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('leavePersonIdList') and conditionParamRef.leavePersonIdList.size() > 0">
field(a.leavePersonId,
<foreach collection="conditionParamRef.leavePersonIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('leaveTypeList') and conditionParamRef.leaveTypeList.size() > 0">
field(a.leaveType,
<foreach collection="conditionParamRef.leaveTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('durationList') and conditionParamRef.durationList.size() > 0">
field(a.duration,
<foreach collection="conditionParamRef.durationList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('approverIdList') and conditionParamRef.approverIdList.size() > 0">
field(a.approverId,
<foreach collection="conditionParamRef.approverIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('auditResultList') and conditionParamRef.auditResultList.size() > 0">
field(a.auditResult,
<foreach collection="conditionParamRef.auditResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('processStatusList') and conditionParamRef.processStatusList.size() > 0">
field(a.processStatus,
<foreach collection="conditionParamRef.processStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1305,8 +1543,20 @@ ...@@ -1305,8 +1543,20 @@
<if test='orderCol.sourceDingTime != null and "DESC".equalsIgnoreCase(orderCol.sourceDingTime)'>DESC</if> <if test='orderCol.sourceDingTime != null and "DESC".equalsIgnoreCase(orderCol.sourceDingTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('salaId')">
a.salaId
<if test='orderCol.salaId != null and "DESC".equalsIgnoreCase(orderCol.salaId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('salaName')">
a.salaName
<if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordHikMapper.xml
View file @ a4eca9a8
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<result property="signOutResult" column="signOutResult" /> <result property="signOutResult" column="signOutResult" />
<result property="attendType" column="attendType" /> <result property="attendType" column="attendType" />
<result property="punchResult" column="punchResult" /> <result property="punchResult" column="punchResult" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap> </resultMap>
...@@ -108,23 +110,29 @@ ...@@ -108,23 +110,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('punchResult') or colPickMode == 1 and data.containsKey('punchResult')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('punchResult') or colPickMode == 1 and data.containsKey('punchResult')))">
a.punchResult, a.punchResult,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaId') or colPickMode == 1 and data.containsKey('salaId')))">
a.salaId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))">
a.salaName,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceRecordHikEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceRecordHikEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_record_hik insert into mortals_xhx_attendance_record_hik
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,attendanceDate,attendanceAddress,eventSource,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult) (staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,attendanceDate,attendanceAddress,eventSource,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult,salaId,salaName)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{positionId},#{positionName},#{attendanceGroupId},#{attendanceGroupName},#{shiftsId},#{shiftsName},#{attendanceDate},#{attendanceAddress},#{eventSource},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{signInResult},#{signOutResult},#{attendType},#{punchResult}) (#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{positionId},#{positionName},#{attendanceGroupId},#{attendanceGroupName},#{shiftsId},#{shiftsName},#{attendanceDate},#{attendanceAddress},#{eventSource},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{signInResult},#{signOutResult},#{attendType},#{punchResult},#{salaId},#{salaName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_record_hik insert into mortals_xhx_attendance_record_hik
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,attendanceDate,attendanceAddress,eventSource,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult) (staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,attendanceDate,attendanceAddress,eventSource,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult,salaId,salaName)
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.workNum},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.shiftsId},#{item.shiftsName},#{item.attendanceDate},#{item.attendanceAddress},#{item.eventSource},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.signInResult},#{item.signOutResult},#{item.attendType},#{item.punchResult}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.shiftsId},#{item.shiftsName},#{item.attendanceDate},#{item.attendanceAddress},#{item.eventSource},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.signInResult},#{item.signOutResult},#{item.attendType},#{item.punchResult},#{item.salaId},#{item.salaName})
</foreach> </foreach>
</insert> </insert>
...@@ -233,6 +241,15 @@ ...@@ -233,6 +241,15 @@
<if test="(colPickMode==0 and data.containsKey('punchResultIncrement')) or (colPickMode==1 and !data.containsKey('punchResultIncrement'))"> <if test="(colPickMode==0 and data.containsKey('punchResultIncrement')) or (colPickMode==1 and !data.containsKey('punchResultIncrement'))">
a.punchResult=ifnull(a.punchResult,0) + #{data.punchResultIncrement}, a.punchResult=ifnull(a.punchResult,0) + #{data.punchResultIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('salaId')) or (colPickMode==1 and !data.containsKey('salaId'))">
a.salaId=#{data.salaId},
</if>
<if test="(colPickMode==0 and data.containsKey('salaIdIncrement')) or (colPickMode==1 and !data.containsKey('salaIdIncrement'))">
a.salaId=ifnull(a.salaId,0) + #{data.salaIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))">
a.salaName=#{data.salaName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -456,6 +473,25 @@ ...@@ -456,6 +473,25 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="salaId=(case" suffix="ELSE salaId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('salaId')) or (colPickMode==1 and !item.containsKey('salaId'))">
when a.id=#{item.id} then #{item.salaId}
</when>
<when test="(colPickMode==0 and item.containsKey('salaIdIncrement')) or (colPickMode==1 and !item.containsKey('salaIdIncrement'))">
when a.id=#{item.id} then ifnull(a.salaId,0) + #{item.salaIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="salaName=(case" suffix="ELSE salaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('salaName')) or (colPickMode==1 and !item.containsKey('salaName'))">
when a.id=#{item.id} then #{item.salaName}
</if>
</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=")">
...@@ -1124,18 +1160,234 @@ ...@@ -1124,18 +1160,234 @@
${_conditionType_} a.punchResult <![CDATA[ <= ]]> #{${_conditionParam_}.punchResultEnd} ${_conditionType_} a.punchResult <![CDATA[ <= ]]> #{${_conditionParam_}.punchResultEnd}
</if> </if>
<if test="conditionParamRef.containsKey('salaId')">
<if test="conditionParamRef.salaId != null ">
${_conditionType_} a.salaId = #{${_conditionParam_}.salaId}
</if>
<if test="conditionParamRef.salaId == null">
${_conditionType_} a.salaId is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
${_conditionType_} a.salaId in
<foreach collection="conditionParamRef.salaIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdNotList') and conditionParamRef.salaIdNotList.size() > 0">
${_conditionType_} a.salaId not in
<foreach collection="conditionParamRef.salaIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdStart') and conditionParamRef.salaIdStart != null">
${_conditionType_} a.salaId <![CDATA[ >= ]]> #{${_conditionParam_}.salaIdStart}
</if>
<if test="conditionParamRef.containsKey('salaIdEnd') and conditionParamRef.salaIdEnd != null">
${_conditionType_} a.salaId <![CDATA[ <= ]]> #{${_conditionParam_}.salaIdEnd}
</if>
<if test="conditionParamRef.containsKey('salaName')">
<if test="conditionParamRef.salaName != null and conditionParamRef.salaName != ''">
${_conditionType_} a.salaName like #{${_conditionParam_}.salaName}
</if>
<if test="conditionParamRef.salaName == null">
${_conditionType_} a.salaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaNameList') and conditionParamRef.salaNameList.size() > 0">
${_conditionType_} a.salaName in
<foreach collection="conditionParamRef.salaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaNameNotList') and conditionParamRef.salaNameNotList.size() > 0">
${_conditionType_} a.salaName not in
<foreach collection="conditionParamRef.salaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
field(a.attendanceGroupId,
<foreach collection="conditionParamRef.attendanceGroupIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('shiftsIdList') and conditionParamRef.shiftsIdList.size() > 0">
field(a.shiftsId,
<foreach collection="conditionParamRef.shiftsIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signInResultList') and conditionParamRef.signInResultList.size() > 0">
field(a.signInResult,
<foreach collection="conditionParamRef.signInResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signOutResultList') and conditionParamRef.signOutResultList.size() > 0">
field(a.signOutResult,
<foreach collection="conditionParamRef.signOutResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('punchResultList') and conditionParamRef.punchResultList.size() > 0">
field(a.punchResult,
<foreach collection="conditionParamRef.punchResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
field(a.attendanceGroupId,
<foreach collection="conditionParamRef.attendanceGroupIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('shiftsIdList') and conditionParamRef.shiftsIdList.size() > 0">
field(a.shiftsId,
<foreach collection="conditionParamRef.shiftsIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signInResultList') and conditionParamRef.signInResultList.size() > 0">
field(a.signInResult,
<foreach collection="conditionParamRef.signInResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signOutResultList') and conditionParamRef.signOutResultList.size() > 0">
field(a.signOutResult,
<foreach collection="conditionParamRef.signOutResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('punchResultList') and conditionParamRef.punchResultList.size() > 0">
field(a.punchResult,
<foreach collection="conditionParamRef.punchResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1257,8 +1509,20 @@ ...@@ -1257,8 +1509,20 @@
<if test='orderCol.punchResult != null and "DESC".equalsIgnoreCase(orderCol.punchResult)'>DESC</if> <if test='orderCol.punchResult != null and "DESC".equalsIgnoreCase(orderCol.punchResult)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('salaId')">
a.salaId
<if test='orderCol.salaId != null and "DESC".equalsIgnoreCase(orderCol.salaId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('salaName')">
a.salaName
<if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordMapper.xml
View file @ a4eca9a8
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<result property="punchResult" column="punchResult" /> <result property="punchResult" column="punchResult" />
<result property="classId" column="classId" /> <result property="classId" column="classId" />
<result property="className" column="className" /> <result property="className" column="className" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap> </resultMap>
...@@ -100,23 +102,29 @@ ...@@ -100,23 +102,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('className') or colPickMode == 1 and data.containsKey('className')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('className') or colPickMode == 1 and data.containsKey('className')))">
a.className, a.className,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaId') or colPickMode == 1 and data.containsKey('salaId')))">
a.salaId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))">
a.salaName,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AttendanceRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_record insert into mortals_xhx_attendance_record
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,attendanceDate,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult,classId,className) (staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,attendanceDate,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult,classId,className,salaId,salaName)
VALUES VALUES
(#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{positionId},#{positionName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{signInResult},#{signOutResult},#{attendType},#{punchResult},#{classId},#{className}) (#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{positionId},#{positionName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{signInResult},#{signOutResult},#{attendType},#{punchResult},#{classId},#{className},#{salaId},#{salaName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_record insert into mortals_xhx_attendance_record
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,attendanceDate,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult,classId,className) (staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,attendanceDate,remark,createUserId,createTime,updateUserId,updateTime,signInResult,signOutResult,attendType,punchResult,classId,className,salaId,salaName)
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.workNum},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.signInResult},#{item.signOutResult},#{item.attendType},#{item.punchResult},#{item.classId},#{item.className}) (#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.signInResult},#{item.signOutResult},#{item.attendType},#{item.punchResult},#{item.classId},#{item.className},#{item.salaId},#{item.salaName})
</foreach> </foreach>
</insert> </insert>
...@@ -219,6 +227,15 @@ ...@@ -219,6 +227,15 @@
<if test="(colPickMode==0 and data.containsKey('className')) or (colPickMode==1 and !data.containsKey('className'))"> <if test="(colPickMode==0 and data.containsKey('className')) or (colPickMode==1 and !data.containsKey('className'))">
a.className=#{data.className}, a.className=#{data.className},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('salaId')) or (colPickMode==1 and !data.containsKey('salaId'))">
a.salaId=#{data.salaId},
</if>
<if test="(colPickMode==0 and data.containsKey('salaIdIncrement')) or (colPickMode==1 and !data.containsKey('salaIdIncrement'))">
a.salaId=ifnull(a.salaId,0) + #{data.salaIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))">
a.salaName=#{data.salaName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -428,6 +445,25 @@ ...@@ -428,6 +445,25 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="salaId=(case" suffix="ELSE salaId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('salaId')) or (colPickMode==1 and !item.containsKey('salaId'))">
when a.id=#{item.id} then #{item.salaId}
</when>
<when test="(colPickMode==0 and item.containsKey('salaIdIncrement')) or (colPickMode==1 and !item.containsKey('salaIdIncrement'))">
when a.id=#{item.id} then ifnull(a.salaId,0) + #{item.salaIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="salaName=(case" suffix="ELSE salaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('salaName')) or (colPickMode==1 and !item.containsKey('salaName'))">
when a.id=#{item.id} then #{item.salaName}
</if>
</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=")">
...@@ -1054,18 +1090,234 @@ ...@@ -1054,18 +1090,234 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('salaId')">
<if test="conditionParamRef.salaId != null ">
${_conditionType_} a.salaId = #{${_conditionParam_}.salaId}
</if>
<if test="conditionParamRef.salaId == null">
${_conditionType_} a.salaId is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
${_conditionType_} a.salaId in
<foreach collection="conditionParamRef.salaIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdNotList') and conditionParamRef.salaIdNotList.size() > 0">
${_conditionType_} a.salaId not in
<foreach collection="conditionParamRef.salaIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdStart') and conditionParamRef.salaIdStart != null">
${_conditionType_} a.salaId <![CDATA[ >= ]]> #{${_conditionParam_}.salaIdStart}
</if>
<if test="conditionParamRef.containsKey('salaIdEnd') and conditionParamRef.salaIdEnd != null">
${_conditionType_} a.salaId <![CDATA[ <= ]]> #{${_conditionParam_}.salaIdEnd}
</if>
<if test="conditionParamRef.containsKey('salaName')">
<if test="conditionParamRef.salaName != null and conditionParamRef.salaName != ''">
${_conditionType_} a.salaName like #{${_conditionParam_}.salaName}
</if>
<if test="conditionParamRef.salaName == null">
${_conditionType_} a.salaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaNameList') and conditionParamRef.salaNameList.size() > 0">
${_conditionType_} a.salaName in
<foreach collection="conditionParamRef.salaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaNameNotList') and conditionParamRef.salaNameNotList.size() > 0">
${_conditionType_} a.salaName not in
<foreach collection="conditionParamRef.salaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
field(a.attendanceGroupId,
<foreach collection="conditionParamRef.attendanceGroupIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signInResultList') and conditionParamRef.signInResultList.size() > 0">
field(a.signInResult,
<foreach collection="conditionParamRef.signInResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signOutResultList') and conditionParamRef.signOutResultList.size() > 0">
field(a.signOutResult,
<foreach collection="conditionParamRef.signOutResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('punchResultList') and conditionParamRef.punchResultList.size() > 0">
field(a.punchResult,
<foreach collection="conditionParamRef.punchResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('classIdList') and conditionParamRef.classIdList.size() > 0">
field(a.classId,
<foreach collection="conditionParamRef.classIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
field(a.attendanceGroupId,
<foreach collection="conditionParamRef.attendanceGroupIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signInResultList') and conditionParamRef.signInResultList.size() > 0">
field(a.signInResult,
<foreach collection="conditionParamRef.signInResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('signOutResultList') and conditionParamRef.signOutResultList.size() > 0">
field(a.signOutResult,
<foreach collection="conditionParamRef.signOutResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('punchResultList') and conditionParamRef.punchResultList.size() > 0">
field(a.punchResult,
<foreach collection="conditionParamRef.punchResultList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('classIdList') and conditionParamRef.classIdList.size() > 0">
field(a.classId,
<foreach collection="conditionParamRef.classIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1177,8 +1429,20 @@ ...@@ -1177,8 +1429,20 @@
<if test='orderCol.className != null and "DESC".equalsIgnoreCase(orderCol.className)'>DESC</if> <if test='orderCol.className != null and "DESC".equalsIgnoreCase(orderCol.className)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('salaId')">
a.salaId
<if test='orderCol.salaId != null and "DESC".equalsIgnoreCase(orderCol.salaId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('salaName')">
a.salaName
<if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapper.xml
View file @ a4eca9a8
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
<result property="goTimes" column="goTimes" /> <result property="goTimes" column="goTimes" />
<result property="morningTimes" column="morningTimes" /> <result property="morningTimes" column="morningTimes" />
<result property="afternoonTimes" column="afternoonTimes" /> <result property="afternoonTimes" column="afternoonTimes" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap> </resultMap>
...@@ -212,23 +214,29 @@ ...@@ -212,23 +214,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('afternoonTimes') or colPickMode == 1 and data.containsKey('afternoonTimes')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('afternoonTimes') or colPickMode == 1 and data.containsKey('afternoonTimes')))">
a.afternoonTimes, a.afternoonTimes,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaId') or colPickMode == 1 and data.containsKey('salaId')))">
a.salaId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))">
a.salaName,
</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,breastfeedingLeaveDays,menstrualLeaveDays,annualLeaveDays,compensatedLeaveDays,paternityLeaveDays,phoneNumer,goTimes,morningTimes,afternoonTimes) (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,phoneNumer,goTimes,morningTimes,afternoonTimes,salaId,salaName)
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},#{breastfeedingLeaveDays},#{menstrualLeaveDays},#{annualLeaveDays},#{compensatedLeaveDays},#{paternityLeaveDays},#{phoneNumer},#{goTimes},#{morningTimes},#{afternoonTimes}) (#{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},#{phoneNumer},#{goTimes},#{morningTimes},#{afternoonTimes},#{salaId},#{salaName})
</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,breastfeedingLeaveDays,menstrualLeaveDays,annualLeaveDays,compensatedLeaveDays,paternityLeaveDays,phoneNumer,goTimes,morningTimes,afternoonTimes) (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,phoneNumer,goTimes,morningTimes,afternoonTimes,salaId,salaName)
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.breastfeedingLeaveDays},#{item.menstrualLeaveDays},#{item.annualLeaveDays},#{item.compensatedLeaveDays},#{item.paternityLeaveDays},#{item.phoneNumer},#{item.goTimes},#{item.morningTimes},#{item.afternoonTimes}) (#{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},#{item.phoneNumer},#{item.goTimes},#{item.morningTimes},#{item.afternoonTimes},#{item.salaId},#{item.salaName})
</foreach> </foreach>
</insert> </insert>
...@@ -511,6 +519,15 @@ ...@@ -511,6 +519,15 @@
<if test="(colPickMode==0 and data.containsKey('afternoonTimesIncrement')) or (colPickMode==1 and !data.containsKey('afternoonTimesIncrement'))"> <if test="(colPickMode==0 and data.containsKey('afternoonTimesIncrement')) or (colPickMode==1 and !data.containsKey('afternoonTimesIncrement'))">
a.afternoonTimes=ifnull(a.afternoonTimes,0) + #{data.afternoonTimesIncrement}, a.afternoonTimes=ifnull(a.afternoonTimes,0) + #{data.afternoonTimesIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('salaId')) or (colPickMode==1 and !data.containsKey('salaId'))">
a.salaId=#{data.salaId},
</if>
<if test="(colPickMode==0 and data.containsKey('salaIdIncrement')) or (colPickMode==1 and !data.containsKey('salaIdIncrement'))">
a.salaId=ifnull(a.salaId,0) + #{data.salaIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))">
a.salaName=#{data.salaName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -1076,6 +1093,25 @@ ...@@ -1076,6 +1093,25 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="salaId=(case" suffix="ELSE salaId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('salaId')) or (colPickMode==1 and !item.containsKey('salaId'))">
when a.id=#{item.id} then #{item.salaId}
</when>
<when test="(colPickMode==0 and item.containsKey('salaIdIncrement')) or (colPickMode==1 and !item.containsKey('salaIdIncrement'))">
when a.id=#{item.id} then ifnull(a.salaId,0) + #{item.salaIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="salaName=(case" suffix="ELSE salaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('salaName')) or (colPickMode==1 and !item.containsKey('salaName'))">
when a.id=#{item.id} then #{item.salaName}
</if>
</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=")">
...@@ -2488,18 +2524,682 @@ ...@@ -2488,18 +2524,682 @@
${_conditionType_} a.afternoonTimes <![CDATA[ <= ]]> #{${_conditionParam_}.afternoonTimesEnd} ${_conditionType_} a.afternoonTimes <![CDATA[ <= ]]> #{${_conditionParam_}.afternoonTimesEnd}
</if> </if>
<if test="conditionParamRef.containsKey('salaId')">
<if test="conditionParamRef.salaId != null ">
${_conditionType_} a.salaId = #{${_conditionParam_}.salaId}
</if>
<if test="conditionParamRef.salaId == null">
${_conditionType_} a.salaId is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
${_conditionType_} a.salaId in
<foreach collection="conditionParamRef.salaIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdNotList') and conditionParamRef.salaIdNotList.size() > 0">
${_conditionType_} a.salaId not in
<foreach collection="conditionParamRef.salaIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdStart') and conditionParamRef.salaIdStart != null">
${_conditionType_} a.salaId <![CDATA[ >= ]]> #{${_conditionParam_}.salaIdStart}
</if>
<if test="conditionParamRef.containsKey('salaIdEnd') and conditionParamRef.salaIdEnd != null">
${_conditionType_} a.salaId <![CDATA[ <= ]]> #{${_conditionParam_}.salaIdEnd}
</if>
<if test="conditionParamRef.containsKey('salaName')">
<if test="conditionParamRef.salaName != null and conditionParamRef.salaName != ''">
${_conditionType_} a.salaName like #{${_conditionParam_}.salaName}
</if>
<if test="conditionParamRef.salaName == null">
${_conditionType_} a.salaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaNameList') and conditionParamRef.salaNameList.size() > 0">
${_conditionType_} a.salaName in
<foreach collection="conditionParamRef.salaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaNameNotList') and conditionParamRef.salaNameNotList.size() > 0">
${_conditionType_} a.salaName not in
<foreach collection="conditionParamRef.salaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
field(a.backToUnit,
<foreach collection="conditionParamRef.backToUnitList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
field(a.onDutyLeave,
<foreach collection="conditionParamRef.onDutyLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
field(a.outOfOffice,
<foreach collection="conditionParamRef.outOfOfficeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
field(a.shiftCompensation,
<foreach collection="conditionParamRef.shiftCompensationList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
field(a.physicalExamination,
<foreach collection="conditionParamRef.physicalExaminationList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
field(a.quarantine,
<foreach collection="conditionParamRef.quarantineList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
field(a.businessTrip,
<foreach collection="conditionParamRef.businessTripList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
field(a.publicHoliday,
<foreach collection="conditionParamRef.publicHolidayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sickLeaveList') and conditionParamRef.sickLeaveList.size() > 0">
field(a.sickLeave,
<foreach collection="conditionParamRef.sickLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('funeralLeaveList') and conditionParamRef.funeralLeaveList.size() > 0">
field(a.funeralLeave,
<foreach collection="conditionParamRef.funeralLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('marriageLeaveList') and conditionParamRef.marriageLeaveList.size() > 0">
field(a.marriageLeave,
<foreach collection="conditionParamRef.marriageLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
field(a.childRearingLeave,
<foreach collection="conditionParamRef.childRearingLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('maternityLeaveList') and conditionParamRef.maternityLeaveList.size() > 0">
field(a.maternityLeave,
<foreach collection="conditionParamRef.maternityLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
field(a.transferBack,
<foreach collection="conditionParamRef.transferBackList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
field(a.homeLeave,
<foreach collection="conditionParamRef.homeLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('personalLeaveList') and conditionParamRef.personalLeaveList.size() > 0">
field(a.personalLeave,
<foreach collection="conditionParamRef.personalLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('absenteeismDaysList') and conditionParamRef.absenteeismDaysList.size() > 0">
field(a.absenteeismDays,
<foreach collection="conditionParamRef.absenteeismDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('otherDaysList') and conditionParamRef.otherDaysList.size() > 0">
field(a.otherDays,
<foreach collection="conditionParamRef.otherDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendanceRateList') and conditionParamRef.attendanceRateList.size() > 0">
field(a.attendanceRate,
<foreach collection="conditionParamRef.attendanceRateList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('nonCompliancePunchList') and conditionParamRef.nonCompliancePunchList.size() > 0">
field(a.nonCompliancePunch,
<foreach collection="conditionParamRef.nonCompliancePunchList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('lateTimesList') and conditionParamRef.lateTimesList.size() > 0">
field(a.lateTimes,
<foreach collection="conditionParamRef.lateTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('surfingMobileTimesList') and conditionParamRef.surfingMobileTimesList.size() > 0">
field(a.surfingMobileTimes,
<foreach collection="conditionParamRef.surfingMobileTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('overtimeTimesList') and conditionParamRef.overtimeTimesList.size() > 0">
field(a.overtimeTimes,
<foreach collection="conditionParamRef.overtimeTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('vacancyList') and conditionParamRef.vacancyList.size() > 0">
field(a.vacancy,
<foreach collection="conditionParamRef.vacancyList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('nonStandardDressTimesList') and conditionParamRef.nonStandardDressTimesList.size() > 0">
field(a.nonStandardDressTimes,
<foreach collection="conditionParamRef.nonStandardDressTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceList') and conditionParamRef.unexcusedMeetingAbsenceList.size() > 0">
field(a.unexcusedMeetingAbsence,
<foreach collection="conditionParamRef.unexcusedMeetingAbsenceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('earlyLeaveMeetingList') and conditionParamRef.earlyLeaveMeetingList.size() > 0">
field(a.earlyLeaveMeeting,
<foreach collection="conditionParamRef.earlyLeaveMeetingList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
field(a.year,
<foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
field(a.month,
<foreach collection="conditionParamRef.monthList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
field(a.day,
<foreach collection="conditionParamRef.dayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysList') and conditionParamRef.breastfeedingLeaveDaysList.size() > 0">
field(a.breastfeedingLeaveDays,
<foreach collection="conditionParamRef.breastfeedingLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysList') and conditionParamRef.menstrualLeaveDaysList.size() > 0">
field(a.menstrualLeaveDays,
<foreach collection="conditionParamRef.menstrualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysList') and conditionParamRef.annualLeaveDaysList.size() > 0">
field(a.annualLeaveDays,
<foreach collection="conditionParamRef.annualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysList') and conditionParamRef.compensatedLeaveDaysList.size() > 0">
field(a.compensatedLeaveDays,
<foreach collection="conditionParamRef.compensatedLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysList') and conditionParamRef.paternityLeaveDaysList.size() > 0">
field(a.paternityLeaveDays,
<foreach collection="conditionParamRef.paternityLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('goTimesList') and conditionParamRef.goTimesList.size() > 0">
field(a.goTimes,
<foreach collection="conditionParamRef.goTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('morningTimesList') and conditionParamRef.morningTimesList.size() > 0">
field(a.morningTimes,
<foreach collection="conditionParamRef.morningTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('afternoonTimesList') and conditionParamRef.afternoonTimesList.size() > 0">
field(a.afternoonTimes,
<foreach collection="conditionParamRef.afternoonTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
field(a.staffId,
<foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('backToUnitList') and conditionParamRef.backToUnitList.size() > 0">
field(a.backToUnit,
<foreach collection="conditionParamRef.backToUnitList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('onDutyLeaveList') and conditionParamRef.onDutyLeaveList.size() > 0">
field(a.onDutyLeave,
<foreach collection="conditionParamRef.onDutyLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('outOfOfficeList') and conditionParamRef.outOfOfficeList.size() > 0">
field(a.outOfOffice,
<foreach collection="conditionParamRef.outOfOfficeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('shiftCompensationList') and conditionParamRef.shiftCompensationList.size() > 0">
field(a.shiftCompensation,
<foreach collection="conditionParamRef.shiftCompensationList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('physicalExaminationList') and conditionParamRef.physicalExaminationList.size() > 0">
field(a.physicalExamination,
<foreach collection="conditionParamRef.physicalExaminationList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('quarantineList') and conditionParamRef.quarantineList.size() > 0">
field(a.quarantine,
<foreach collection="conditionParamRef.quarantineList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('businessTripList') and conditionParamRef.businessTripList.size() > 0">
field(a.businessTrip,
<foreach collection="conditionParamRef.businessTripList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('publicHolidayList') and conditionParamRef.publicHolidayList.size() > 0">
field(a.publicHoliday,
<foreach collection="conditionParamRef.publicHolidayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sickLeaveList') and conditionParamRef.sickLeaveList.size() > 0">
field(a.sickLeave,
<foreach collection="conditionParamRef.sickLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('funeralLeaveList') and conditionParamRef.funeralLeaveList.size() > 0">
field(a.funeralLeave,
<foreach collection="conditionParamRef.funeralLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('marriageLeaveList') and conditionParamRef.marriageLeaveList.size() > 0">
field(a.marriageLeave,
<foreach collection="conditionParamRef.marriageLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('childRearingLeaveList') and conditionParamRef.childRearingLeaveList.size() > 0">
field(a.childRearingLeave,
<foreach collection="conditionParamRef.childRearingLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('maternityLeaveList') and conditionParamRef.maternityLeaveList.size() > 0">
field(a.maternityLeave,
<foreach collection="conditionParamRef.maternityLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('transferBackList') and conditionParamRef.transferBackList.size() > 0">
field(a.transferBack,
<foreach collection="conditionParamRef.transferBackList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('homeLeaveList') and conditionParamRef.homeLeaveList.size() > 0">
field(a.homeLeave,
<foreach collection="conditionParamRef.homeLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('personalLeaveList') and conditionParamRef.personalLeaveList.size() > 0">
field(a.personalLeave,
<foreach collection="conditionParamRef.personalLeaveList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('absenteeismDaysList') and conditionParamRef.absenteeismDaysList.size() > 0">
field(a.absenteeismDays,
<foreach collection="conditionParamRef.absenteeismDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('otherDaysList') and conditionParamRef.otherDaysList.size() > 0">
field(a.otherDays,
<foreach collection="conditionParamRef.otherDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendanceRateList') and conditionParamRef.attendanceRateList.size() > 0">
field(a.attendanceRate,
<foreach collection="conditionParamRef.attendanceRateList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('nonCompliancePunchList') and conditionParamRef.nonCompliancePunchList.size() > 0">
field(a.nonCompliancePunch,
<foreach collection="conditionParamRef.nonCompliancePunchList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('lateTimesList') and conditionParamRef.lateTimesList.size() > 0">
field(a.lateTimes,
<foreach collection="conditionParamRef.lateTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('surfingMobileTimesList') and conditionParamRef.surfingMobileTimesList.size() > 0">
field(a.surfingMobileTimes,
<foreach collection="conditionParamRef.surfingMobileTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('overtimeTimesList') and conditionParamRef.overtimeTimesList.size() > 0">
field(a.overtimeTimes,
<foreach collection="conditionParamRef.overtimeTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('vacancyList') and conditionParamRef.vacancyList.size() > 0">
field(a.vacancy,
<foreach collection="conditionParamRef.vacancyList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('nonStandardDressTimesList') and conditionParamRef.nonStandardDressTimesList.size() > 0">
field(a.nonStandardDressTimes,
<foreach collection="conditionParamRef.nonStandardDressTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('unexcusedMeetingAbsenceList') and conditionParamRef.unexcusedMeetingAbsenceList.size() > 0">
field(a.unexcusedMeetingAbsence,
<foreach collection="conditionParamRef.unexcusedMeetingAbsenceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('earlyLeaveMeetingList') and conditionParamRef.earlyLeaveMeetingList.size() > 0">
field(a.earlyLeaveMeeting,
<foreach collection="conditionParamRef.earlyLeaveMeetingList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
field(a.year,
<foreach collection="conditionParamRef.yearList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
field(a.month,
<foreach collection="conditionParamRef.monthList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
field(a.day,
<foreach collection="conditionParamRef.dayList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('breastfeedingLeaveDaysList') and conditionParamRef.breastfeedingLeaveDaysList.size() > 0">
field(a.breastfeedingLeaveDays,
<foreach collection="conditionParamRef.breastfeedingLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('menstrualLeaveDaysList') and conditionParamRef.menstrualLeaveDaysList.size() > 0">
field(a.menstrualLeaveDays,
<foreach collection="conditionParamRef.menstrualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('annualLeaveDaysList') and conditionParamRef.annualLeaveDaysList.size() > 0">
field(a.annualLeaveDays,
<foreach collection="conditionParamRef.annualLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('compensatedLeaveDaysList') and conditionParamRef.compensatedLeaveDaysList.size() > 0">
field(a.compensatedLeaveDays,
<foreach collection="conditionParamRef.compensatedLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('paternityLeaveDaysList') and conditionParamRef.paternityLeaveDaysList.size() > 0">
field(a.paternityLeaveDays,
<foreach collection="conditionParamRef.paternityLeaveDaysList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('goTimesList') and conditionParamRef.goTimesList.size() > 0">
field(a.goTimes,
<foreach collection="conditionParamRef.goTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('morningTimesList') and conditionParamRef.morningTimesList.size() > 0">
field(a.morningTimes,
<foreach collection="conditionParamRef.morningTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('afternoonTimesList') and conditionParamRef.afternoonTimesList.size() > 0">
field(a.afternoonTimes,
<foreach collection="conditionParamRef.afternoonTimesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -2751,8 +3451,20 @@ ...@@ -2751,8 +3451,20 @@
<if test='orderCol.afternoonTimes != null and "DESC".equalsIgnoreCase(orderCol.afternoonTimes)'>DESC</if> <if test='orderCol.afternoonTimes != null and "DESC".equalsIgnoreCase(orderCol.afternoonTimes)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('salaId')">
a.salaId
<if test='orderCol.salaId != null and "DESC".equalsIgnoreCase(orderCol.salaId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('salaName')">
a.salaName
<if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml
View file @ a4eca9a8
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
s.workNum, s.workNum,
s.deptId, s.deptId,
s.deptName, s.deptName,
s.salaId,
s.salaName,
s.`status`, s.`status`,
s.leaveDate, s.leaveDate,
DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%Y') as `year`, DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%Y') as `year`,
......
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
View file @ a4eca9a8
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
<result property="goworkCheck" column="goworkCheck" /> <result property="goworkCheck" column="goworkCheck" />
<result property="effectCheck" column="effectCheck" /> <result property="effectCheck" column="effectCheck" />
<result property="otherCheck" column="otherCheck" /> <result property="otherCheck" column="otherCheck" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap> </resultMap>
...@@ -163,23 +166,29 @@ ...@@ -163,23 +166,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('otherCheck') or colPickMode == 1 and data.containsKey('otherCheck')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('otherCheck') or colPickMode == 1 and data.containsKey('otherCheck')))">
a.otherCheck, a.otherCheck,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaId') or colPickMode == 1 and data.containsKey('salaId')))">
a.salaId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('salaName') or colPickMode == 1 and data.containsKey('salaName')))">
a.salaName,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_staff insert into mortals_xhx_staff
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck) (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck,salaId,salaName)
VALUES VALUES
(#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{source},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{picUri},#{serverIndexCode},#{score},#{loginName},#{loginPwd},#{lastLoginTime},#{attendCheck},#{complainCheck},#{reviewCheck},#{goworkCheck},#{effectCheck},#{otherCheck}) (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{source},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{picUri},#{serverIndexCode},#{score},#{loginName},#{loginPwd},#{lastLoginTime},#{attendCheck},#{complainCheck},#{reviewCheck},#{goworkCheck},#{effectCheck},#{otherCheck},#{salaId},#{salaName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_staff insert into mortals_xhx_staff
(name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck) (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime,attendCheck,complainCheck,reviewCheck,goworkCheck,effectCheck,otherCheck,salaId,salaName)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.source},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.picUri},#{item.serverIndexCode},#{item.score},#{item.loginName},#{item.loginPwd},#{item.lastLoginTime},#{item.attendCheck},#{item.complainCheck},#{item.reviewCheck},#{item.goworkCheck},#{item.effectCheck},#{item.otherCheck}) (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.source},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.picUri},#{item.serverIndexCode},#{item.score},#{item.loginName},#{item.loginPwd},#{item.lastLoginTime},#{item.attendCheck},#{item.complainCheck},#{item.reviewCheck},#{item.goworkCheck},#{item.effectCheck},#{item.otherCheck},#{item.salaId},#{item.salaName})
</foreach> </foreach>
</insert> </insert>
...@@ -348,6 +357,15 @@ ...@@ -348,6 +357,15 @@
<if test="(colPickMode==0 and data.containsKey('otherCheckIncrement')) or (colPickMode==1 and !data.containsKey('otherCheckIncrement'))"> <if test="(colPickMode==0 and data.containsKey('otherCheckIncrement')) or (colPickMode==1 and !data.containsKey('otherCheckIncrement'))">
a.otherCheck=ifnull(a.otherCheck,0) + #{data.otherCheckIncrement}, a.otherCheck=ifnull(a.otherCheck,0) + #{data.otherCheckIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('salaId')) or (colPickMode==1 and !data.containsKey('salaId'))">
a.salaId=#{data.salaId},
</if>
<if test="(colPickMode==0 and data.containsKey('salaIdIncrement')) or (colPickMode==1 and !data.containsKey('salaIdIncrement'))">
a.salaId=ifnull(a.salaId,0) + #{data.salaIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('salaName')) or (colPickMode==1 and !data.containsKey('salaName'))">
a.salaName=#{data.salaName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -699,6 +717,25 @@ ...@@ -699,6 +717,25 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="salaId=(case" suffix="ELSE salaId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('salaId')) or (colPickMode==1 and !item.containsKey('salaId'))">
when a.id=#{item.id} then #{item.salaId}
</when>
<when test="(colPickMode==0 and item.containsKey('salaIdIncrement')) or (colPickMode==1 and !item.containsKey('salaIdIncrement'))">
when a.id=#{item.id} then ifnull(a.salaId,0) + #{item.salaIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="salaName=(case" suffix="ELSE salaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('salaName')) or (colPickMode==1 and !item.containsKey('salaName'))">
when a.id=#{item.id} then #{item.salaName}
</if>
</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=")">
...@@ -1672,18 +1709,319 @@ ...@@ -1672,18 +1709,319 @@
<if test="conditionParamRef.containsKey('otherCheckEnd') and conditionParamRef.otherCheckEnd != null"> <if test="conditionParamRef.containsKey('otherCheckEnd') and conditionParamRef.otherCheckEnd != null">
${_conditionType_} a.otherCheck <![CDATA[ <= ]]> #{${_conditionParam_}.otherCheckEnd} ${_conditionType_} a.otherCheck <![CDATA[ <= ]]> #{${_conditionParam_}.otherCheckEnd}
</if> </if>
<if test="conditionParamRef.containsKey('salaId')">
<if test="conditionParamRef.salaId != null ">
${_conditionType_} a.salaId = #{${_conditionParam_}.salaId}
</if>
<if test="conditionParamRef.salaId == null">
${_conditionType_} a.salaId is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
${_conditionType_} a.salaId in
<foreach collection="conditionParamRef.salaIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdNotList') and conditionParamRef.salaIdNotList.size() > 0">
${_conditionType_} a.salaId not in
<foreach collection="conditionParamRef.salaIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaIdStart') and conditionParamRef.salaIdStart != null">
${_conditionType_} a.salaId <![CDATA[ >= ]]> #{${_conditionParam_}.salaIdStart}
</if>
<if test="conditionParamRef.containsKey('salaIdEnd') and conditionParamRef.salaIdEnd != null">
${_conditionType_} a.salaId <![CDATA[ <= ]]> #{${_conditionParam_}.salaIdEnd}
</if>
<if test="conditionParamRef.containsKey('salaName')">
<if test="conditionParamRef.salaName != null and conditionParamRef.salaName != ''">
${_conditionType_} a.salaName like #{${_conditionParam_}.salaName}
</if>
<if test="conditionParamRef.salaName == null">
${_conditionType_} a.salaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('salaNameList') and conditionParamRef.salaNameList.size() > 0">
${_conditionType_} a.salaName in
<foreach collection="conditionParamRef.salaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('salaNameNotList') and conditionParamRef.salaNameNotList.size() > 0">
${_conditionType_} a.salaName not in
<foreach collection="conditionParamRef.salaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('genderList') and conditionParamRef.genderList.size() > 0">
field(a.gender,
<foreach collection="conditionParamRef.genderList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('politicalstatusList') and conditionParamRef.politicalstatusList.size() > 0">
field(a.politicalstatus,
<foreach collection="conditionParamRef.politicalstatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffTypeList') and conditionParamRef.staffTypeList.size() > 0">
field(a.staffType,
<foreach collection="conditionParamRef.staffTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
field(a.status,
<foreach collection="conditionParamRef.statusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
field(a.score,
<foreach collection="conditionParamRef.scoreList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendCheckList') and conditionParamRef.attendCheckList.size() > 0">
field(a.attendCheck,
<foreach collection="conditionParamRef.attendCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('complainCheckList') and conditionParamRef.complainCheckList.size() > 0">
field(a.complainCheck,
<foreach collection="conditionParamRef.complainCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('reviewCheckList') and conditionParamRef.reviewCheckList.size() > 0">
field(a.reviewCheck,
<foreach collection="conditionParamRef.reviewCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('goworkCheckList') and conditionParamRef.goworkCheckList.size() > 0">
field(a.goworkCheck,
<foreach collection="conditionParamRef.goworkCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('effectCheckList') and conditionParamRef.effectCheckList.size() > 0">
field(a.effectCheck,
<foreach collection="conditionParamRef.effectCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('otherCheckList') and conditionParamRef.otherCheckList.size() > 0">
field(a.otherCheck,
<foreach collection="conditionParamRef.otherCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('genderList') and conditionParamRef.genderList.size() > 0">
field(a.gender,
<foreach collection="conditionParamRef.genderList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('politicalstatusList') and conditionParamRef.politicalstatusList.size() > 0">
field(a.politicalstatus,
<foreach collection="conditionParamRef.politicalstatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
field(a.positionId,
<foreach collection="conditionParamRef.positionIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('staffTypeList') and conditionParamRef.staffTypeList.size() > 0">
field(a.staffType,
<foreach collection="conditionParamRef.staffTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
field(a.status,
<foreach collection="conditionParamRef.statusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
field(a.source,
<foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('scoreList') and conditionParamRef.scoreList.size() > 0">
field(a.score,
<foreach collection="conditionParamRef.scoreList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('attendCheckList') and conditionParamRef.attendCheckList.size() > 0">
field(a.attendCheck,
<foreach collection="conditionParamRef.attendCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('complainCheckList') and conditionParamRef.complainCheckList.size() > 0">
field(a.complainCheck,
<foreach collection="conditionParamRef.complainCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('reviewCheckList') and conditionParamRef.reviewCheckList.size() > 0">
field(a.reviewCheck,
<foreach collection="conditionParamRef.reviewCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('goworkCheckList') and conditionParamRef.goworkCheckList.size() > 0">
field(a.goworkCheck,
<foreach collection="conditionParamRef.goworkCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('effectCheckList') and conditionParamRef.effectCheckList.size() > 0">
field(a.effectCheck,
<foreach collection="conditionParamRef.effectCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('otherCheckList') and conditionParamRef.otherCheckList.size() > 0">
field(a.otherCheck,
<foreach collection="conditionParamRef.otherCheckList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('salaIdList') and conditionParamRef.salaIdList.size() > 0">
field(a.salaId,
<foreach collection="conditionParamRef.salaIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1875,8 +2213,20 @@ ...@@ -1875,8 +2213,20 @@
<if test='orderCol.otherCheck != null and "DESC".equalsIgnoreCase(orderCol.otherCheck)'>DESC</if> <if test='orderCol.otherCheck != null and "DESC".equalsIgnoreCase(orderCol.otherCheck)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('salaId')">
a.salaId
<if test='orderCol.salaId != null and "DESC".equalsIgnoreCase(orderCol.salaId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('salaName')">
a.salaName
<if test='orderCol.salaName != null and "DESC".equalsIgnoreCase(orderCol.salaName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
<sql id="_group_by_"> <sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
......
db/add.sql
View file @ a4eca9a8
...@@ -896,4 +896,31 @@ ALTER TABLE `mortals_xhx_staff` ADD COLUMN `attendCheck` TINYINT (2) DEFAULT '0' ...@@ -896,4 +896,31 @@ ALTER TABLE `mortals_xhx_staff` ADD COLUMN `attendCheck` TINYINT (2) DEFAULT '0'
ADD COLUMN `reviewCheck` TINYINT (2) DEFAULT '0' COMMENT '投诉授权(0.不启用,1.启用)', ADD COLUMN `reviewCheck` TINYINT (2) DEFAULT '0' COMMENT '投诉授权(0.不启用,1.启用)',
ADD COLUMN `goworkCheck` TINYINT (2) DEFAULT '0' COMMENT '办件授权(0.不启用,1.启用)', ADD COLUMN `goworkCheck` TINYINT (2) DEFAULT '0' COMMENT '办件授权(0.不启用,1.启用)',
ADD COLUMN `effectCheck` TINYINT (2) DEFAULT '0' COMMENT '效能授权(0.不启用,1.启用)', ADD COLUMN `effectCheck` TINYINT (2) DEFAULT '0' COMMENT '效能授权(0.不启用,1.启用)',
ADD COLUMN `otherCheck` TINYINT (2) DEFAULT '0' COMMENT '其他授权(0.不启用,1.启用)'; ADD COLUMN `otherCheck` TINYINT (2) DEFAULT '0' COMMENT '其他授权(0.不启用,1.启用)';
\ No newline at end of file
-- ----------
-- 2024-01-11 人员信息表增加所属大厅
-- ----------
ALTER TABLE `mortals_xhx_staff`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称';
ALTER TABLE `mortals_xhx_attendance_leave_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称';
ALTER TABLE `mortals_xhx_attendance_record`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称';
ALTER TABLE `mortals_xhx_attendance_record_error`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称';
ALTER TABLE `mortals_xhx_attendance_record_hik`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称';
ALTER TABLE `mortals_xhx_attendance_stat`
ADD COLUMN `salaId` bigint(20) DEFAULT NULL COMMENT '所属大厅',
ADD COLUMN `salaName` varchar(128) DEFAULT NULL COMMENT '所属大厅名称';
\ No newline at end of file
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