Skip to content

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

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

parent 93640b69
Show 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 {
recordHikEntity.setWorkNum(staffCache.getWorkNum());
recordHikEntity.setDeptId(staffCache.getDeptId());
recordHikEntity.setDeptName(staffCache.getDeptName());
recordHikEntity.setSalaId(staffCache.getSalaId());
recordHikEntity.setSalaName(staffCache.getSalaName());
recordHikEntity.setPositionId(staffCache.getPositionId());
recordHikEntity.setPositionName(staffCache.getPositionName());
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 {
recordHikEntity.setWorkNum(staffCache.getWorkNum());
recordHikEntity.setDeptId(staffCache.getDeptId());
recordHikEntity.setDeptName(staffCache.getDeptName());
recordHikEntity.setSalaId(staffCache.getSalaId());
recordHikEntity.setSalaName(staffCache.getSalaName());
recordHikEntity.setPositionId(staffCache.getPositionId());
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 {
recordHikEntity.setWorkNum(staffCache.getWorkNum());
recordHikEntity.setDeptId(staffCache.getDeptId());
recordHikEntity.setDeptName(staffCache.getDeptName());
recordHikEntity.setSalaId(staffCache.getSalaId());
recordHikEntity.setSalaName(staffCache.getSalaName());
recordHikEntity.setPositionId(staffCache.getPositionId());
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 {
leaveRecordEntity.setDeptId(staffEntity.getDeptId());
leaveRecordEntity.setDeptName(staffEntity.getDeptName());
leaveRecordEntity.setPhoneNumber(staffEntity.getPhoneNumber());
leaveRecordEntity.setSalaId(staffEntity.getSalaId());
leaveRecordEntity.setSalaName(staffEntity.getSalaName());
// if(result.getTasks().size() >0 ){
// 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;
* 请假记录信息实体对象
*
* @author zxfei
* @date 2023-08-15
* @date 2024-01-11
*/
@Data
public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
......@@ -61,15 +61,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 时长,单位秒
*/
private Integer duration;
/**
* 钉钉原始请假时间记录
*/
@Excel(name = "请假时间")
private String sourceDingTime;
/**
* 请假事由
*/
......@@ -118,7 +110,19 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
* 处理状态
*/
private Integer processStatus;
/**
* 钉钉原始请假时间记录
*/
@Excel(name = "请假时间")
private String sourceDingTime;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -157,5 +161,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
this.auditTime = new Date();
this.processStatus = 1;
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;
* 请假记录信息查询对象
*
* @author zxfei
* @date 2023-08-15
* @date 2024-01-11
*/
public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 开始 序号，主键，自增长 */
......@@ -246,6 +246,26 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
/** 钉钉原始请假时间记录排除列表 */
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) */
private List<AttendanceLeaveRecordQuery> orConditionList;
......@@ -1576,6 +1596,119 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
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
......@@ -2312,6 +2445,79 @@ public class AttendanceLeaveRecordQuery extends AttendanceLeaveRecordEntity {
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)
* @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;
* 考勤打卡记录信息实体对象
*
* @author zxfei
* @date 2023-08-03
* @date 2024-01-11
*/
@Data
public class AttendanceRecordEntity extends AttendanceRecordVo {
......@@ -97,6 +97,14 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
* 班次名称
*/
private String className;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -131,5 +139,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
this.punchResult = 0;
this.classId = 0L;
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;
import java.util.Date;
import java.util.List;
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.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.vo.AttendanceRecordErrorVo;
import lombok.Data;
/**
* 考勤打卡记录异常信息实体对象
*
* @author zxfei
* @date 2023-04-08
*/
* 考勤打卡记录异常信息实体对象
*
* @author zxfei
* @date 2024-01-11
*/
@Data
public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo {
private static final long serialVersionUID = 1L;
......@@ -101,294 +104,14 @@ public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo {
* 备注
*/
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;
}
private Long salaId;
/**
* 设置 职位ID
* @param positionId
* 所属大厅名称
*/
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
*/
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;
}
private String salaName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -405,71 +128,28 @@ public class AttendanceRecordErrorEntity extends AttendanceRecordErrorVo {
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(){
this.staffId = null;
this.staffName = "";
this.workNum = "";
this.deptId = null;
this.deptName = "";
this.positionId = null;
this.positionName = "";
this.attendanceGroupId = null;
this.attendanceGroupName = "";
this.shiftsId = null;
this.shiftsName = "";
this.goOffDateTime = null;
this.errorDateTime = null;
this.actualAttendanceDateTime = null;
this.operDateTime = null;
this.opertor = "";
this.errorStatus = 0;
this.processStatus = 0;
this.processResult = "";
this.remark = "";
this.salaId = null;
this.salaName = "";
}
}
\ No newline at end of file
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;
import java.util.List;
import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity;
/**
* 考勤打卡记录异常信息查询对象
*
* @author zxfei
* @date 2023-04-08
*/
* 考勤打卡记录异常信息查询对象
*
* @author zxfei
* @date 2024-01-11
*/
public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -159,19 +159,19 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
/** 处理人排除列表 */
private List <String> opertorNotList;
/** 开始 异常状态(0.缺卡,1.早退,2.缺卡) */
/** 开始 异常状态(0.缺卡,1.早退,2.迟到) */
private Integer errorStatusStart;
/** 结束 异常状态(0.缺卡,1.早退,2.缺卡) */
/** 结束 异常状态(0.缺卡,1.早退,2.迟到) */
private Integer errorStatusEnd;
/** 增加 异常状态(0.缺卡,1.早退,2.缺卡) */
/** 增加 异常状态(0.缺卡,1.早退,2.迟到) */
private Integer errorStatusIncrement;
/** 异常状态(0.缺卡,1.早退,2.缺卡)列表 */
/** 异常状态(0.缺卡,1.早退,2.迟到)列表 */
private List <Integer> errorStatusList;
/** 异常状态(0.缺卡,1.早退,2.缺卡)排除列表 */
/** 异常状态(0.缺卡,1.早退,2.迟到)排除列表 */
private List <Integer> errorStatusNotList;
/** 开始 处理状态(0.未处理,1.已处理) */
......@@ -241,6 +241,26 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
/** 结束 更新时间 */
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) */
private List<AttendanceRecordErrorQuery> orConditionList;
......@@ -1088,7 +1108,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 获取 开始 异常状态(0.缺卡,1.早退,2.缺卡)
* 获取 开始 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusStart
*/
public Integer getErrorStatusStart(){
......@@ -1096,7 +1116,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 开始 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 开始 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusStart
*/
public void setErrorStatusStart(Integer errorStatusStart){
......@@ -1104,7 +1124,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 获取 结束 异常状态(0.缺卡,1.早退,2.缺卡)
* 获取 结束 异常状态(0.缺卡,1.早退,2.迟到)
* @return $errorStatusEnd
*/
public Integer getErrorStatusEnd(){
......@@ -1112,7 +1132,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 结束 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 结束 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusEnd
*/
public void setErrorStatusEnd(Integer errorStatusEnd){
......@@ -1120,7 +1140,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 获取 增加 异常状态(0.缺卡,1.早退,2.缺卡)
* 获取 增加 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusIncrement
*/
public Integer getErrorStatusIncrement(){
......@@ -1128,7 +1148,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 增加 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 增加 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusIncrement
*/
public void setErrorStatusIncrement(Integer errorStatusIncrement){
......@@ -1136,7 +1156,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 获取 异常状态(0.缺卡,1.早退,2.缺卡)
* 获取 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusList
*/
public List<Integer> getErrorStatusList(){
......@@ -1144,7 +1164,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusList
*/
public void setErrorStatusList(List<Integer> errorStatusList){
......@@ -1152,7 +1172,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 获取 异常状态(0.缺卡,1.早退,2.缺卡)
* 获取 异常状态(0.缺卡,1.早退,2.迟到)
* @return errorStatusNotList
*/
public List<Integer> getErrorStatusNotList(){
......@@ -1160,7 +1180,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusNotList
*/
public void setErrorStatusNotList(List<Integer> errorStatusNotList){
......@@ -1539,6 +1559,119 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 开始 所属大厅
* @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
......@@ -2001,7 +2134,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatus
*/
public AttendanceRecordErrorQuery errorStatus(Integer errorStatus){
......@@ -2010,7 +2143,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 开始 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 开始 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusStart
*/
public AttendanceRecordErrorQuery errorStatusStart(Integer errorStatusStart){
......@@ -2019,7 +2152,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 结束 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 结束 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusEnd
*/
public AttendanceRecordErrorQuery errorStatusEnd(Integer errorStatusEnd){
......@@ -2028,7 +2161,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 增加 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 增加 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusIncrement
*/
public AttendanceRecordErrorQuery errorStatusIncrement(Integer errorStatusIncrement){
......@@ -2037,7 +2170,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusList
*/
public AttendanceRecordErrorQuery errorStatusList(List<Integer> errorStatusList){
......@@ -2046,7 +2179,7 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 异常状态(0.缺卡,1.早退,2.缺卡)
* 设置 异常状态(0.缺卡,1.早退,2.迟到)
* @param errorStatusNotList
*/
public AttendanceRecordErrorQuery errorStatusNotList(List<Integer> errorStatusNotList){
......@@ -2256,6 +2389,79 @@ public class AttendanceRecordErrorQuery extends AttendanceRecordErrorEntity {
}
/**
* 设置 所属大厅
* @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)
* @return orConditionList
......
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;
import java.util.Date;
import java.util.List;
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.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -11,7 +14,7 @@ import lombok.Data;
* 基础考勤打卡记录汇总信息实体对象
*
* @author zxfei
* @date 2023-07-18
* @date 2024-01-11
*/
@Data
public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
......@@ -38,7 +41,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
/**
* 所属部门名称
*/
@Excel(name = "所属部门")
@Excel(name = "所属部门名称")
private String deptName;
/**
* 职位ID
......@@ -99,6 +102,15 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
* 打卡结果(0.否,1.是)
*/
private Integer punchResult;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "所属大厅")
private String salaName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -116,43 +128,26 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
}
public void initAttrValue(){
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.deptId = 0L;
this.deptName = "";
this.positionId = 0L;
this.positionName = "";
this.attendanceGroupId = 0L;
this.attendanceGroupName = "";
this.shiftsId = 0L;
this.shiftsName = "";
this.attendanceDate = null;
this.attendanceAddress = "";
this.eventSource = "";
this.remark = "";
this.signInResult = 0;
this.signOutResult = 0;
this.attendType = "";
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;
* 基础考勤打卡记录汇总信息查询对象
*
* @author zxfei
* @date 2023-07-18
* @date 2024-01-11
*/
public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity {
/** 开始 序号，主键，自增长 */
......@@ -243,6 +243,26 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity {
/** 打卡结果(0.否,1.是)排除列表 */
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) */
private List<AttendanceRecordHikQuery> orConditionList;
......@@ -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
......@@ -2345,6 +2478,79 @@ public class AttendanceRecordHikQuery extends AttendanceRecordHikEntity {
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)
* @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;
* 考勤打卡记录信息查询对象
*
* @author zxfei
* @date 2023-08-03
* @date 2024-01-11
*/
public class AttendanceRecordQuery extends AttendanceRecordEntity {
/** 开始 序号，主键，自增长 */
......@@ -233,6 +233,26 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity {
/** 班次名称排除列表 */
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) */
private List<AttendanceRecordQuery> orConditionList;
......@@ -1484,6 +1504,119 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity {
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
......@@ -2233,6 +2366,79 @@ public class AttendanceRecordQuery extends AttendanceRecordEntity {
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)
* @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 {
*/
@Excel(name = "陪产假")
private BigDecimal paternityLeaveDays;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
@Excel(name = "所属大厅")
private String salaName;
@Override
public int hashCode() {
......@@ -349,6 +358,10 @@ public class AttendanceStatEntity extends AttendanceStatVo {
this.morningTimes = 0;
this.afternoonTimes = 0;
this.salaId = null;
this.salaName = "";
}
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 {
/** 下午缺卡次数排除列表 */
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) */
private List<AttendanceStatQuery> orConditionList;
......@@ -4406,6 +4427,118 @@ public class AttendanceStatQuery extends AttendanceStatEntity {
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 {
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)
* @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 {
* 离职时间
*/
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
attendanceRecordEntity.setStaffName(item.getStaffName());
attendanceRecordEntity.setDeptId(item.getDeptId());
attendanceRecordEntity.setDeptName(item.getDeptName());
attendanceRecordEntity.setSalaId(item.getSalaId());
attendanceRecordEntity.setSalaName(item.getSalaName());
attendanceRecordEntity.setPositionId(item.getPositionId());
attendanceRecordEntity.setPositionName(item.getPositionName());
attendanceRecordEntity.setWorkNum(item.getWorkNum());
......@@ -311,6 +313,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
attendanceRecordEntity.setStaffName(item.getStaffName());
attendanceRecordEntity.setDeptId(item.getDeptId());
attendanceRecordEntity.setDeptName(item.getDeptName());
attendanceRecordEntity.setSalaId(item.getSalaId());
attendanceRecordEntity.setSalaName(item.getSalaName());
attendanceRecordEntity.setPositionId(item.getPositionId());
attendanceRecordEntity.setPositionName(item.getPositionName());
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
attendanceStatEntity.setStaffName(item.getStaffName());
attendanceStatEntity.setDeptId(item.getDeptId());
attendanceStatEntity.setDeptName(item.getDeptName());
attendanceStatEntity.setSalaId(item.getSalaId());
attendanceStatEntity.setSalaName(item.getSalaName());
attendanceStatEntity.setPhoneNumer(item.getPhoneNumber());
attendanceStatEntity.setYear(item.getYear());
attendanceStatEntity.setMonth(item.getMonth());
......@@ -283,6 +285,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
attendanceStatEntity.setStaffName(item.getStaffName());
attendanceStatEntity.setDeptId(item.getDeptId());
attendanceStatEntity.setDeptName(item.getDeptName());
attendanceStatEntity.setSalaId(item.getSalaId());
attendanceStatEntity.setSalaName(item.getSalaName());
attendanceStatEntity.setPhoneNumer(item.getPhoneNumber());
attendanceStatEntity.setYear(item.getYear());
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
item.setStaffId(staffEntity.getId());
item.setDeptId(deptId);
item.setDeptName(deptName);
item.setSalaId(staffEntity.getSalaId());
item.setSalaName(staffEntity.getSalaName());
item.setPositionId(staffEntity.getPositionId());
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> {
* */
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;
import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.StaffQuery;
import com.mortals.xhx.module.staff.service.StaffService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -269,4 +270,25 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
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;
import java.util.Date;
import java.util.List;
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.mortals.framework.annotation.Excel;
import com.mortals.framework.annotation.desensitization.IdCardDesensitize;
......@@ -14,7 +17,7 @@ import lombok.Data;
* 员工基本信息实体对象
*
* @author zxfei
* @date 2023-07-18
* @date 2024-01-11
*/
@Data
public class StaffEntity extends StaffVo {
......@@ -28,7 +31,7 @@ public class StaffEntity extends StaffVo {
/**
* 性别(1.男,2.女)
*/
@Excel(name = "性别", readConverterExp = "1=男,2.女")
@Excel(name = "性别", readConverterExp = "1=男,2=女")
private Integer gender;
/**
* 出生日期
......@@ -140,7 +143,6 @@ public class StaffEntity extends StaffVo {
* 最后登录时间
*/
private Date lastLoginTime;
/**
* 考勤授权(0.不启用,1.启用)
*/
......@@ -165,7 +167,14 @@ public class StaffEntity extends StaffVo {
* 其他授权(0.不启用,1.启用)
*/
private Integer otherCheck;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -183,71 +192,40 @@ public class StaffEntity extends StaffVo {
}
public void initAttrValue(){
this.name = "";
this.gender = 1;
this.birthday = null;
this.photoPath = "";
this.phoneNumber = "";
this.idCard = "";
this.workNum = "";
this.politicalstatus = 1;
this.deptId = null;
this.deptName = "";
this.positionId = null;
this.positionName = "";
this.staffType = 1;
this.status = 1;
this.source = 1;
this.registerPath = "";
this.entryDate = null;
this.regularDate = null;
this.leaveDate = null;
this.remark = "";
this.remarkId = "";
this.picUri = "";
this.serverIndexCode = "";
this.score = new BigDecimal(0);
this.score = BigDecimal.ZERO;
this.loginName = "";
this.loginPwd = "";
this.lastLoginTime = null;
this.attendCheck = 0;
this.complainCheck = 0;
this.reviewCheck = 0;
this.goworkCheck = 0;
this.effectCheck = 0;
this.otherCheck = 0;
this.attendCheck = 1;
this.complainCheck = 1;
this.reviewCheck = 1;
this.goworkCheck = 1;
this.effectCheck = 1;
this.otherCheck = 1;
this.salaId = null;
this.salaName = "";
}
}
\ 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;
* 员工基本信息查询对象
*
* @author zxfei
* @date 2023-07-07
* @date 2024-01-11
*/
public class StaffQuery extends StaffEntity {
/** 开始 序号，主键，自增长 */
......@@ -378,6 +378,26 @@ public class StaffQuery extends StaffEntity {
/** 其他授权(0.不启用,1.启用)排除列表 */
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) */
private List<StaffQuery> orConditionList;
......@@ -2434,6 +2454,120 @@ public class StaffQuery extends StaffEntity {
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
......@@ -3300,6 +3434,7 @@ public class StaffQuery extends StaffEntity {
return this;
}
/**
* 设置 考勤授权(0.不启用,1.启用)
* @param attendCheck
......@@ -3624,6 +3759,79 @@ public class StaffQuery extends StaffEntity {
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)
* @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> {
*/
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
staffEntity.initAttrValue();
if (!ObjectUtils.isEmpty(deptEntity)) {
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.setRemarkId(personInfo.getPersonId());
......@@ -185,6 +196,17 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
//更新
if (!ObjectUtils.isEmpty(deptEntity)) {
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.setRemarkId(personInfo.getPersonId());
......@@ -437,6 +459,27 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
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) {
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;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
......@@ -252,5 +253,26 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
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 @@
<result property="auditTime" column="auditTime" />
<result property="processStatus" column="processStatus" />
<result property="sourceDingTime" column="sourceDingTime" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap>
......@@ -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')))">
a.sourceDingTime,
</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>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceLeaveRecordEntity" useGeneratedKeys="true" keyProperty="id">
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
(#{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 id="insertBatch" parameterType="paramDto">
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
<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>
</insert>
......@@ -244,6 +252,15 @@
<if test="(colPickMode==0 and data.containsKey('sourceDingTime')) or (colPickMode==1 and !data.containsKey('sourceDingTime'))">
a.sourceDingTime=#{data.sourceDingTime},
</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 suffixOverrides="where" suffix="">
where
......@@ -476,6 +493,25 @@
</if>
</foreach>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1162,18 +1198,220 @@
#{item}
</foreach>
</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 id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
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="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
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="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1305,8 +1543,20 @@
<if test='orderCol.sourceDingTime != null and "DESC".equalsIgnoreCase(orderCol.sourceDingTime)'>DESC</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>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordErrorMapper.xml
View file @ a4eca9a8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.attendance.dao.ibatis.AttendanceRecordErrorDaoImpl">
<!-- 字段和属性映射 -->
......@@ -30,6 +30,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap>
......@@ -112,23 +114,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('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>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceRecordErrorEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_attendance_record_error
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,goOffDateTime,errorDateTime,actualAttendanceDateTime,operDateTime,opertor,errorStatus,processStatus,processResult,remark,createUserId,createTime,updateUserId,updateTime)
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,goOffDateTime,errorDateTime,actualAttendanceDateTime,operDateTime,opertor,errorStatus,processStatus,processResult,remark,createUserId,createTime,updateUserId,updateTime,salaId,salaName)
VALUES
(#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{positionId},#{positionName},#{attendanceGroupId},#{attendanceGroupName},#{shiftsId},#{shiftsName},#{goOffDateTime},#{errorDateTime},#{actualAttendanceDateTime},#{operDateTime},#{opertor},#{errorStatus},#{processStatus},#{processResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{positionId},#{positionName},#{attendanceGroupId},#{attendanceGroupName},#{shiftsId},#{shiftsName},#{goOffDateTime},#{errorDateTime},#{actualAttendanceDateTime},#{operDateTime},#{opertor},#{errorStatus},#{processStatus},#{processResult},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{salaId},#{salaName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_attendance_record_error
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,goOffDateTime,errorDateTime,actualAttendanceDateTime,operDateTime,opertor,errorStatus,processStatus,processResult,remark,createUserId,createTime,updateUserId,updateTime)
(staffId,staffName,workNum,deptId,deptName,positionId,positionName,attendanceGroupId,attendanceGroupName,shiftsId,shiftsName,goOffDateTime,errorDateTime,actualAttendanceDateTime,operDateTime,opertor,errorStatus,processStatus,processResult,remark,createUserId,createTime,updateUserId,updateTime,salaId,salaName)
VALUES
<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.goOffDateTime},#{item.errorDateTime},#{item.actualAttendanceDateTime},#{item.operDateTime},#{item.opertor},#{item.errorStatus},#{item.processStatus},#{item.processResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.shiftsId},#{item.shiftsName},#{item.goOffDateTime},#{item.errorDateTime},#{item.actualAttendanceDateTime},#{item.operDateTime},#{item.opertor},#{item.errorStatus},#{item.processStatus},#{item.processResult},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.salaId},#{item.salaName})
</foreach>
</insert>
......@@ -237,6 +245,15 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('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 suffixOverrides="where" suffix="">
where
......@@ -462,6 +479,25 @@
</if>
</foreach>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -586,13 +622,13 @@
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -613,13 +649,13 @@
${_conditionType_} a.staffId is null
</if>
</if>
<if test="conditionParamRef.containsKey('staffIdList')">
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
${_conditionType_} a.staffId in
<foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffIdNotList')">
<if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
${_conditionType_} a.staffId not in
<foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -641,13 +677,13 @@
${_conditionType_} a.staffName is null
</if>
</if>
<if test="conditionParamRef.containsKey('staffNameList')">
<if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
${_conditionType_} a.staffName in
<foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffNameNotList')">
<if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
${_conditionType_} a.staffName not in
<foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -662,13 +698,13 @@
${_conditionType_} a.workNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('workNumList')">
<if test="conditionParamRef.containsKey('workNumList') and conditionParamRef.workNumList.size() > 0">
${_conditionType_} a.workNum in
<foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workNumNotList')">
<if test="conditionParamRef.containsKey('workNumNotList') and conditionParamRef.workNumNotList.size() > 0">
${_conditionType_} a.workNum not in
<foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -682,13 +718,13 @@
${_conditionType_} a.deptId is null
</if>
</if>
<if test="conditionParamRef.containsKey('deptIdList')">
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
${_conditionType_} a.deptId in
<foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdNotList')">
<if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -710,13 +746,13 @@
${_conditionType_} a.deptName is null
</if>
</if>
<if test="conditionParamRef.containsKey('deptNameList')">
<if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList')">
<if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -730,13 +766,13 @@
${_conditionType_} a.positionId is null
</if>
</if>
<if test="conditionParamRef.containsKey('positionIdList')">
<if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
${_conditionType_} a.positionId in
<foreach collection="conditionParamRef.positionIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('positionIdNotList')">
<if test="conditionParamRef.containsKey('positionIdNotList') and conditionParamRef.positionIdNotList.size() > 0">
${_conditionType_} a.positionId not in
<foreach collection="conditionParamRef.positionIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -758,13 +794,13 @@
${_conditionType_} a.positionName is null
</if>
</if>
<if test="conditionParamRef.containsKey('positionNameList')">
<if test="conditionParamRef.containsKey('positionNameList') and conditionParamRef.positionNameList.size() > 0">
${_conditionType_} a.positionName in
<foreach collection="conditionParamRef.positionNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('positionNameNotList')">
<if test="conditionParamRef.containsKey('positionNameNotList') and conditionParamRef.positionNameNotList.size() > 0">
${_conditionType_} a.positionName not in
<foreach collection="conditionParamRef.positionNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -778,13 +814,13 @@
${_conditionType_} a.attendanceGroupId is null
</if>
</if>
<if test="conditionParamRef.containsKey('attendanceGroupIdList')">
<if test="conditionParamRef.containsKey('attendanceGroupIdList') and conditionParamRef.attendanceGroupIdList.size() > 0">
${_conditionType_} a.attendanceGroupId in
<foreach collection="conditionParamRef.attendanceGroupIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('attendanceGroupIdNotList')">
<if test="conditionParamRef.containsKey('attendanceGroupIdNotList') and conditionParamRef.attendanceGroupIdNotList.size() > 0">
${_conditionType_} a.attendanceGroupId not in
<foreach collection="conditionParamRef.attendanceGroupIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -806,13 +842,13 @@
${_conditionType_} a.attendanceGroupName is null
</if>
</if>
<if test="conditionParamRef.containsKey('attendanceGroupNameList')">
<if test="conditionParamRef.containsKey('attendanceGroupNameList') and conditionParamRef.attendanceGroupNameList.size() > 0">
${_conditionType_} a.attendanceGroupName in
<foreach collection="conditionParamRef.attendanceGroupNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('attendanceGroupNameNotList')">
<if test="conditionParamRef.containsKey('attendanceGroupNameNotList') and conditionParamRef.attendanceGroupNameNotList.size() > 0">
${_conditionType_} a.attendanceGroupName not in
<foreach collection="conditionParamRef.attendanceGroupNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -826,13 +862,13 @@
${_conditionType_} a.shiftsId is null
</if>
</if>
<if test="conditionParamRef.containsKey('shiftsIdList')">
<if test="conditionParamRef.containsKey('shiftsIdList') and conditionParamRef.shiftsIdList.size() > 0">
${_conditionType_} a.shiftsId in
<foreach collection="conditionParamRef.shiftsIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shiftsIdNotList')">
<if test="conditionParamRef.containsKey('shiftsIdNotList') and conditionParamRef.shiftsIdNotList.size() > 0">
${_conditionType_} a.shiftsId not in
<foreach collection="conditionParamRef.shiftsIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -854,13 +890,13 @@
${_conditionType_} a.shiftsName is null
</if>
</if>
<if test="conditionParamRef.containsKey('shiftsNameList')">
<if test="conditionParamRef.containsKey('shiftsNameList') and conditionParamRef.shiftsNameList.size() > 0">
${_conditionType_} a.shiftsName in
<foreach collection="conditionParamRef.shiftsNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shiftsNameNotList')">
<if test="conditionParamRef.containsKey('shiftsNameNotList') and conditionParamRef.shiftsNameNotList.size() > 0">
${_conditionType_} a.shiftsName not in
<foreach collection="conditionParamRef.shiftsNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -935,13 +971,13 @@
${_conditionType_} a.opertor is null
</if>
</if>
<if test="conditionParamRef.containsKey('opertorList')">
<if test="conditionParamRef.containsKey('opertorList') and conditionParamRef.opertorList.size() > 0">
${_conditionType_} a.opertor in
<foreach collection="conditionParamRef.opertorList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('opertorNotList')">
<if test="conditionParamRef.containsKey('opertorNotList') and conditionParamRef.opertorNotList.size() > 0">
${_conditionType_} a.opertor not in
<foreach collection="conditionParamRef.opertorNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -955,13 +991,13 @@
${_conditionType_} a.errorStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('errorStatusList')">
<if test="conditionParamRef.containsKey('errorStatusList') and conditionParamRef.errorStatusList.size() > 0">
${_conditionType_} a.errorStatus in
<foreach collection="conditionParamRef.errorStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('errorStatusNotList')">
<if test="conditionParamRef.containsKey('errorStatusNotList') and conditionParamRef.errorStatusNotList.size() > 0">
${_conditionType_} a.errorStatus not in
<foreach collection="conditionParamRef.errorStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -982,13 +1018,13 @@
${_conditionType_} a.processStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('processStatusList')">
<if test="conditionParamRef.containsKey('processStatusList') and conditionParamRef.processStatusList.size() > 0">
${_conditionType_} a.processStatus in
<foreach collection="conditionParamRef.processStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('processStatusNotList')">
<if test="conditionParamRef.containsKey('processStatusNotList') and conditionParamRef.processStatusNotList.size() > 0">
${_conditionType_} a.processStatus not in
<foreach collection="conditionParamRef.processStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -1010,13 +1046,13 @@
${_conditionType_} a.processResult is null
</if>
</if>
<if test="conditionParamRef.containsKey('processResultList')">
<if test="conditionParamRef.containsKey('processResultList') and conditionParamRef.processResultList.size() > 0">
${_conditionType_} a.processResult in
<foreach collection="conditionParamRef.processResultList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('processResultNotList')">
<if test="conditionParamRef.containsKey('processResultNotList') and conditionParamRef.processResultNotList.size() > 0">
${_conditionType_} a.processResult not in
<foreach collection="conditionParamRef.processResultNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -1031,13 +1067,13 @@
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
<if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remarkNotList')">
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -1051,13 +1087,13 @@
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -1093,13 +1129,13 @@
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')">
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
......@@ -1127,18 +1163,220 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('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 id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
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('errorStatusList') and conditionParamRef.errorStatusList.size() > 0">
field(a.errorStatus,
<foreach collection="conditionParamRef.errorStatusList" 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('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('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="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
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('errorStatusList') and conditionParamRef.errorStatusList.size() > 0">
field(a.errorStatus,
<foreach collection="conditionParamRef.errorStatusList" 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('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('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="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1265,8 +1503,20 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</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>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......@@ -1278,7 +1528,4 @@
</trim>
</if>
</sql>
<select id="errorAttendance" resultType="integer">
select count(1) count from mortals_xhx_attendance_record_error where staffId =#{id} group by errorStatus
</select>
</mapper>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordHikMapper.xml
View file @ a4eca9a8
......@@ -29,6 +29,8 @@
<result property="signOutResult" column="signOutResult" />
<result property="attendType" column="attendType" />
<result property="punchResult" column="punchResult" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap>
......@@ -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')))">
a.punchResult,
</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>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceRecordHikEntity" useGeneratedKeys="true" keyProperty="id">
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
(#{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 id="insertBatch" parameterType="paramDto">
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
<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>
</insert>
......@@ -233,6 +241,15 @@
<if test="(colPickMode==0 and data.containsKey('punchResultIncrement')) or (colPickMode==1 and !data.containsKey('punchResultIncrement'))">
a.punchResult=ifnull(a.punchResult,0) + #{data.punchResultIncrement},
</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 suffixOverrides="where" suffix="">
where
......@@ -456,6 +473,25 @@
</choose>
</foreach>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1124,18 +1160,234 @@
${_conditionType_} a.punchResult <![CDATA[ <= ]]> #{${_conditionParam_}.punchResultEnd}
</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 id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
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="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
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="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1257,8 +1509,20 @@
<if test='orderCol.punchResult != null and "DESC".equalsIgnoreCase(orderCol.punchResult)'>DESC</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>
</if>
</sql>
<sql id="_group_by_">
<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 @@
<result property="punchResult" column="punchResult" />
<result property="classId" column="classId" />
<result property="className" column="className" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap>
......@@ -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')))">
a.className,
</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>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceRecordEntity" useGeneratedKeys="true" keyProperty="id">
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
(#{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 id="insertBatch" parameterType="paramDto">
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
<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>
</insert>
......@@ -219,6 +227,15 @@
<if test="(colPickMode==0 and data.containsKey('className')) or (colPickMode==1 and !data.containsKey('className'))">
a.className=#{data.className},
</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 suffixOverrides="where" suffix="">
where
......@@ -428,6 +445,25 @@
</if>
</foreach>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1054,18 +1090,234 @@
#{item}
</foreach>
</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 id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
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="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
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="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1177,8 +1429,20 @@
<if test='orderCol.className != null and "DESC".equalsIgnoreCase(orderCol.className)'>DESC</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>
</if>
</sql>
<sql id="_group_by_">
<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 @@
<result property="goTimes" column="goTimes" />
<result property="morningTimes" column="morningTimes" />
<result property="afternoonTimes" column="afternoonTimes" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap>
......@@ -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')))">
a.afternoonTimes,
</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>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AttendanceStatEntity" useGeneratedKeys="true" keyProperty="id">
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
(#{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 id="insertBatch" parameterType="paramDto">
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
<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>
</insert>
......@@ -511,6 +519,15 @@
<if test="(colPickMode==0 and data.containsKey('afternoonTimesIncrement')) or (colPickMode==1 and !data.containsKey('afternoonTimesIncrement'))">
a.afternoonTimes=ifnull(a.afternoonTimes,0) + #{data.afternoonTimesIncrement},
</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 suffixOverrides="where" suffix="">
where
......@@ -1076,6 +1093,25 @@
</choose>
</foreach>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -2488,18 +2524,682 @@
${_conditionType_} a.afternoonTimes <![CDATA[ <= ]]> #{${_conditionParam_}.afternoonTimesEnd}
</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 id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
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="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
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="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -2751,8 +3451,20 @@
<if test='orderCol.afternoonTimes != null and "DESC".equalsIgnoreCase(orderCol.afternoonTimes)'>DESC</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>
</if>
</sql>
<sql id="_group_by_">
<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 @@
s.workNum,
s.deptId,
s.deptName,
s.salaId,
s.salaName,
s.`status`,
s.leaveDate,
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 @@
<result property="goworkCheck" column="goworkCheck" />
<result property="effectCheck" column="effectCheck" />
<result property="otherCheck" column="otherCheck" />
<result property="salaId" column="salaId" />
<result property="salaName" column="salaName" />
</resultMap>
......@@ -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')))">
a.otherCheck,
</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>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="StaffEntity" useGeneratedKeys="true" keyProperty="id">
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
(#{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 id="insertBatch" parameterType="paramDto">
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
<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>
</insert>
......@@ -348,6 +357,15 @@
<if test="(colPickMode==0 and data.containsKey('otherCheckIncrement')) or (colPickMode==1 and !data.containsKey('otherCheckIncrement'))">
a.otherCheck=ifnull(a.otherCheck,0) + #{data.otherCheckIncrement},
</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 suffixOverrides="where" suffix="">
where
......@@ -699,6 +717,25 @@
</choose>
</foreach>
</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>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1672,18 +1709,319 @@
<if test="conditionParamRef.containsKey('otherCheckEnd') and conditionParamRef.otherCheckEnd != null">
${_conditionType_} a.otherCheck <![CDATA[ <= ]]> #{${_conditionParam_}.otherCheckEnd}
</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 id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
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="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
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="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1875,8 +2213,20 @@
<if test='orderCol.otherCheck != null and "DESC".equalsIgnoreCase(orderCol.otherCheck)'>DESC</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>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
db/add.sql
View file @ a4eca9a8
......@@ -897,3 +897,30 @@ ALTER TABLE `mortals_xhx_staff` ADD COLUMN `attendCheck` TINYINT (2) DEFAULT '0'
ADD COLUMN `goworkCheck` 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.启用)';
-- ----------
-- 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