Skip to content

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

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

parent 93640b69
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5500 additions and 2335 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java
View file @ a4eca9a8
......@@ -97,6 +97,8 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
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/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/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
db/add.sql
View file @ a4eca9a8
This diff is collapsed.
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