Skip to content

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

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

parent 93640b69
Expand all 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/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/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`,
......
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