Commit dbc7755d authored by 赵啸非's avatar 赵啸非

修改核查状态

parent 04c44aa9
......@@ -31,7 +31,7 @@ export default {
<i style="font-size:16px;color:#409EFF" class={data.icon}></i>
<span style="padding-left: 2px;font-size:14px">{node.label}</span>
<span style="padding-left: 2px;font-size:14px;margin-left:20px">
({data.personList?data.personList.length:0})
({data.personNum?data.personNum:0})
</span>
</span>
)
......@@ -43,12 +43,6 @@ export default {
return;
}
resolve(data.result);
// this.$post("/area/getListByParentId", {
// parentId: node.data.id,
// }).then(({ data }) => {
// resolve(data.result);
// });
},
refreshNodeBy(id) {
......@@ -65,6 +59,7 @@ export default {
treeProps: {
id: "id",
label: "label",
personNum: "personNum",
areaCode:"areaCode",
type: "type",
isLeaf: "isLeaf",
......
......@@ -297,7 +297,7 @@
{type: "index",label: "序号",width: 50},
{label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"},
// {label: "部门", prop: "deptName"},
{label: "部门", prop: "deptName"},
// {label: "考勤组", prop: "attendanceGroupName"},
// {label: "职位", prop: "positionName"},
// {label: "班次", prop: "shiftsName"},
......@@ -309,7 +309,7 @@
// width: 240,
// formatter: row => {
// return (
// <table-buttons noAdd noDel noEdit noView row={row}
// <table-buttons noAdd noDel noEdit noView row={row}
// onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
// )
// }
......@@ -342,4 +342,4 @@
.details{
cursor: pointer;
}
</style>
\ No newline at end of file
</style>
......@@ -254,7 +254,6 @@ export default {
},
handleNodeClick(node) {
console.log(node, 123123);
this.currentNode = node;
this.query = { deptId: node.id };
this.getData();
......
......@@ -18,8 +18,8 @@ module.exports = {
proxy: {
'/attendance': {
//target: 'http://192.168.0.98:11039',
target: 'http://112.19.80.237:11039',
// target: 'http://localhost:17500',
//target: 'http://112.19.80.237:11039',
target: 'http://localhost:17500',
changeOrigin: true,
secure: false,
cookieDomainRewrite: 'localhost',
......
......@@ -214,7 +214,6 @@ public class TestController {
deptEntity.setPersonNum(count.intValue());
deptService.update(deptEntity);
}
});
......
package com.mortals.xhx.common.utils;
import cn.hutool.core.util.ReflectUtil;
import com.mortals.xhx.common.code.AuditStatusEnum;
import com.mortals.xhx.common.code.CheckResultAddEnum;
import com.mortals.xhx.common.code.CheckResultSubEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
public class AuditUtil {
public static void audit(Object obj) {
String checkResult = (String) ReflectUtil.getFieldValue(obj, "checkResult");
Integer subAddType = (Integer) ReflectUtil.getFieldValue(obj, "subAddType");
if (SubAddTypeEnum.增加.getValue() == subAddType) {
if (CheckResultAddEnum.核查不加分.getValue().equals(checkResult)) {
ReflectUtil.setFieldValue(obj, "auditStatus", AuditStatusEnum.拒绝.getValue());
} else if (CheckResultAddEnum.核查加分.getValue().equals(checkResult)) {
ReflectUtil.setFieldValue(obj, "auditStatus", AuditStatusEnum.通过.getValue());
} else {
ReflectUtil.setFieldValue(obj, "auditStatus", AuditStatusEnum.通过.getValue());
}
} else if (SubAddTypeEnum.扣除.getValue() == subAddType) {
if (CheckResultSubEnum.核查不扣分.getValue().equals(checkResult)) {
ReflectUtil.setFieldValue(obj, "auditStatus", AuditStatusEnum.拒绝.getValue());
} else if (CheckResultSubEnum.核查扣分.getValue().equals(checkResult)) {
ReflectUtil.setFieldValue(obj, "auditStatus", AuditStatusEnum.通过.getValue());
} else {
ReflectUtil.setFieldValue(obj, "auditStatus", AuditStatusEnum.通过.getValue());
}
} else {
ReflectUtil.setFieldValue(obj, "auditStatus", AuditStatusEnum.通过.getValue());
}
}
}
......@@ -51,7 +51,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
public void excuteTask(ITask task) throws AppException {
syncDoorEvents();
calculateAttendByDay();
//calculateAttendByDay();
}
private void calculateAttendByDay() {
......
......@@ -51,7 +51,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
public void excuteTask(ITask task) throws AppException {
syncDoorEvents();
calculateAttendByDay();
//calculateAttendByDay();
}
private void calculateAttendByDay() {
......@@ -87,7 +87,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
doorEventReq.setEventTypes(eventTypes);
// 获取当天的开始时间
//Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
Date todayStart = DateUtil.beginOfDay(new Date());
Date todayStart = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(),-1));
// 获取当天的结束时间
Date todayEnd = DateUtil.endOfDay(new Date());
doorEventReq.setStartTime(todayStart);
......
package com.mortals.xhx.module.attendance.service.impl;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
import com.mortals.xhx.module.attendance.model.AttendanceClassEntity;
import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
import com.mortals.xhx.module.attendance.service.AttendanceClassService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
......@@ -6,14 +14,54 @@ import com.mortals.framework.model.Context;
import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity;
import com.mortals.xhx.module.attendance.service.AttendanceRecordErrorService;
import org.springframework.util.ObjectUtils;
import java.util.List;
/**
* AttendanceRecordErrorService
* 考勤打卡记录异常信息 service实现
*
* @author zxfei
* @date 2023-04-08
*/
* AttendanceRecordErrorService
* 考勤打卡记录异常信息 service实现
*
* @author zxfei
* @date 2023-04-08
*/
@Service("attendanceRecordErrorService")
public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<AttendanceRecordErrorDao, AttendanceRecordErrorEntity, Long> implements AttendanceRecordErrorService {
@Autowired
private AttendanceClassDetailService classDetailService;
@Autowired
private AttendanceClassService attendanceClassService;
@Override
protected void findAfter(AttendanceRecordErrorEntity params, PageInfo pageInfo, Context context, List<AttendanceRecordErrorEntity> list) throws AppException {
list.forEach(item -> {
AttendanceClassEntity attendanceClassEntity = attendanceClassService.get(item.getShiftsId(), context);
if(!ObjectUtils.isEmpty(attendanceClassEntity)&&!ObjectUtils.isEmpty(attendanceClassEntity.getAttendanceClassDetailList())){
for (AttendanceClassDetailEntity attendanceClassDetailEntity : attendanceClassEntity.getAttendanceClassDetailList()) {
if (!ObjectUtils.isEmpty(attendanceClassDetailEntity)) {
String str = DateUtil.formatTime(item.getGoOffDateTime());
String goStr = DateUtil.formatTime(attendanceClassDetailEntity.getGoWorkDate());
String offStr = DateUtil.formatTime(attendanceClassDetailEntity.getOffWorkDate());
if (!ObjectUtils.isEmpty(str)&&str.equals(goStr)) {
item.setGoOrOff("上班");
}
if (!ObjectUtils.isEmpty(str)&&str.equals(offStr)) {
item.setGoOrOff("下班");
}
if (ObjectUtils.isEmpty(item.getGoOrOff())) {
item.setGoOrOff("上班");
}
}
}
}else {
item.setGoOrOff("上班");
}
});
}
}
\ No newline at end of file
......@@ -104,7 +104,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
attendanceRecordEntity.setPositionName(item.getPositionName());
attendanceRecordEntity.setWorkNum(item.getWorkNum());
attendanceRecordEntity.setAttendanceDate(item.getAttendanceDate());
attendanceRecordEntity.setCreateTime(new Date());
attendanceRecordEntity.setCreateTime(item.getAttendanceDate());
attendanceRecordEntity.setCreateUserId(this.getContextUserId(context));
//获取考勤打卡时间
Date attendanceDate = item.getAttendanceDate();
......@@ -128,80 +128,15 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
}
}
}
//处理异常打卡,所以异常打卡的 都新增一条记录
List<AttendanceRecordErrorEntity> errorEntityList = new ArrayList<>();
for (AttendanceRecordDetailEntity recordDetailEntity : detailEntityList) {
//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//SimpleDateFormat sdft = new SimpleDateFormat("HH:mm:ss");
Integer goWorkResult = recordDetailEntity.getGoWorkResult();
Integer offWorkResult = recordDetailEntity.getOffWorkResult();
//判断上班
if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
Date goWorkDate = attendanceClassDetailService.selectOne(new AttendanceClassDetailQuery().classId(recordDetailEntity.getShiftsId())).getGoWorkDate();
errorEntity.setGoOffDateTime(goWorkDate);
if (!ObjectUtils.isEmpty(recordDetailEntity.getGoWorkDate())) {
errorEntity.setErrorDateTime(recordDetailEntity.getGoWorkDate());
errorEntity.setActualAttendanceDateTime(recordDetailEntity.getGoWorkDate());
} else {
errorEntity.setErrorDateTime(goWorkDate);
}
if (GoWorkResultEnum.早退.getValue() == recordDetailEntity.getGoWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.早退.getValue());
}
if (GoWorkResultEnum.迟到.getValue() == recordDetailEntity.getGoWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.迟到.getValue());
}
if (GoWorkResultEnum.缺卡.getValue() == recordDetailEntity.getGoWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.缺卡.getValue());
}
errorEntity.setProcessStatus(YesNoEnum.NO.getValue());
errorEntity.setCreateTime(new Date());
errorEntity.setCreateUserId(this.getContextUserId(context));
errorEntityList.add(errorEntity);
}
//判断下班
if (OffWorkResultEnum.正常.getValue() != offWorkResult) {
AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
errorEntity.initAttrValue();
BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
/* Date offWorkDate = attendanceClassDetailService.selectOne(new AttendanceClassDetailQuery().classId(recordDetailEntity.getShiftsId())).getOffWorkDate();
errorEntity.setGoOffDateTime(offWorkDate);
if (!ObjectUtils.isEmpty(recordDetailEntity.getGoWorkDate())) {
errorEntity.setErrorDateTime(recordDetailEntity.getGoWorkDate());
errorEntity.setActualAttendanceDateTime(recordDetailEntity.getGoWorkDate());
} else {
errorEntity.setErrorDateTime(offWorkDate);
}*/
if (OffWorkResultEnum.缺卡.getValue() == recordDetailEntity.getOffWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.缺卡.getValue());
}
if (OffWorkResultEnum.早退.getValue() == recordDetailEntity.getOffWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.早退.getValue());
}
if (OffWorkResultEnum.迟到.getValue() == recordDetailEntity.getOffWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.迟到.getValue());
}
errorEntity.setProcessStatus(YesNoEnum.NO.getValue());
errorEntity.setCreateTime(new Date());
errorEntity.setCreateUserId(this.getContextUserId(context));
errorEntityList.add(errorEntity);
}
if (!ObjectUtils.isEmpty(detailEntityList)) {
AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(detailEntityList.get(0).getShiftsId(), context);
attendanceRecordEntity.setShiftsId(attendanceClassDetailEntity == null ? 0L : attendanceClassDetailEntity.getClassId());
attendanceRecordEntity.setShiftsName(attendanceClassDetailEntity == null ? "" : attendanceClassDetailEntity.getClassName());
}
//生成异常记录
genErrorAttendRecord(context, dateStr, attendanceRecordEntity, detailEntityList);
if (!ObjectUtils.isEmpty(detailEntityList)) {
if (!ObjectUtils.isEmpty(detailEntityList)) {
errorService.save(errorEntityList, context);
}
attendanceRecordEntity.setShiftsName(detailEntityList.get(0).getShiftsName());
attendanceRecordEntity.setShiftsId(detailEntityList.get(0).getShiftsId());
attendanceRecordEntity.setAttendanceRecordDetailList(detailEntityList);
//判断签到 只要存在一次正常打卡详细记录 就判断签到
for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
if (GoWorkResultEnum.正常.getValue() == detailEntity.getGoWorkResult() || GoWorkResultEnum.迟到.getValue() == detailEntity.getOffWorkResult()) {
......@@ -251,11 +186,264 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
attendanceRecordService.save(attendanceRecordEntity, context);
}
}
}
}
}
private void genErrorAttendRecord(Context context, String dateStr, AttendanceRecordEntity attendanceRecordEntity, List<AttendanceRecordDetailEntity> detailEntityList) {
//处理异常打卡,所以异常打卡的 都新增一条记录
List<AttendanceRecordErrorEntity> errorEntityList = new ArrayList<>();
for (AttendanceRecordDetailEntity recordDetailEntity : detailEntityList) {
Integer goWorkResult = recordDetailEntity.getGoWorkResult();
Integer offWorkResult = recordDetailEntity.getOffWorkResult();
//判断上班
AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(recordDetailEntity.getShiftsId());
if (ObjectUtils.isEmpty(attendanceClassDetailEntity)) continue;
AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
errorEntity.initAttrValue();
BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
errorEntity.setGoOffDateTime(errorEntity.getErrorDateTime());
errorEntity.setProcessStatus(YesNoEnum.NO.getValue());
errorEntity.setCreateTime(new Date());
errorEntity.setCreateUserId(this.getContextUserId(context));
//判断上班
if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
Date goWorkDate = attendanceClassDetailEntity.getGoWorkDate();
errorEntity.setGoOffDateTime(goWorkDate);
if (!ObjectUtils.isEmpty(recordDetailEntity.getGoWorkDate())) {
errorEntity.setErrorDateTime(recordDetailEntity.getGoWorkDate());
errorEntity.setActualAttendanceDateTime(recordDetailEntity.getGoWorkDate());
} else {
errorEntity.setErrorDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(goWorkDate)).toJdkDate());
}
if (GoWorkResultEnum.早退.getValue() == recordDetailEntity.getGoWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.早退.getValue());
}
if (GoWorkResultEnum.迟到.getValue() == recordDetailEntity.getGoWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.迟到.getValue());
}
if (GoWorkResultEnum.缺卡.getValue() == recordDetailEntity.getGoWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.缺卡.getValue());
}
errorEntityList.add(errorEntity);
}
//判断下班
if (OffWorkResultEnum.正常.getValue() != offWorkResult) {
Date offWorkDate = attendanceClassDetailEntity.getOffWorkDate();
errorEntity.setGoOffDateTime(offWorkDate);
if (!ObjectUtils.isEmpty(recordDetailEntity.getGoWorkDate())) {
errorEntity.setErrorDateTime(recordDetailEntity.getGoWorkDate());
errorEntity.setActualAttendanceDateTime(recordDetailEntity.getGoWorkDate());
} else {
errorEntity.setErrorDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(offWorkDate)).toJdkDate());
}
if (OffWorkResultEnum.缺卡.getValue() == recordDetailEntity.getOffWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.缺卡.getValue());
}
if (OffWorkResultEnum.早退.getValue() == recordDetailEntity.getOffWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.早退.getValue());
}
if (OffWorkResultEnum.迟到.getValue() == recordDetailEntity.getOffWorkResult()) {
errorEntity.setErrorStatus(ErrorStatusEnum.迟到.getValue());
}
errorEntityList.add(errorEntity);
}
}
if (!ObjectUtils.isEmpty(errorEntityList)) {
errorService.save(errorEntityList, context);
}
}
/* //map遍历.先把所有键取出来
private void checkAttendGroupByOne(AttendanceRecordEntity attendanceRecordEntity, List<AttendanceRecordDetailEntity> detailEntityList, Date attendanceDate, AttendanceGroupStaffEntity attendanceGroupStaffEntity, Context context) {
//查询考勤组
AttendanceGroupEntity attendanceGroupEntity = attendanceGroupService.get(attendanceGroupStaffEntity.getGroupId(), context);
attendanceRecordEntity.setAttendanceGroupId(attendanceGroupEntity == null ? 0L : attendanceGroupEntity.getId());
attendanceRecordEntity.setAttendanceGroupName(attendanceGroupEntity == null ? "" : attendanceGroupEntity.getGroupName());
//查询考勤组详细信息获取班次 todo 默认固定班次 还有自由 与排班制
AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity = attendanceGroupFixedworkService.selectOne(new AttendanceGroupFixedworkQuery()
.groupId(attendanceGroupEntity.getId()));
//判断当前考勤日期为周几
String week = this.getWeek(attendanceDate);
//log.info("week:{}", week);
//通过考勤日期的星期拿到班次id.
if (ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)) {
log.info("attendanceGroupFixedworkEntity is null ! groupId:{}", attendanceGroupEntity.getId());
return;
}
//获取当前日期的详细班次
Long weekClassId = this.getWeekClassId(attendanceGroupFixedworkEntity, week);
//log.info("weekClassId:{}", weekClassId);
//weekClassId为-1 则不在考勤
if (weekClassId == -1L) {
//跳过本次循环
return;
}
//获取班次信息
AttendanceClassEntity attendanceClassEntity = attendanceClassService.get(weekClassId);
if (ObjectUtils.isEmpty(attendanceClassEntity)) {
log.info("attendanceClassEntity is null ,weekClassId:{}", weekClassId);
return;
}
//List<AttendanceClassDetailEntity> attendanceClassDetailEntities = attendanceClassDetailService.find(new AttendanceClassDetailQuery().classId(attendanceClassEntity.getId()));
//获取当前班的多个班次,一个班次为一个上下班时间段
List<AttendanceClassDetailEntity> attendanceClassDetailEntities = attendanceClassEntity.getAttendanceClassDetailList();
Integer orderNum = 0;
//构造数据
if (ObjectUtils.isEmpty(detailEntityList)) {
//遍历班次 构建详细考勤数据
for (AttendanceClassDetailEntity classDetailEntity : attendanceClassDetailEntities) {
orderNum++;
AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity();
recordDetailEntity.setShiftsId(classDetailEntity.getId());
recordDetailEntity.setShiftsName(classDetailEntity.getClassName());
recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOrderNum(orderNum);
detailEntityList.add(recordDetailEntity);
}
}
for (AttendanceClassDetailEntity classDetail : attendanceClassDetailEntities) {
//计算区间范围
//上班打卡前时间
Date goWorkDateBefore = DateUtil.offsetMinute(classDetail.getGoWorkDate(), -classDetail.getGoWorkDateBefore());
//上班打卡后时间
Date goWorkDateAfter = DateUtil.offsetMinute(classDetail.getGoWorkDate(), classDetail.getGoWorkDateAfter());
// 下班打卡前时间
Date offWorkDateBefore = DateUtil.offsetMinute(classDetail.getOffWorkDate(), -classDetail.getOffWorkDateBefore());
//下班打卡后时间
Date offWorkDateAfter = DateUtil.offsetMinute(classDetail.getOffWorkDate(), classDetail.getOffWorkDateAfter());
//判断考勤时间是否在上班打卡区间内 true 在 false 不在 格式化时间
//String currDate = DateUtil.formatTime(attendanceDate);
Date curDateTime = DateUtil.parseTime(DateUtil.formatTime(attendanceDate)).toJdkDate();
boolean goInTime = DateUtil.isIn(curDateTime, goWorkDateBefore, goWorkDateAfter);
//判断考勤时间是否在下班打卡区间内
boolean offInTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
if (goInTime == false && offInTime == false) {
log.info("考勤时间不在上班区间与下班区间中,不做处理!attendDate:{}", DateUtil.formatDateTime(attendanceDate));
continue;
}
if (goInTime) {
//如果是上班打卡区间范围,判断是否迟到
boolean inTime = DateUtil.isIn(curDateTime, goWorkDateBefore, classDetail.getGoWorkDate());
if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
}
}
} else {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
}
}
}
}
if (offInTime) {
boolean inTime = DateUtil.isIn(curDateTime, classDetail.getOffWorkDate(), offWorkDateAfter);
if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setOffWorkDate(attendanceDate);
}
}
} else {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.早退.getValue());
attendanceRecordDetailEntity.setOffWorkDate(attendanceDate);
}
}
}
}
}
}
public String getWeek(Date date) {
// Get the day of the week (1 = Sunday, 2 = Monday, ..., 7 = Saturday)
int dayOfWeek = DateUtil.dayOfWeek(date);
// Map the numeric day of the week to its corresponding Chinese name
String[] dayOfWeekNames = new String[]{
"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"
};
// Get the Chinese name of the day of the week
String dayOfWeekName = dayOfWeekNames[dayOfWeek - 1];
return dayOfWeekName;
}
/**
* 获取通过星期获取班次id 如果返参为-1 则不在考勤
*
* @return
*/
public Long getWeekClassId(AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity, String week) {
Long weekClassId = 0L;
switch (week) {
case "星期一":
if (attendanceGroupFixedworkEntity.getMonday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getMondayClassId();
break;
case "星期二":
if (attendanceGroupFixedworkEntity.getTuesday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getTuesdayClassId();
break;
case "星期三":
if (attendanceGroupFixedworkEntity.getWednesday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getWednesdayClassId();
break;
case "星期四":
if (attendanceGroupFixedworkEntity.getThursday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getThursdayClassId();
break;
case "星期五":
if (attendanceGroupFixedworkEntity.getFriday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getFridayClassId();
break;
case "星期六":
if (attendanceGroupFixedworkEntity.getSaturday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getSaturdayClassId();
break;
case "星期日":
if (attendanceGroupFixedworkEntity.getSunday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getSundayClassId();
break;
}
return weekClassId;
}
}
/* //map遍历.先把所有键取出来
Set<String> workNumSet = listMap.keySet();
//根据键取出value
for (String workNum : workNumSet) {
......@@ -641,211 +829,4 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
}
}
}
}*/
}
private void checkAttendGroupByOne(AttendanceRecordEntity attendanceRecordEntity, List<AttendanceRecordDetailEntity> detailEntityList, Date attendanceDate, AttendanceGroupStaffEntity attendanceGroupStaffEntity, Context context) {
//查询考勤组
AttendanceGroupEntity attendanceGroupEntity = attendanceGroupService.get(attendanceGroupStaffEntity.getGroupId(), context);
attendanceRecordEntity.setAttendanceGroupId(attendanceGroupEntity == null ? 0L : attendanceGroupEntity.getId());
attendanceRecordEntity.setAttendanceGroupName(attendanceGroupEntity == null ? "" : attendanceGroupEntity.getGroupName());
//查询考勤组详细信息获取班次
AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity = attendanceGroupFixedworkService.selectOne(new AttendanceGroupFixedworkQuery()
.groupId(attendanceGroupEntity.getId()));
//判断当前考勤日期为周几
String week = this.getWeek(attendanceDate);
//log.info("week:{}", week);
//通过考勤日期的星期拿到班次id.
if (ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)) {
log.info("attendanceGroupFixedworkEntity is null ! groupId:{}", attendanceGroupEntity.getId());
return;
}
Long weekClassId = this.getWeekClassId(attendanceGroupFixedworkEntity, week);
//log.info("weekClassId:{}", weekClassId);
//weekClassId为-1 则不在考勤
if (weekClassId == -1L) {
//跳过本次循环
return;
}
//获取班次信息
AttendanceClassEntity attendanceClassEntity = attendanceClassService.get(weekClassId);
if (ObjectUtils.isEmpty(attendanceClassEntity)) {
log.info("attendanceClassEntity is null ,weekClassId:{}", weekClassId);
return;
}
//获取班次详细信息
List<AttendanceClassDetailEntity> attendanceClassDetailEntities = attendanceClassDetailService.find(new AttendanceClassDetailQuery().classId(attendanceClassEntity.getId()));
Integer orderNum = 0;
//构造数据
if (ObjectUtils.isEmpty(detailEntityList)) {
for (AttendanceClassDetailEntity classDetailEntity : attendanceClassDetailEntities) {
orderNum++;
AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity();
recordDetailEntity.setShiftsId(classDetailEntity.getId());
recordDetailEntity.setShiftsName(classDetailEntity.getClassName());
recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOrderNum(orderNum);
detailEntityList.add(recordDetailEntity);
}
}
for (AttendanceClassDetailEntity classDetail : attendanceClassDetailEntities) {
//计算区间范围
//上班打卡前时间
Date goWorkDateBefore = DateUtil.offsetMinute(classDetail.getGoWorkDate(), -classDetail.getGoWorkDateBefore());
//上班打卡后时间
Date goWorkDateAfter = DateUtil.offsetMinute(classDetail.getGoWorkDate(), classDetail.getGoWorkDateAfter());
// 下班打卡前时间
Date offWorkDateBefore = DateUtil.offsetMinute(classDetail.getOffWorkDate(), -classDetail.getOffWorkDateBefore());
//下班打卡后时间
Date offWorkDateAfter = DateUtil.offsetMinute(classDetail.getOffWorkDate(), classDetail.getOffWorkDateAfter());
//判断考勤时间是否在上班打卡区间内 true 在 false 不在
boolean goInTime = DateUtil.isIn(attendanceDate, goWorkDateBefore, goWorkDateAfter);
//判断考勤时间是否在下班打卡区间内
boolean offInTime = DateUtil.isIn(attendanceDate, offWorkDateBefore, offWorkDateAfter);
if (goInTime == false && offInTime == false) {
log.info("考勤时间不在上班区间与下班区间中,不做处理!attendDate:{}", DateUtil.formatDateTime(attendanceDate));
continue;
}
if (goInTime) {
//如果是上班打卡区间范围,判断是否迟到
boolean inTime = DateUtil.isIn(attendanceDate, goWorkDateBefore, classDetail.getGoWorkDate());
if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getClassId()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
}
}
} else {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getClassId()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
}
}
}
}
if (offInTime) {
boolean inTime = DateUtil.isIn(attendanceDate, classDetail.getOffWorkDate(), offWorkDateAfter);
if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) {
attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
}
}
} else {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntityList) {
if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) {
attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.早退.getValue());
attendanceRecordDetailEntity.setOffWorkDate(attendanceDate);
}
}
}
}
}
}
public String getWeek(Date date) {
// Get the day of the week (1 = Sunday, 2 = Monday, ..., 7 = Saturday)
int dayOfWeek = DateUtil.dayOfWeek(date);
// Map the numeric day of the week to its corresponding Chinese name
String[] dayOfWeekNames = new String[]{
"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"
};
// Get the Chinese name of the day of the week
String dayOfWeekName = dayOfWeekNames[dayOfWeek - 1];
return dayOfWeekName;
}
/**
* 获取通过星期获取班次id 如果返参为-1 则不在考勤
*
* @return
*/
public Long getWeekClassId(AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity, String week) {
Long weekClassId = 0L;
switch (week) {
case "星期一":
if (attendanceGroupFixedworkEntity.getMonday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getMondayClassId();
break;
case "星期二":
if (attendanceGroupFixedworkEntity.getTuesday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getTuesdayClassId();
break;
case "星期三":
if (attendanceGroupFixedworkEntity.getWednesday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getWednesdayClassId();
break;
case "星期四":
if (attendanceGroupFixedworkEntity.getThursday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getThursdayClassId();
break;
case "星期五":
if (attendanceGroupFixedworkEntity.getFriday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getFridayClassId();
break;
case "星期六":
if (attendanceGroupFixedworkEntity.getSaturday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getSaturdayClassId();
break;
case "星期日":
if (attendanceGroupFixedworkEntity.getSunday() == 0) {
weekClassId = -1L;
return weekClassId;
}
weekClassId = attendanceGroupFixedworkEntity.getSundayClassId();
break;
}
return weekClassId;
}
/**
* @param nowTime 当前时间
* @param startTime 开始时间
* @param endTime 结束时间
* @return 判断当前时间在时间区间内
*/
public static boolean isInTime(Date nowTime, Date startTime, Date endTime) {
if (nowTime.getTime() == startTime.getTime()
|| nowTime.getTime() == endTime.getTime()) {
return true;
}
Calendar date = Calendar.getInstance();
date.setTime(nowTime);
Calendar begin = Calendar.getInstance();
begin.setTime(startTime);
Calendar end = Calendar.getInstance();
end.setTime(endTime);
if (date.after(begin) && date.before(end)) {
return true;
} else {
return false;
}
}
}
}*/
\ No newline at end of file
package com.mortals.xhx.module.attendance.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.attendance.model.AttendanceClassEntity;
import com.mortals.xhx.module.attendance.service.AttendanceClassService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 考勤班次详细信息
*
* @author zxfei
* @date 2023-04-08
*/
* 考勤班次详细信息
*
* @author zxfei
* @date 2023-04-08
*/
@RestController
@RequestMapping("attendance/class/detail")
public class AttendanceClassDetailController extends BaseCRUDJsonBodyMappingController<AttendanceClassDetailService,AttendanceClassDetailEntity,Long> {
public class AttendanceClassDetailController extends BaseCRUDJsonBodyMappingController<AttendanceClassDetailService, AttendanceClassDetailEntity, Long> {
@Autowired
private ParamService paramService;
@Autowired
private AttendanceClassService classService;
public AttendanceClassDetailController(){
super.setModuleDesc( "考勤班次详细信息");
public AttendanceClassDetailController() {
super.setModuleDesc("考勤班次详细信息");
}
@Override
......@@ -46,4 +61,13 @@ public class AttendanceClassDetailController extends BaseCRUDJsonBodyMappingCont
}
@Override
protected void saveBefore(AttendanceClassDetailEntity entity, Map<String, Object> model, Context context) throws AppException {
if (!ObjectUtils.isEmpty(entity.getClassId())) {
AttendanceClassEntity classEntity = classService.get(entity.getClassId(), context);
entity.setClassName(classEntity == null ? "" : classEntity.getClassName());
}
}
}
......@@ -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.model.BaseEntityLong;
......@@ -12,7 +15,7 @@ import lombok.Data;
* 考勤绩效记录核查信息实体对象
*
* @author zxfei
* @date 2023-07-17
* @date 2023-07-27
*/
@Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo {
......@@ -71,7 +74,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/**
* 增减类型(1.增加,2.扣除)
*/
@Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除")
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType;
/**
* 扣分或增加分值
......@@ -116,7 +119,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/**
* 核查结果(1.加分或扣分,2.不扣分)
*/
@Excel(name = "核查结果", readConverterExp = "加分或扣分=加分或扣分,不扣分=不扣分")
@Excel(name = "核查结果", readConverterExp = "1=加分或扣分,2=不扣分")
private String checkResult;
/**
* 处理状态(1.未处理,2.已处理)
......@@ -144,9 +147,9 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/
private Long categoryId;
/**
* 种类名称
* 规则名称
*/
@Excel(name = "种类名称")
@Excel(name = "规则名称")
private String categoryName;
/**
* 扣分人员
......@@ -163,6 +166,10 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -180,67 +187,37 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
}
public void initAttrValue(){
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.deptId = 0L;
this.deptName = "";
this.attendanceGroupId = 0L;
this.attendanceGroupName = "";
this.attendanceDate = null;
this.attendanceDate = new Date();
this.ruleId = 0L;
this.ruleName = "";
this.subAddType = 1;
this.score = BigDecimal.valueOf(0.00);
this.score = BigDecimal.ZERO;
this.goOffTimeStr = "";
this.errorTime = null;
this.actualAttendTime = null;
this.errorTime = new Date();
this.actualAttendTime = new Date();
this.errorResult = "";
this.checkPerson = "";
this.checkTime = null;
this.checkTime = new Date();
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.subMethod = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = 0L;
this.categoryName = "";
this.deductPerson = "";
this.deductTime = new Date();
this.windowNum = "";
this.auditStatus = 1;
}
}
\ No newline at end of file
......@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
* 考勤绩效记录核查信息查询对象
*
* @author zxfei
* @date 2023-07-16
* @date 2023-07-27
*/
public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 开始 序号,主键,自增长 */
......@@ -328,6 +328,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 窗口编号排除列表 */
private List <String> windowNumNotList;
/** 开始 审核状态(1.同意,2.不同意) */
private Integer auditStatusStart;
/** 结束 审核状态(1.同意,2.不同意) */
private Integer auditStatusEnd;
/** 增加 审核状态(1.同意,2.不同意) */
private Integer auditStatusIncrement;
/** 审核状态(1.同意,2.不同意)列表 */
private List <Integer> auditStatusList;
/** 审核状态(1.同意,2.不同意)排除列表 */
private List <Integer> auditStatusNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckAttendRecordQuery> orConditionList;
......@@ -2125,6 +2140,87 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
this.windowNumNotList = windowNumNotList;
}
/**
* 获取 开始 审核状态(1.同意,2.不同意)
* @return auditStatusStart
*/
public Integer getAuditStatusStart(){
return this.auditStatusStart;
}
/**
* 设置 开始 审核状态(1.同意,2.不同意)
* @param auditStatusStart
*/
public void setAuditStatusStart(Integer auditStatusStart){
this.auditStatusStart = auditStatusStart;
}
/**
* 获取 结束 审核状态(1.同意,2.不同意)
* @return $auditStatusEnd
*/
public Integer getAuditStatusEnd(){
return this.auditStatusEnd;
}
/**
* 设置 结束 审核状态(1.同意,2.不同意)
* @param auditStatusEnd
*/
public void setAuditStatusEnd(Integer auditStatusEnd){
this.auditStatusEnd = auditStatusEnd;
}
/**
* 获取 增加 审核状态(1.同意,2.不同意)
* @return auditStatusIncrement
*/
public Integer getAuditStatusIncrement(){
return this.auditStatusIncrement;
}
/**
* 设置 增加 审核状态(1.同意,2.不同意)
* @param auditStatusIncrement
*/
public void setAuditStatusIncrement(Integer auditStatusIncrement){
this.auditStatusIncrement = auditStatusIncrement;
}
/**
* 获取 审核状态(1.同意,2.不同意)
* @return auditStatusList
*/
public List<Integer> getAuditStatusList(){
return this.auditStatusList;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusList
*/
public void setAuditStatusList(List<Integer> auditStatusList){
this.auditStatusList = auditStatusList;
}
/**
* 获取 审核状态(1.同意,2.不同意)
* @return auditStatusNotList
*/
public List<Integer> getAuditStatusNotList(){
return this.auditStatusNotList;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusNotList
*/
public void setAuditStatusNotList(List<Integer> auditStatusNotList){
this.auditStatusNotList = auditStatusNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
......@@ -3138,6 +3234,60 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
return this;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatus
*/
public CheckAttendRecordQuery auditStatus(Integer auditStatus){
setAuditStatus(auditStatus);
return this;
}
/**
* 设置 开始 审核状态(1.同意,2.不同意)
* @param auditStatusStart
*/
public CheckAttendRecordQuery auditStatusStart(Integer auditStatusStart){
this.auditStatusStart = auditStatusStart;
return this;
}
/**
* 设置 结束 审核状态(1.同意,2.不同意)
* @param auditStatusEnd
*/
public CheckAttendRecordQuery auditStatusEnd(Integer auditStatusEnd){
this.auditStatusEnd = auditStatusEnd;
return this;
}
/**
* 设置 增加 审核状态(1.同意,2.不同意)
* @param auditStatusIncrement
*/
public CheckAttendRecordQuery auditStatusIncrement(Integer auditStatusIncrement){
this.auditStatusIncrement = auditStatusIncrement;
return this;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusList
*/
public CheckAttendRecordQuery auditStatusList(List<Integer> auditStatusList){
this.auditStatusList = auditStatusList;
return this;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusNotList
*/
public CheckAttendRecordQuery auditStatusNotList(List<Integer> auditStatusNotList){
this.auditStatusNotList = auditStatusNotList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
......@@ -3,159 +3,171 @@ 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.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckComplainRecordVo;
import lombok.Data;
/**
* 评价绩效投诉核查信息实体对象
*
* @author zxfei
* @date 2023-07-11
*/
* 评价绩效投诉核查信息实体对象
*
* @author zxfei
* @date 2023-07-27
*/
@Data
public class CheckComplainRecordEntity extends CheckComplainRecordVo {
private static final long serialVersionUID = 1L;
/**
* 记录ID
*/
* 记录ID
*/
private Long recordId;
/**
* 员工ID
*/
* 员工ID
*/
private Long staffId;
/**
* 员工姓名
*/
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门
*/
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 投诉标题
*/
* 投诉标题
*/
@Excel(name = "投诉标题")
private String complainTitle;
/**
* 投诉内容
*/
* 投诉内容
*/
@Excel(name = "投诉内容")
private String complainContent;
/**
* 投诉人真实姓名
*/
* 投诉人真实姓名
*/
@Excel(name = "投诉人真实姓名")
private String complainRealName;
/**
* 联系电话
*/
* 联系电话
*/
@Excel(name = "联系电话")
private String contact;
/**
* 投诉时间
*/
* 投诉时间
*/
@Excel(name = "投诉时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date complainTime;
/**
* 投诉来源
*/
* 投诉来源
*/
@Excel(name = "投诉来源")
private String complainSource;
/**
* 投诉设备
*/
* 投诉设备
*/
@Excel(name = "投诉设备")
private String complainDevice;
/**
* 绩效规则id
*/
* 绩效规则id
*/
private Long ruleId;
/**
* 规则名称
*/
* 规则名称
*/
private String ruleName;
/**
* 扣分方式(1.系统自动,2.人工添加)
*/
* 扣分方式(1.系统自动,2.人工添加)
*/
private Integer subMethod;
/**
* 扣分人员
*/
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分时间
*/
* 扣分时间
*/
private Date deductTime;
/**
* 扣分或增加分值
*/
* 扣分或增加分值
*/
private BigDecimal score;
/**
* 核查人员
*/
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查时间
*/
* 核查时间
*/
private Date checkTime;
/**
* 核查说明
*/
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
/**
* 处理状态(1.未处理,2.已处理)
*/
* 处理状态(1.未处理,2.已处理)
*/
private Integer checkStatus;
/**
* 备注
*/
* 备注
*/
private String remark;
/**
* 附件名称,多个逗号分割
*/
* 附件名称,多个逗号分割
*/
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
* 附件下载地址,多个逗号分割
*/
private String filePaths;
/**
* 绩效规则分类id
*/
* 绩效规则分类id
*/
private Long categoryId;
/**
* 规则名称
*/
* 规则名称
*/
private String categoryName;
/**
* 增减类型(1.增加,2.扣除)
*/
* 增减类型(1.增加,2.扣除)
*/
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -163,74 +175,44 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
if (obj instanceof CheckComplainRecordEntity) {
CheckComplainRecordEntity tmp = (CheckComplainRecordEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
}
public void initAttrValue(){
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.windowNum = "";
this.deptId = 0L;
this.deptName = "";
this.complainTitle = "";
this.complainContent = "";
this.complainRealName = "";
this.contact = "";
this.complainTime = null;
this.complainSource = "";
this.complainDevice = "";
this.ruleId = 0L;
this.ruleName = "";
this.subMethod = 1;
this.deductPerson = "";
this.deductTime = null;
this.score = BigDecimal.valueOf(0.00);
this.checkPerson = "";
this.checkTime = null;
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = 0L;
this.categoryName = "";
this.subAddType = 1;
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.windowNum = "";
this.deptId = 0L;
this.deptName = "";
this.complainTitle = "";
this.complainContent = "";
this.complainRealName = "";
this.contact = "";
this.complainTime = new Date();
this.complainSource = "";
this.complainDevice = "";
this.ruleId = 0L;
this.ruleName = "";
this.subMethod = 1;
this.deductPerson = "";
this.deductTime = new Date();
this.score = BigDecimal.ZERO;
this.checkPerson = "";
this.checkTime = new Date();
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = 0L;
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
}
}
\ No newline at end of file
......@@ -3,152 +3,159 @@ 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.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckEffectRecordVo;
import lombok.Data;
/**
* 效能绩效核查信息实体对象
*
* @author zxfei
* @date 2023-07-11
*/
* 效能绩效核查信息实体对象
*
* @author zxfei
* @date 2023-07-27
*/
@Data
public class CheckEffectRecordEntity extends CheckEffectRecordVo {
private static final long serialVersionUID = 1L;
/**
* 记录ID
*/
* 记录ID
*/
private Long recordId;
/**
* 员工ID
*/
* 员工ID
*/
private Long staffId;
/**
* 员工姓名
*/
* 员工姓名
*/
@Excel(name = "员工姓名")
private String staffName;
/**
* 工号
*/
* 工号
*/
@Excel(name = "工号")
private String workNum;
/**
* 窗口编号
*/
* 窗口编号
*/
@Excel(name = "窗口编号")
private String windowNum;
/**
* 所属部门
*/
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
* 所属部门名称
*/
@Excel(name = "所属部门名称")
private String deptName;
/**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2=离岗,3=玩手机,4=睡觉")
private Integer irregularType;
/**
* 发生时间
*/
* 发生时间
*/
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime;
/**
* 持续时间,秒
*/
* 持续时间,秒
*/
private Integer duration;
/**
* 报警时间
*/
* 报警时间
*/
private Date alarmTime;
/**
* 图片凭证地址
*/
* 图片凭证地址
*/
private String snapPath;
/**
* 绩效规则id
*/
* 绩效规则id
*/
private Long ruleId;
/**
* 规则名称
*/
* 规则名称
*/
private String ruleName;
/**
* 扣分方式(1.系统自动,2.人工添加)
*/
* 扣分方式(1.系统自动,2.人工添加)
*/
private Integer subMethod;
/**
* 扣分人员
*/
* 扣分人员
*/
@Excel(name = "扣分人员")
private String deductPerson;
/**
* 扣分时间
*/
* 扣分时间
*/
private Date deductTime;
/**
* 扣分或增加分值
*/
* 扣分或增加分值
*/
private BigDecimal score;
/**
* 核查人员
*/
* 核查人员
*/
@Excel(name = "核查人员")
private String checkPerson;
/**
* 核查时间
*/
* 核查时间
*/
private Date checkTime;
/**
* 核查说明
*/
* 核查说明
*/
@Excel(name = "核查说明")
private String checkDesc;
/**
* 核查结果
*/
* 核查结果
*/
@Excel(name = "核查结果")
private String checkResult;
/**
* 处理状态(1.未处理,2.已处理)
*/
* 处理状态(1.未处理,2.已处理)
*/
private Integer checkStatus;
/**
* 备注
*/
* 备注
*/
private String remark;
/**
* 附件名称,多个逗号分割
*/
* 附件名称,多个逗号分割
*/
@Excel(name = "附件名称,多个逗号分割")
private String fileNames;
/**
* 附件下载地址,多个逗号分割
*/
* 附件下载地址,多个逗号分割
*/
@Excel(name = "附件下载地址,多个逗号分割")
private String filePaths;
/**
* 绩效规则分类id
*/
* 绩效规则分类id
*/
private Long categoryId;
/**
* 规则名称
*/
* 规则名称
*/
private String categoryName;
/**
* 增减类型(1.增加,2.扣除)
*/
* 增减类型(1.增加,2.扣除)
*/
private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -156,70 +163,42 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
if (obj instanceof CheckEffectRecordEntity) {
CheckEffectRecordEntity tmp = (CheckEffectRecordEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
}
public void initAttrValue(){
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.windowNum = "";
this.deptId = 0L;
this.deptName = "";
this.irregularType = 1;
this.happenTime = null;
this.duration = 0;
this.alarmTime = null;
this.snapPath = "";
this.ruleId = 0L;
this.ruleName = "";
this.subMethod = 1;
this.deductPerson = "";
this.deductTime = null;
this.score = BigDecimal.valueOf(0.00);
this.checkPerson = "";
this.checkTime = null;
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = 0L;
this.categoryName = "";
this.subAddType = 1;
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.windowNum = "";
this.deptId = 0L;
this.deptName = "";
this.irregularType = 0;
this.happenTime = new Date();
this.duration = 0;
this.alarmTime = new Date();
this.snapPath = "";
this.ruleId = 0L;
this.ruleName = "";
this.subMethod = 1;
this.deductPerson = "";
this.deductTime = new Date();
this.score = BigDecimal.ZERO;
this.checkPerson = "";
this.checkTime = new Date();
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = 0L;
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
}
}
\ No newline at end of file
......@@ -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.model.BaseEntityLong;
......@@ -12,7 +15,7 @@ import lombok.Data;
* 办件绩效核查信息实体对象
*
* @author zxfei
* @date 2023-07-17
* @date 2023-07-27
*/
@Data
public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
......@@ -82,7 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 扣分方式(1.系统自动,2.人工添加)
*/
@Excel(name = "扣分方式", readConverterExp = "1=系统自动,2.人工添加")
@Excel(name = "扣分方式", readConverterExp = "1=系统自动,2=人工添加")
private Integer subMethod;
/**
* 扣分人员
......@@ -146,8 +149,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/**
* 增减类型(1.增加,2.扣除)
*/
@Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除")
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -165,61 +172,34 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
}
public void initAttrValue(){
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.windowNum = "";
this.deptId = 0L;
this.deptName = "";
this.goworkCode = "";
this.goworkDepts = "";
this.matterlName = "";
this.goworkTime = null;
this.goworkTime = new Date();
this.ruleId = 0L;
this.ruleName = "";
this.subMethod = 1;
this.deductPerson = "";
this.deductTime = null;
this.score = BigDecimal.valueOf(0.00);
this.deductTime = new Date();
this.score = BigDecimal.ZERO;
this.checkPerson = "";
this.checkTime = null;
this.checkTime = new Date();
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = 0L;
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
}
}
\ No newline at end of file
......@@ -5,11 +5,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
/**
* 办件绩效核查信息查询对象
*
* @author zxfei
* @date 2023-07-11
*/
* 办件绩效核查信息查询对象
*
* @author zxfei
* @date 2023-07-27
*/
public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 开始 序号,主键,自增长 */
private Long idStart;
......@@ -301,6 +301,21 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
/** 增减类型(1.增加,2.扣除)排除列表 */
private List <Integer> subAddTypeNotList;
/** 开始 审核状态(1.同意,2.不同意) */
private Integer auditStatusStart;
/** 结束 审核状态(1.同意,2.不同意) */
private Integer auditStatusEnd;
/** 增加 审核状态(1.同意,2.不同意) */
private Integer auditStatusIncrement;
/** 审核状态(1.同意,2.不同意)列表 */
private List <Integer> auditStatusList;
/** 审核状态(1.同意,2.不同意)排除列表 */
private List <Integer> auditStatusNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckGoworkRecordQuery> orConditionList;
......@@ -310,2634 +325,2769 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
public CheckGoworkRecordQuery(){}
/**
* 获取 开始 序号,主键,自增长
* @return idStart
*/
* 获取 开始 序号,主键,自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号,主键,自增长
* @param idStart
*/
* 设置 开始 序号,主键,自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号,主键,自增长
* @return $idEnd
*/
* 获取 结束 序号,主键,自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号,主键,自增长
* @param idEnd
*/
* 设置 结束 序号,主键,自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号,主键,自增长
* @return idIncrement
*/
* 获取 增加 序号,主键,自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号,主键,自增长
* @param idIncrement
*/
* 设置 增加 序号,主键,自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号,主键,自增长
* @return idList
*/
* 获取 序号,主键,自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号,主键,自增长
* @param idList
*/
* 设置 序号,主键,自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 序号,主键,自增长
* @return idNotList
*/
* 获取 序号,主键,自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号,主键,自增长
* @param idNotList
*/
* 设置 序号,主键,自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 记录ID
* @return recordIdStart
*/
* 获取 开始 记录ID
* @return recordIdStart
*/
public Long getRecordIdStart(){
return this.recordIdStart;
}
/**
* 设置 开始 记录ID
* @param recordIdStart
*/
* 设置 开始 记录ID
* @param recordIdStart
*/
public void setRecordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
}
/**
* 获取 结束 记录ID
* @return $recordIdEnd
*/
* 获取 结束 记录ID
* @return $recordIdEnd
*/
public Long getRecordIdEnd(){
return this.recordIdEnd;
}
/**
* 设置 结束 记录ID
* @param recordIdEnd
*/
* 设置 结束 记录ID
* @param recordIdEnd
*/
public void setRecordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
}
/**
* 获取 增加 记录ID
* @return recordIdIncrement
*/
* 获取 增加 记录ID
* @return recordIdIncrement
*/
public Long getRecordIdIncrement(){
return this.recordIdIncrement;
}
/**
* 设置 增加 记录ID
* @param recordIdIncrement
*/
* 设置 增加 记录ID
* @param recordIdIncrement
*/
public void setRecordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
}
/**
* 获取 记录ID
* @return recordIdList
*/
* 获取 记录ID
* @return recordIdList
*/
public List<Long> getRecordIdList(){
return this.recordIdList;
}
/**
* 设置 记录ID
* @param recordIdList
*/
* 设置 记录ID
* @param recordIdList
*/
public void setRecordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
}
/**
* 获取 记录ID
* @return recordIdNotList
*/
* 获取 记录ID
* @return recordIdNotList
*/
public List<Long> getRecordIdNotList(){
return this.recordIdNotList;
}
/**
* 设置 记录ID
* @param recordIdNotList
*/
* 设置 记录ID
* @param recordIdNotList
*/
public void setRecordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
}
/**
* 获取 开始 员工ID
* @return staffIdStart
*/
* 获取 开始 员工ID
* @return staffIdStart
*/
public Long getStaffIdStart(){
return this.staffIdStart;
}
/**
* 设置 开始 员工ID
* @param staffIdStart
*/
* 设置 开始 员工ID
* @param staffIdStart
*/
public void setStaffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart;
}
/**
* 获取 结束 员工ID
* @return $staffIdEnd
*/
* 获取 结束 员工ID
* @return $staffIdEnd
*/
public Long getStaffIdEnd(){
return this.staffIdEnd;
}
/**
* 设置 结束 员工ID
* @param staffIdEnd
*/
* 设置 结束 员工ID
* @param staffIdEnd
*/
public void setStaffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd;
}
/**
* 获取 增加 员工ID
* @return staffIdIncrement
*/
* 获取 增加 员工ID
* @return staffIdIncrement
*/
public Long getStaffIdIncrement(){
return this.staffIdIncrement;
}
/**
* 设置 增加 员工ID
* @param staffIdIncrement
*/
* 设置 增加 员工ID
* @param staffIdIncrement
*/
public void setStaffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement;
}
/**
* 获取 员工ID
* @return staffIdList
*/
* 获取 员工ID
* @return staffIdList
*/
public List<Long> getStaffIdList(){
return this.staffIdList;
}
/**
* 设置 员工ID
* @param staffIdList
*/
* 设置 员工ID
* @param staffIdList
*/
public void setStaffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
}
/**
* 获取 员工ID
* @return staffIdNotList
*/
* 获取 员工ID
* @return staffIdNotList
*/
public List<Long> getStaffIdNotList(){
return this.staffIdNotList;
}
/**
* 设置 员工ID
* @param staffIdNotList
*/
* 设置 员工ID
* @param staffIdNotList
*/
public void setStaffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList;
}
/**
* 获取 员工姓名
* @return staffNameList
*/
* 获取 员工姓名
* @return staffNameList
*/
public List<String> getStaffNameList(){
return this.staffNameList;
}
/**
* 设置 员工姓名
* @param staffNameList
*/
* 设置 员工姓名
* @param staffNameList
*/
public void setStaffNameList(List<String> staffNameList){
this.staffNameList = staffNameList;
}
/**
* 获取 员工姓名
* @return staffNameNotList
*/
* 获取 员工姓名
* @return staffNameNotList
*/
public List<String> getStaffNameNotList(){
return this.staffNameNotList;
}
/**
* 设置 员工姓名
* @param staffNameNotList
*/
* 设置 员工姓名
* @param staffNameNotList
*/
public void setStaffNameNotList(List<String> staffNameNotList){
this.staffNameNotList = staffNameNotList;
}
/**
* 获取 工号
* @return workNumList
*/
* 获取 工号
* @return workNumList
*/
public List<String> getWorkNumList(){
return this.workNumList;
}
/**
* 设置 工号
* @param workNumList
*/
* 设置 工号
* @param workNumList
*/
public void setWorkNumList(List<String> workNumList){
this.workNumList = workNumList;
}
/**
* 获取 工号
* @return workNumNotList
*/
* 获取 工号
* @return workNumNotList
*/
public List<String> getWorkNumNotList(){
return this.workNumNotList;
}
/**
* 设置 工号
* @param workNumNotList
*/
* 设置 工号
* @param workNumNotList
*/
public void setWorkNumNotList(List<String> workNumNotList){
this.workNumNotList = workNumNotList;
}
/**
* 获取 窗口编号
* @return windowNumList
*/
* 获取 窗口编号
* @return windowNumList
*/
public List<String> getWindowNumList(){
return this.windowNumList;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
* 设置 窗口编号
* @param windowNumList
*/
public void setWindowNumList(List<String> windowNumList){
this.windowNumList = windowNumList;
}
/**
* 获取 窗口编号
* @return windowNumNotList
*/
* 获取 窗口编号
* @return windowNumNotList
*/
public List<String> getWindowNumNotList(){
return this.windowNumNotList;
}
/**
* 设置 窗口编号
* @param windowNumNotList
*/
* 设置 窗口编号
* @param windowNumNotList
*/
public void setWindowNumNotList(List<String> windowNumNotList){
this.windowNumNotList = windowNumNotList;
}
/**
* 获取 开始 所属部门
* @return deptIdStart
*/
* 获取 开始 所属部门
* @return deptIdStart
*/
public Long getDeptIdStart(){
return this.deptIdStart;
}
/**
* 设置 开始 所属部门
* @param deptIdStart
*/
* 设置 开始 所属部门
* @param deptIdStart
*/
public void setDeptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart;
}
/**
* 获取 结束 所属部门
* @return $deptIdEnd
*/
* 获取 结束 所属部门
* @return $deptIdEnd
*/
public Long getDeptIdEnd(){
return this.deptIdEnd;
}
/**
* 设置 结束 所属部门
* @param deptIdEnd
*/
* 设置 结束 所属部门
* @param deptIdEnd
*/
public void setDeptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd;
}
/**
* 获取 增加 所属部门
* @return deptIdIncrement
*/
* 获取 增加 所属部门
* @return deptIdIncrement
*/
public Long getDeptIdIncrement(){
return this.deptIdIncrement;
}
/**
* 设置 增加 所属部门
* @param deptIdIncrement
*/
* 设置 增加 所属部门
* @param deptIdIncrement
*/
public void setDeptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement;
}
/**
* 获取 所属部门
* @return deptIdList
*/
* 获取 所属部门
* @return deptIdList
*/
public List<Long> getDeptIdList(){
return this.deptIdList;
}
/**
* 设置 所属部门
* @param deptIdList
*/
* 设置 所属部门
* @param deptIdList
*/
public void setDeptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList;
}
/**
* 获取 所属部门
* @return deptIdNotList
*/
* 获取 所属部门
* @return deptIdNotList
*/
public List<Long> getDeptIdNotList(){
return this.deptIdNotList;
}
/**
* 设置 所属部门
* @param deptIdNotList
*/
* 设置 所属部门
* @param deptIdNotList
*/
public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
}
/**
* 获取 所属部门名称
* @return deptNameList
*/
* 获取 所属部门名称
* @return deptNameList
*/
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
* 设置 所属部门名称
* @param deptNameList
*/
* 设置 所属部门名称
* @param deptNameList
*/
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 所属部门名称
* @return deptNameNotList
*/
* 获取 所属部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 所属部门名称
* @param deptNameNotList
*/
* 设置 所属部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 办件编码
* @return goworkCodeList
*/
* 获取 办件编码
* @return goworkCodeList
*/
public List<String> getGoworkCodeList(){
return this.goworkCodeList;
}
/**
* 设置 办件编码
* @param goworkCodeList
*/
* 设置 办件编码
* @param goworkCodeList
*/
public void setGoworkCodeList(List<String> goworkCodeList){
this.goworkCodeList = goworkCodeList;
}
/**
* 获取 办件编码
* @return goworkCodeNotList
*/
* 获取 办件编码
* @return goworkCodeNotList
*/
public List<String> getGoworkCodeNotList(){
return this.goworkCodeNotList;
}
/**
* 设置 办件编码
* @param goworkCodeNotList
*/
* 设置 办件编码
* @param goworkCodeNotList
*/
public void setGoworkCodeNotList(List<String> goworkCodeNotList){
this.goworkCodeNotList = goworkCodeNotList;
}
/**
* 获取 办件所属部门
* @return goworkDeptsList
*/
* 获取 办件所属部门
* @return goworkDeptsList
*/
public List<String> getGoworkDeptsList(){
return this.goworkDeptsList;
}
/**
* 设置 办件所属部门
* @param goworkDeptsList
*/
* 设置 办件所属部门
* @param goworkDeptsList
*/
public void setGoworkDeptsList(List<String> goworkDeptsList){
this.goworkDeptsList = goworkDeptsList;
}
/**
* 获取 办件所属部门
* @return goworkDeptsNotList
*/
* 获取 办件所属部门
* @return goworkDeptsNotList
*/
public List<String> getGoworkDeptsNotList(){
return this.goworkDeptsNotList;
}
/**
* 设置 办件所属部门
* @param goworkDeptsNotList
*/
* 设置 办件所属部门
* @param goworkDeptsNotList
*/
public void setGoworkDeptsNotList(List<String> goworkDeptsNotList){
this.goworkDeptsNotList = goworkDeptsNotList;
}
/**
* 获取 事项名称
* @return matterlNameList
*/
* 获取 事项名称
* @return matterlNameList
*/
public List<String> getMatterlNameList(){
return this.matterlNameList;
}
/**
* 设置 事项名称
* @param matterlNameList
*/
* 设置 事项名称
* @param matterlNameList
*/
public void setMatterlNameList(List<String> matterlNameList){
this.matterlNameList = matterlNameList;
}
/**
* 获取 事项名称
* @return matterlNameNotList
*/
* 获取 事项名称
* @return matterlNameNotList
*/
public List<String> getMatterlNameNotList(){
return this.matterlNameNotList;
}
/**
* 设置 事项名称
* @param matterlNameNotList
*/
* 设置 事项名称
* @param matterlNameNotList
*/
public void setMatterlNameNotList(List<String> matterlNameNotList){
this.matterlNameNotList = matterlNameNotList;
}
/**
* 获取 开始 办理时间
* @return goworkTimeStart
*/
* 获取 开始 办理时间
* @return goworkTimeStart
*/
public String getGoworkTimeStart(){
return this.goworkTimeStart;
}
/**
* 设置 开始 办理时间
* @param goworkTimeStart
*/
* 设置 开始 办理时间
* @param goworkTimeStart
*/
public void setGoworkTimeStart(String goworkTimeStart){
this.goworkTimeStart = goworkTimeStart;
}
/**
* 获取 结束 办理时间
* @return goworkTimeEnd
*/
* 获取 结束 办理时间
* @return goworkTimeEnd
*/
public String getGoworkTimeEnd(){
return this.goworkTimeEnd;
}
/**
* 设置 结束 办理时间
* @param goworkTimeEnd
*/
* 设置 结束 办理时间
* @param goworkTimeEnd
*/
public void setGoworkTimeEnd(String goworkTimeEnd){
this.goworkTimeEnd = goworkTimeEnd;
}
/**
* 获取 开始 绩效规则id
* @return ruleIdStart
*/
* 获取 开始 绩效规则id
* @return ruleIdStart
*/
public Long getRuleIdStart(){
return this.ruleIdStart;
}
/**
* 设置 开始 绩效规则id
* @param ruleIdStart
*/
* 设置 开始 绩效规则id
* @param ruleIdStart
*/
public void setRuleIdStart(Long ruleIdStart){
this.ruleIdStart = ruleIdStart;
}
/**
* 获取 结束 绩效规则id
* @return $ruleIdEnd
*/
* 获取 结束 绩效规则id
* @return $ruleIdEnd
*/
public Long getRuleIdEnd(){
return this.ruleIdEnd;
}
/**
* 设置 结束 绩效规则id
* @param ruleIdEnd
*/
* 设置 结束 绩效规则id
* @param ruleIdEnd
*/
public void setRuleIdEnd(Long ruleIdEnd){
this.ruleIdEnd = ruleIdEnd;
}
/**
* 获取 增加 绩效规则id
* @return ruleIdIncrement
*/
* 获取 增加 绩效规则id
* @return ruleIdIncrement
*/
public Long getRuleIdIncrement(){
return this.ruleIdIncrement;
}
/**
* 设置 增加 绩效规则id
* @param ruleIdIncrement
*/
* 设置 增加 绩效规则id
* @param ruleIdIncrement
*/
public void setRuleIdIncrement(Long ruleIdIncrement){
this.ruleIdIncrement = ruleIdIncrement;
}
/**
* 获取 绩效规则id
* @return ruleIdList
*/
* 获取 绩效规则id
* @return ruleIdList
*/
public List<Long> getRuleIdList(){
return this.ruleIdList;
}
/**
* 设置 绩效规则id
* @param ruleIdList
*/
* 设置 绩效规则id
* @param ruleIdList
*/
public void setRuleIdList(List<Long> ruleIdList){
this.ruleIdList = ruleIdList;
}
/**
* 获取 绩效规则id
* @return ruleIdNotList
*/
* 获取 绩效规则id
* @return ruleIdNotList
*/
public List<Long> getRuleIdNotList(){
return this.ruleIdNotList;
}
/**
* 设置 绩效规则id
* @param ruleIdNotList
*/
* 设置 绩效规则id
* @param ruleIdNotList
*/
public void setRuleIdNotList(List<Long> ruleIdNotList){
this.ruleIdNotList = ruleIdNotList;
}
/**
* 获取 规则名称
* @return ruleNameList
*/
* 获取 规则名称
* @return ruleNameList
*/
public List<String> getRuleNameList(){
return this.ruleNameList;
}
/**
* 设置 规则名称
* @param ruleNameList
*/
* 设置 规则名称
* @param ruleNameList
*/
public void setRuleNameList(List<String> ruleNameList){
this.ruleNameList = ruleNameList;
}
/**
* 获取 规则名称
* @return ruleNameNotList
*/
* 获取 规则名称
* @return ruleNameNotList
*/
public List<String> getRuleNameNotList(){
return this.ruleNameNotList;
}
/**
* 设置 规则名称
* @param ruleNameNotList
*/
* 设置 规则名称
* @param ruleNameNotList
*/
public void setRuleNameNotList(List<String> ruleNameNotList){
this.ruleNameNotList = ruleNameNotList;
}
/**
* 获取 开始 扣分方式(1.系统自动,2.人工添加)
* @return subMethodStart
*/
* 获取 开始 扣分方式(1.系统自动,2.人工添加)
* @return subMethodStart
*/
public Integer getSubMethodStart(){
return this.subMethodStart;
}
/**
* 设置 开始 扣分方式(1.系统自动,2.人工添加)
* @param subMethodStart
*/
* 设置 开始 扣分方式(1.系统自动,2.人工添加)
* @param subMethodStart
*/
public void setSubMethodStart(Integer subMethodStart){
this.subMethodStart = subMethodStart;
}
/**
* 获取 结束 扣分方式(1.系统自动,2.人工添加)
* @return $subMethodEnd
*/
* 获取 结束 扣分方式(1.系统自动,2.人工添加)
* @return $subMethodEnd
*/
public Integer getSubMethodEnd(){
return this.subMethodEnd;
}
/**
* 设置 结束 扣分方式(1.系统自动,2.人工添加)
* @param subMethodEnd
*/
* 设置 结束 扣分方式(1.系统自动,2.人工添加)
* @param subMethodEnd
*/
public void setSubMethodEnd(Integer subMethodEnd){
this.subMethodEnd = subMethodEnd;
}
/**
* 获取 增加 扣分方式(1.系统自动,2.人工添加)
* @return subMethodIncrement
*/
* 获取 增加 扣分方式(1.系统自动,2.人工添加)
* @return subMethodIncrement
*/
public Integer getSubMethodIncrement(){
return this.subMethodIncrement;
}
/**
* 设置 增加 扣分方式(1.系统自动,2.人工添加)
* @param subMethodIncrement
*/
* 设置 增加 扣分方式(1.系统自动,2.人工添加)
* @param subMethodIncrement
*/
public void setSubMethodIncrement(Integer subMethodIncrement){
this.subMethodIncrement = subMethodIncrement;
}
/**
* 获取 扣分方式(1.系统自动,2.人工添加)
* @return subMethodList
*/
* 获取 扣分方式(1.系统自动,2.人工添加)
* @return subMethodList
*/
public List<Integer> getSubMethodList(){
return this.subMethodList;
}
/**
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodList
*/
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodList
*/
public void setSubMethodList(List<Integer> subMethodList){
this.subMethodList = subMethodList;
}
/**
* 获取 扣分方式(1.系统自动,2.人工添加)
* @return subMethodNotList
*/
* 获取 扣分方式(1.系统自动,2.人工添加)
* @return subMethodNotList
*/
public List<Integer> getSubMethodNotList(){
return this.subMethodNotList;
}
/**
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodNotList
*/
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodNotList
*/
public void setSubMethodNotList(List<Integer> subMethodNotList){
this.subMethodNotList = subMethodNotList;
}
/**
* 获取 扣分人员
* @return deductPersonList
*/
* 获取 扣分人员
* @return deductPersonList
*/
public List<String> getDeductPersonList(){
return this.deductPersonList;
}
/**
* 设置 扣分人员
* @param deductPersonList
*/
* 设置 扣分人员
* @param deductPersonList
*/
public void setDeductPersonList(List<String> deductPersonList){
this.deductPersonList = deductPersonList;
}
/**
* 获取 扣分人员
* @return deductPersonNotList
*/
* 获取 扣分人员
* @return deductPersonNotList
*/
public List<String> getDeductPersonNotList(){
return this.deductPersonNotList;
}
/**
* 设置 扣分人员
* @param deductPersonNotList
*/
* 设置 扣分人员
* @param deductPersonNotList
*/
public void setDeductPersonNotList(List<String> deductPersonNotList){
this.deductPersonNotList = deductPersonNotList;
}
/**
* 获取 开始 扣分时间
* @return deductTimeStart
*/
* 获取 开始 扣分时间
* @return deductTimeStart
*/
public String getDeductTimeStart(){
return this.deductTimeStart;
}
/**
* 设置 开始 扣分时间
* @param deductTimeStart
*/
* 设置 开始 扣分时间
* @param deductTimeStart
*/
public void setDeductTimeStart(String deductTimeStart){
this.deductTimeStart = deductTimeStart;
}
/**
* 获取 结束 扣分时间
* @return deductTimeEnd
*/
* 获取 结束 扣分时间
* @return deductTimeEnd
*/
public String getDeductTimeEnd(){
return this.deductTimeEnd;
}
/**
* 设置 结束 扣分时间
* @param deductTimeEnd
*/
* 设置 结束 扣分时间
* @param deductTimeEnd
*/
public void setDeductTimeEnd(String deductTimeEnd){
this.deductTimeEnd = deductTimeEnd;
}
/**
* 获取 开始 扣分或增加分值
* @return scoreStart
*/
* 获取 开始 扣分或增加分值
* @return scoreStart
*/
public BigDecimal getScoreStart(){
return this.scoreStart;
}
/**
* 设置 开始 扣分或增加分值
* @param scoreStart
*/
* 设置 开始 扣分或增加分值
* @param scoreStart
*/
public void setScoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart;
}
/**
* 获取 结束 扣分或增加分值
* @return $scoreEnd
*/
* 获取 结束 扣分或增加分值
* @return $scoreEnd
*/
public BigDecimal getScoreEnd(){
return this.scoreEnd;
}
/**
* 设置 结束 扣分或增加分值
* @param scoreEnd
*/
* 设置 结束 扣分或增加分值
* @param scoreEnd
*/
public void setScoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd;
}
/**
* 获取 增加 扣分或增加分值
* @return scoreIncrement
*/
* 获取 增加 扣分或增加分值
* @return scoreIncrement
*/
public BigDecimal getScoreIncrement(){
return this.scoreIncrement;
}
/**
* 设置 增加 扣分或增加分值
* @param scoreIncrement
*/
* 设置 增加 扣分或增加分值
* @param scoreIncrement
*/
public void setScoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement;
}
/**
* 获取 扣分或增加分值
* @return scoreList
*/
* 获取 扣分或增加分值
* @return scoreList
*/
public List<BigDecimal> getScoreList(){
return this.scoreList;
}
/**
* 设置 扣分或增加分值
* @param scoreList
*/
* 设置 扣分或增加分值
* @param scoreList
*/
public void setScoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList;
}
/**
* 获取 扣分或增加分值
* @return scoreNotList
*/
* 获取 扣分或增加分值
* @return scoreNotList
*/
public List<BigDecimal> getScoreNotList(){
return this.scoreNotList;
}
/**
* 设置 扣分或增加分值
* @param scoreNotList
*/
* 设置 扣分或增加分值
* @param scoreNotList
*/
public void setScoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList;
}
/**
* 获取 核查人员
* @return checkPersonList
*/
* 获取 核查人员
* @return checkPersonList
*/
public List<String> getCheckPersonList(){
return this.checkPersonList;
}
/**
* 设置 核查人员
* @param checkPersonList
*/
* 设置 核查人员
* @param checkPersonList
*/
public void setCheckPersonList(List<String> checkPersonList){
this.checkPersonList = checkPersonList;
}
/**
* 获取 核查人员
* @return checkPersonNotList
*/
* 获取 核查人员
* @return checkPersonNotList
*/
public List<String> getCheckPersonNotList(){
return this.checkPersonNotList;
}
/**
* 设置 核查人员
* @param checkPersonNotList
*/
* 设置 核查人员
* @param checkPersonNotList
*/
public void setCheckPersonNotList(List<String> checkPersonNotList){
this.checkPersonNotList = checkPersonNotList;
}
/**
* 获取 开始 核查时间
* @return checkTimeStart
*/
* 获取 开始 核查时间
* @return checkTimeStart
*/
public String getCheckTimeStart(){
return this.checkTimeStart;
}
/**
* 设置 开始 核查时间
* @param checkTimeStart
*/
* 设置 开始 核查时间
* @param checkTimeStart
*/
public void setCheckTimeStart(String checkTimeStart){
this.checkTimeStart = checkTimeStart;
}
/**
* 获取 结束 核查时间
* @return checkTimeEnd
*/
* 获取 结束 核查时间
* @return checkTimeEnd
*/
public String getCheckTimeEnd(){
return this.checkTimeEnd;
}
/**
* 设置 结束 核查时间
* @param checkTimeEnd
*/
* 设置 结束 核查时间
* @param checkTimeEnd
*/
public void setCheckTimeEnd(String checkTimeEnd){
this.checkTimeEnd = checkTimeEnd;
}
/**
* 获取 核查说明
* @return checkDescList
*/
* 获取 核查说明
* @return checkDescList
*/
public List<String> getCheckDescList(){
return this.checkDescList;
}
/**
* 设置 核查说明
* @param checkDescList
*/
* 设置 核查说明
* @param checkDescList
*/
public void setCheckDescList(List<String> checkDescList){
this.checkDescList = checkDescList;
}
/**
* 获取 核查说明
* @return checkDescNotList
*/
* 获取 核查说明
* @return checkDescNotList
*/
public List<String> getCheckDescNotList(){
return this.checkDescNotList;
}
/**
* 设置 核查说明
* @param checkDescNotList
*/
* 设置 核查说明
* @param checkDescNotList
*/
public void setCheckDescNotList(List<String> checkDescNotList){
this.checkDescNotList = checkDescNotList;
}
/**
* 获取 核查结果
* @return checkResultList
*/
* 获取 核查结果
* @return checkResultList
*/
public List<String> getCheckResultList(){
return this.checkResultList;
}
/**
* 设置 核查结果
* @param checkResultList
*/
* 设置 核查结果
* @param checkResultList
*/
public void setCheckResultList(List<String> checkResultList){
this.checkResultList = checkResultList;
}
/**
* 获取 核查结果
* @return checkResultNotList
*/
* 获取 核查结果
* @return checkResultNotList
*/
public List<String> getCheckResultNotList(){
return this.checkResultNotList;
}
/**
* 设置 核查结果
* @param checkResultNotList
*/
* 设置 核查结果
* @param checkResultNotList
*/
public void setCheckResultNotList(List<String> checkResultNotList){
this.checkResultNotList = checkResultNotList;
}
/**
* 获取 开始 处理状态(1.未处理,2.已处理)
* @return checkStatusStart
*/
* 获取 开始 处理状态(1.未处理,2.已处理)
* @return checkStatusStart
*/
public Integer getCheckStatusStart(){
return this.checkStatusStart;
}
/**
* 设置 开始 处理状态(1.未处理,2.已处理)
* @param checkStatusStart
*/
* 设置 开始 处理状态(1.未处理,2.已处理)
* @param checkStatusStart
*/
public void setCheckStatusStart(Integer checkStatusStart){
this.checkStatusStart = checkStatusStart;
}
/**
* 获取 结束 处理状态(1.未处理,2.已处理)
* @return $checkStatusEnd
*/
* 获取 结束 处理状态(1.未处理,2.已处理)
* @return $checkStatusEnd
*/
public Integer getCheckStatusEnd(){
return this.checkStatusEnd;
}
/**
* 设置 结束 处理状态(1.未处理,2.已处理)
* @param checkStatusEnd
*/
* 设置 结束 处理状态(1.未处理,2.已处理)
* @param checkStatusEnd
*/
public void setCheckStatusEnd(Integer checkStatusEnd){
this.checkStatusEnd = checkStatusEnd;
}
/**
* 获取 增加 处理状态(1.未处理,2.已处理)
* @return checkStatusIncrement
*/
* 获取 增加 处理状态(1.未处理,2.已处理)
* @return checkStatusIncrement
*/
public Integer getCheckStatusIncrement(){
return this.checkStatusIncrement;
}
/**
* 设置 增加 处理状态(1.未处理,2.已处理)
* @param checkStatusIncrement
*/
* 设置 增加 处理状态(1.未处理,2.已处理)
* @param checkStatusIncrement
*/
public void setCheckStatusIncrement(Integer checkStatusIncrement){
this.checkStatusIncrement = checkStatusIncrement;
}
/**
* 获取 处理状态(1.未处理,2.已处理)
* @return checkStatusList
*/
* 获取 处理状态(1.未处理,2.已处理)
* @return checkStatusList
*/
public List<Integer> getCheckStatusList(){
return this.checkStatusList;
}
/**
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusList
*/
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusList
*/
public void setCheckStatusList(List<Integer> checkStatusList){
this.checkStatusList = checkStatusList;
}
/**
* 获取 处理状态(1.未处理,2.已处理)
* @return checkStatusNotList
*/
* 获取 处理状态(1.未处理,2.已处理)
* @return checkStatusNotList
*/
public List<Integer> getCheckStatusNotList(){
return this.checkStatusNotList;
}
/**
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusNotList
*/
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusNotList
*/
public void setCheckStatusNotList(List<Integer> checkStatusNotList){
this.checkStatusNotList = checkStatusNotList;
}
/**
* 获取 备注
* @return remarkList
*/
* 获取 备注
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 备注
* @param remarkList
*/
* 设置 备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 备注
* @return remarkNotList
*/
* 获取 备注
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 备注
* @param remarkNotList
*/
* 设置 备注
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/
* 设置 结束 更新时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
* 获取 附件名称,多个逗号分割
* @return fileNamesList
*/
public List<String> getFileNamesList(){
return this.fileNamesList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public void setFileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
}
/**
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
* 获取 附件名称,多个逗号分割
* @return fileNamesNotList
*/
public List<String> getFileNamesNotList(){
return this.fileNamesNotList;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
* 设置 附件名称,多个逗号分割
* @param fileNamesNotList
*/
public void setFileNamesNotList(List<String> fileNamesNotList){
this.fileNamesNotList = fileNamesNotList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
* 获取 附件下载地址,多个逗号分割
* @return filePathsList
*/
public List<String> getFilePathsList(){
return this.filePathsList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public void setFilePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
}
/**
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
* 获取 附件下载地址,多个逗号分割
* @return filePathsNotList
*/
public List<String> getFilePathsNotList(){
return this.filePathsNotList;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
* 设置 附件下载地址,多个逗号分割
* @param filePathsNotList
*/
public void setFilePathsNotList(List<String> filePathsNotList){
this.filePathsNotList = filePathsNotList;
}
/**
* 获取 开始 绩效规则分类id
* @return categoryIdStart
*/
* 获取 开始 绩效规则分类id
* @return categoryIdStart
*/
public Long getCategoryIdStart(){
return this.categoryIdStart;
}
/**
* 设置 开始 绩效规则分类id
* @param categoryIdStart
*/
* 设置 开始 绩效规则分类id
* @param categoryIdStart
*/
public void setCategoryIdStart(Long categoryIdStart){
this.categoryIdStart = categoryIdStart;
}
/**
* 获取 结束 绩效规则分类id
* @return $categoryIdEnd
*/
* 获取 结束 绩效规则分类id
* @return $categoryIdEnd
*/
public Long getCategoryIdEnd(){
return this.categoryIdEnd;
}
/**
* 设置 结束 绩效规则分类id
* @param categoryIdEnd
*/
* 设置 结束 绩效规则分类id
* @param categoryIdEnd
*/
public void setCategoryIdEnd(Long categoryIdEnd){
this.categoryIdEnd = categoryIdEnd;
}
/**
* 获取 增加 绩效规则分类id
* @return categoryIdIncrement
*/
* 获取 增加 绩效规则分类id
* @return categoryIdIncrement
*/
public Long getCategoryIdIncrement(){
return this.categoryIdIncrement;
}
/**
* 设置 增加 绩效规则分类id
* @param categoryIdIncrement
*/
* 设置 增加 绩效规则分类id
* @param categoryIdIncrement
*/
public void setCategoryIdIncrement(Long categoryIdIncrement){
this.categoryIdIncrement = categoryIdIncrement;
}
/**
* 获取 绩效规则分类id
* @return categoryIdList
*/
* 获取 绩效规则分类id
* @return categoryIdList
*/
public List<Long> getCategoryIdList(){
return this.categoryIdList;
}
/**
* 设置 绩效规则分类id
* @param categoryIdList
*/
* 设置 绩效规则分类id
* @param categoryIdList
*/
public void setCategoryIdList(List<Long> categoryIdList){
this.categoryIdList = categoryIdList;
}
/**
* 获取 绩效规则分类id
* @return categoryIdNotList
*/
* 获取 绩效规则分类id
* @return categoryIdNotList
*/
public List<Long> getCategoryIdNotList(){
return this.categoryIdNotList;
}
/**
* 设置 绩效规则分类id
* @param categoryIdNotList
*/
* 设置 绩效规则分类id
* @param categoryIdNotList
*/
public void setCategoryIdNotList(List<Long> categoryIdNotList){
this.categoryIdNotList = categoryIdNotList;
}
/**
* 获取 规则名称
* @return categoryNameList
*/
* 获取 规则名称
* @return categoryNameList
*/
public List<String> getCategoryNameList(){
return this.categoryNameList;
}
/**
* 设置 规则名称
* @param categoryNameList
*/
* 设置 规则名称
* @param categoryNameList
*/
public void setCategoryNameList(List<String> categoryNameList){
this.categoryNameList = categoryNameList;
}
/**
* 获取 规则名称
* @return categoryNameNotList
*/
* 获取 规则名称
* @return categoryNameNotList
*/
public List<String> getCategoryNameNotList(){
return this.categoryNameNotList;
}
/**
* 设置 规则名称
* @param categoryNameNotList
*/
* 设置 规则名称
* @param categoryNameNotList
*/
public void setCategoryNameNotList(List<String> categoryNameNotList){
this.categoryNameNotList = categoryNameNotList;
}
/**
* 获取 开始 增减类型(1.增加,2.扣除)
* @return subAddTypeStart
*/
* 获取 开始 增减类型(1.增加,2.扣除)
* @return subAddTypeStart
*/
public Integer getSubAddTypeStart(){
return this.subAddTypeStart;
}
/**
* 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart
*/
* 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart
*/
public void setSubAddTypeStart(Integer subAddTypeStart){
this.subAddTypeStart = subAddTypeStart;
}
/**
* 获取 结束 增减类型(1.增加,2.扣除)
* @return $subAddTypeEnd
*/
* 获取 结束 增减类型(1.增加,2.扣除)
* @return $subAddTypeEnd
*/
public Integer getSubAddTypeEnd(){
return this.subAddTypeEnd;
}
/**
* 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd
*/
* 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd
*/
public void setSubAddTypeEnd(Integer subAddTypeEnd){
this.subAddTypeEnd = subAddTypeEnd;
}
/**
* 获取 增加 增减类型(1.增加,2.扣除)
* @return subAddTypeIncrement
*/
* 获取 增加 增减类型(1.增加,2.扣除)
* @return subAddTypeIncrement
*/
public Integer getSubAddTypeIncrement(){
return this.subAddTypeIncrement;
}
/**
* 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement
*/
* 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement
*/
public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
this.subAddTypeIncrement = subAddTypeIncrement;
}
/**
* 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeList
*/
* 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeList
*/
public List<Integer> getSubAddTypeList(){
return this.subAddTypeList;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList
*/
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList
*/
public void setSubAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList;
}
/**
* 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeNotList
*/
* 获取 增减类型(1.增加,2.扣除)
* @return subAddTypeNotList
*/
public List<Integer> getSubAddTypeNotList(){
return this.subAddTypeNotList;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList
*/
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList
*/
public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
*/
* 获取 开始 审核状态(1.同意,2.不同意)
* @return auditStatusStart
*/
public Integer getAuditStatusStart(){
return this.auditStatusStart;
}
/**
* 设置 开始 审核状态(1.同意,2.不同意)
* @param auditStatusStart
*/
public void setAuditStatusStart(Integer auditStatusStart){
this.auditStatusStart = auditStatusStart;
}
/**
* 获取 结束 审核状态(1.同意,2.不同意)
* @return $auditStatusEnd
*/
public Integer getAuditStatusEnd(){
return this.auditStatusEnd;
}
/**
* 设置 结束 审核状态(1.同意,2.不同意)
* @param auditStatusEnd
*/
public void setAuditStatusEnd(Integer auditStatusEnd){
this.auditStatusEnd = auditStatusEnd;
}
/**
* 获取 增加 审核状态(1.同意,2.不同意)
* @return auditStatusIncrement
*/
public Integer getAuditStatusIncrement(){
return this.auditStatusIncrement;
}
/**
* 设置 增加 审核状态(1.同意,2.不同意)
* @param auditStatusIncrement
*/
public void setAuditStatusIncrement(Integer auditStatusIncrement){
this.auditStatusIncrement = auditStatusIncrement;
}
/**
* 获取 审核状态(1.同意,2.不同意)
* @return auditStatusList
*/
public List<Integer> getAuditStatusList(){
return this.auditStatusList;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusList
*/
public void setAuditStatusList(List<Integer> auditStatusList){
this.auditStatusList = auditStatusList;
}
/**
* 获取 审核状态(1.同意,2.不同意)
* @return auditStatusNotList
*/
public List<Integer> getAuditStatusNotList(){
return this.auditStatusNotList;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusNotList
*/
public void setAuditStatusNotList(List<Integer> auditStatusNotList){
this.auditStatusNotList = auditStatusNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
*/
public CheckGoworkRecordQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号,主键,自增长
* @param idStart
*/
setId(id);
return this;
}
/**
* 设置 开始 序号,主键,自增长
* @param idStart
*/
public CheckGoworkRecordQuery idStart(Long idStart){
this.idStart = idStart;
return this;
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号,主键,自增长
* @param idEnd
*/
* 设置 结束 序号,主键,自增长
* @param idEnd
*/
public CheckGoworkRecordQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号,主键,自增长
* @param idIncrement
*/
* 设置 增加 序号,主键,自增长
* @param idIncrement
*/
public CheckGoworkRecordQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号,主键,自增长
* @param idList
*/
* 设置 序号,主键,自增长
* @param idList
*/
public CheckGoworkRecordQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号,主键,自增长
* @param idNotList
*/
public CheckGoworkRecordQuery idNotList(List<Long> idNotList){
return this;
}
/**
* 设置 序号,主键,自增长
* @param idNotList
*/
public CheckGoworkRecordQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
}
/**
* 设置 记录ID
* @param recordId
*/
* 设置 记录ID
* @param recordId
*/
public CheckGoworkRecordQuery recordId(Long recordId){
setRecordId(recordId);
return this;
}
/**
* 设置 开始 记录ID
* @param recordIdStart
*/
setRecordId(recordId);
return this;
}
/**
* 设置 开始 记录ID
* @param recordIdStart
*/
public CheckGoworkRecordQuery recordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
return this;
this.recordIdStart = recordIdStart;
return this;
}
/**
* 设置 结束 记录ID
* @param recordIdEnd
*/
* 设置 结束 记录ID
* @param recordIdEnd
*/
public CheckGoworkRecordQuery recordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
return this;
this.recordIdEnd = recordIdEnd;
return this;
}
/**
* 设置 增加 记录ID
* @param recordIdIncrement
*/
* 设置 增加 记录ID
* @param recordIdIncrement
*/
public CheckGoworkRecordQuery recordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
return this;
this.recordIdIncrement = recordIdIncrement;
return this;
}
/**
* 设置 记录ID
* @param recordIdList
*/
* 设置 记录ID
* @param recordIdList
*/
public CheckGoworkRecordQuery recordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
return this;
}
/**
* 设置 记录ID
* @param recordIdNotList
*/
public CheckGoworkRecordQuery recordIdNotList(List<Long> recordIdNotList){
return this;
}
/**
* 设置 记录ID
* @param recordIdNotList
*/
public CheckGoworkRecordQuery recordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
return this;
}
}
/**
* 设置 员工ID
* @param staffId
*/
* 设置 员工ID
* @param staffId
*/
public CheckGoworkRecordQuery staffId(Long staffId){
setStaffId(staffId);
return this;
}
/**
* 设置 开始 员工ID
* @param staffIdStart
*/
setStaffId(staffId);
return this;
}
/**
* 设置 开始 员工ID
* @param staffIdStart
*/
public CheckGoworkRecordQuery staffIdStart(Long staffIdStart){
this.staffIdStart = staffIdStart;
return this;
this.staffIdStart = staffIdStart;
return this;
}
/**
* 设置 结束 员工ID
* @param staffIdEnd
*/
* 设置 结束 员工ID
* @param staffIdEnd
*/
public CheckGoworkRecordQuery staffIdEnd(Long staffIdEnd){
this.staffIdEnd = staffIdEnd;
return this;
this.staffIdEnd = staffIdEnd;
return this;
}
/**
* 设置 增加 员工ID
* @param staffIdIncrement
*/
* 设置 增加 员工ID
* @param staffIdIncrement
*/
public CheckGoworkRecordQuery staffIdIncrement(Long staffIdIncrement){
this.staffIdIncrement = staffIdIncrement;
return this;
this.staffIdIncrement = staffIdIncrement;
return this;
}
/**
* 设置 员工ID
* @param staffIdList
*/
* 设置 员工ID
* @param staffIdList
*/
public CheckGoworkRecordQuery staffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
return this;
}
/**
* 设置 员工ID
* @param staffIdNotList
*/
public CheckGoworkRecordQuery staffIdNotList(List<Long> staffIdNotList){
return this;
}
/**
* 设置 员工ID
* @param staffIdNotList
*/
public CheckGoworkRecordQuery staffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList;
return this;
}
}
/**
* 设置 员工姓名
* @param staffName
*/
/**
* 设置 员工姓名
* @param staffName
*/
public CheckGoworkRecordQuery staffName(String staffName){
setStaffName(staffName);
return this;
return this;
}
/**
* 设置 员工姓名
* @param staffNameList
*/
* 设置 员工姓名
* @param staffNameList
*/
public CheckGoworkRecordQuery staffNameList(List<String> staffNameList){
this.staffNameList = staffNameList;
return this;
return this;
}
/**
* 设置 工号
* @param workNum
*/
/**
* 设置 工号
* @param workNum
*/
public CheckGoworkRecordQuery workNum(String workNum){
setWorkNum(workNum);
return this;
return this;
}
/**
* 设置 工号
* @param workNumList
*/
* 设置 工号
* @param workNumList
*/
public CheckGoworkRecordQuery workNumList(List<String> workNumList){
this.workNumList = workNumList;
return this;
return this;
}
/**
* 设置 窗口编号
* @param windowNum
*/
/**
* 设置 窗口编号
* @param windowNum
*/
public CheckGoworkRecordQuery windowNum(String windowNum){
setWindowNum(windowNum);
return this;
return this;
}
/**
* 设置 窗口编号
* @param windowNumList
*/
* 设置 窗口编号
* @param windowNumList
*/
public CheckGoworkRecordQuery windowNumList(List<String> windowNumList){
this.windowNumList = windowNumList;
return this;
return this;
}
/**
* 设置 所属部门
* @param deptId
*/
* 设置 所属部门
* @param deptId
*/
public CheckGoworkRecordQuery deptId(Long deptId){
setDeptId(deptId);
return this;
}
/**
* 设置 开始 所属部门
* @param deptIdStart
*/
setDeptId(deptId);
return this;
}
/**
* 设置 开始 所属部门
* @param deptIdStart
*/
public CheckGoworkRecordQuery deptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart;
return this;
this.deptIdStart = deptIdStart;
return this;
}
/**
* 设置 结束 所属部门
* @param deptIdEnd
*/
* 设置 结束 所属部门
* @param deptIdEnd
*/
public CheckGoworkRecordQuery deptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd;
return this;
this.deptIdEnd = deptIdEnd;
return this;
}
/**
* 设置 增加 所属部门
* @param deptIdIncrement
*/
* 设置 增加 所属部门
* @param deptIdIncrement
*/
public CheckGoworkRecordQuery deptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement;
return this;
this.deptIdIncrement = deptIdIncrement;
return this;
}
/**
* 设置 所属部门
* @param deptIdList
*/
* 设置 所属部门
* @param deptIdList
*/
public CheckGoworkRecordQuery deptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList;
return this;
}
/**
* 设置 所属部门
* @param deptIdNotList
*/
public CheckGoworkRecordQuery deptIdNotList(List<Long> deptIdNotList){
return this;
}
/**
* 设置 所属部门
* @param deptIdNotList
*/
public CheckGoworkRecordQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
return this;
}
}
/**
* 设置 所属部门名称
* @param deptName
*/
/**
* 设置 所属部门名称
* @param deptName
*/
public CheckGoworkRecordQuery deptName(String deptName){
setDeptName(deptName);
return this;
return this;
}
/**
* 设置 所属部门名称
* @param deptNameList
*/
* 设置 所属部门名称
* @param deptNameList
*/
public CheckGoworkRecordQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
return this;
return this;
}
/**
* 设置 办件编码
* @param goworkCode
*/
/**
* 设置 办件编码
* @param goworkCode
*/
public CheckGoworkRecordQuery goworkCode(String goworkCode){
setGoworkCode(goworkCode);
return this;
return this;
}
/**
* 设置 办件编码
* @param goworkCodeList
*/
* 设置 办件编码
* @param goworkCodeList
*/
public CheckGoworkRecordQuery goworkCodeList(List<String> goworkCodeList){
this.goworkCodeList = goworkCodeList;
return this;
return this;
}
/**
* 设置 办件所属部门
* @param goworkDepts
*/
/**
* 设置 办件所属部门
* @param goworkDepts
*/
public CheckGoworkRecordQuery goworkDepts(String goworkDepts){
setGoworkDepts(goworkDepts);
return this;
return this;
}
/**
* 设置 办件所属部门
* @param goworkDeptsList
*/
* 设置 办件所属部门
* @param goworkDeptsList
*/
public CheckGoworkRecordQuery goworkDeptsList(List<String> goworkDeptsList){
this.goworkDeptsList = goworkDeptsList;
return this;
return this;
}
/**
* 设置 事项名称
* @param matterlName
*/
/**
* 设置 事项名称
* @param matterlName
*/
public CheckGoworkRecordQuery matterlName(String matterlName){
setMatterlName(matterlName);
return this;
return this;
}
/**
* 设置 事项名称
* @param matterlNameList
*/
* 设置 事项名称
* @param matterlNameList
*/
public CheckGoworkRecordQuery matterlNameList(List<String> matterlNameList){
this.matterlNameList = matterlNameList;
return this;
return this;
}
/**
* 设置 绩效规则id
* @param ruleId
*/
* 设置 绩效规则id
* @param ruleId
*/
public CheckGoworkRecordQuery ruleId(Long ruleId){
setRuleId(ruleId);
return this;
}
/**
* 设置 开始 绩效规则id
* @param ruleIdStart
*/
setRuleId(ruleId);
return this;
}
/**
* 设置 开始 绩效规则id
* @param ruleIdStart
*/
public CheckGoworkRecordQuery ruleIdStart(Long ruleIdStart){
this.ruleIdStart = ruleIdStart;
return this;
this.ruleIdStart = ruleIdStart;
return this;
}
/**
* 设置 结束 绩效规则id
* @param ruleIdEnd
*/
* 设置 结束 绩效规则id
* @param ruleIdEnd
*/
public CheckGoworkRecordQuery ruleIdEnd(Long ruleIdEnd){
this.ruleIdEnd = ruleIdEnd;
return this;
this.ruleIdEnd = ruleIdEnd;
return this;
}
/**
* 设置 增加 绩效规则id
* @param ruleIdIncrement
*/
* 设置 增加 绩效规则id
* @param ruleIdIncrement
*/
public CheckGoworkRecordQuery ruleIdIncrement(Long ruleIdIncrement){
this.ruleIdIncrement = ruleIdIncrement;
return this;
this.ruleIdIncrement = ruleIdIncrement;
return this;
}
/**
* 设置 绩效规则id
* @param ruleIdList
*/
* 设置 绩效规则id
* @param ruleIdList
*/
public CheckGoworkRecordQuery ruleIdList(List<Long> ruleIdList){
this.ruleIdList = ruleIdList;
return this;
}
/**
* 设置 绩效规则id
* @param ruleIdNotList
*/
public CheckGoworkRecordQuery ruleIdNotList(List<Long> ruleIdNotList){
return this;
}
/**
* 设置 绩效规则id
* @param ruleIdNotList
*/
public CheckGoworkRecordQuery ruleIdNotList(List<Long> ruleIdNotList){
this.ruleIdNotList = ruleIdNotList;
return this;
}
}
/**
* 设置 规则名称
* @param ruleName
*/
/**
* 设置 规则名称
* @param ruleName
*/
public CheckGoworkRecordQuery ruleName(String ruleName){
setRuleName(ruleName);
return this;
return this;
}
/**
* 设置 规则名称
* @param ruleNameList
*/
* 设置 规则名称
* @param ruleNameList
*/
public CheckGoworkRecordQuery ruleNameList(List<String> ruleNameList){
this.ruleNameList = ruleNameList;
return this;
return this;
}
/**
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethod
*/
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethod
*/
public CheckGoworkRecordQuery subMethod(Integer subMethod){
setSubMethod(subMethod);
return this;
}
/**
* 设置 开始 扣分方式(1.系统自动,2.人工添加)
* @param subMethodStart
*/
setSubMethod(subMethod);
return this;
}
/**
* 设置 开始 扣分方式(1.系统自动,2.人工添加)
* @param subMethodStart
*/
public CheckGoworkRecordQuery subMethodStart(Integer subMethodStart){
this.subMethodStart = subMethodStart;
return this;
this.subMethodStart = subMethodStart;
return this;
}
/**
* 设置 结束 扣分方式(1.系统自动,2.人工添加)
* @param subMethodEnd
*/
* 设置 结束 扣分方式(1.系统自动,2.人工添加)
* @param subMethodEnd
*/
public CheckGoworkRecordQuery subMethodEnd(Integer subMethodEnd){
this.subMethodEnd = subMethodEnd;
return this;
this.subMethodEnd = subMethodEnd;
return this;
}
/**
* 设置 增加 扣分方式(1.系统自动,2.人工添加)
* @param subMethodIncrement
*/
* 设置 增加 扣分方式(1.系统自动,2.人工添加)
* @param subMethodIncrement
*/
public CheckGoworkRecordQuery subMethodIncrement(Integer subMethodIncrement){
this.subMethodIncrement = subMethodIncrement;
return this;
this.subMethodIncrement = subMethodIncrement;
return this;
}
/**
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodList
*/
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodList
*/
public CheckGoworkRecordQuery subMethodList(List<Integer> subMethodList){
this.subMethodList = subMethodList;
return this;
}
/**
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodNotList
*/
public CheckGoworkRecordQuery subMethodNotList(List<Integer> subMethodNotList){
return this;
}
/**
* 设置 扣分方式(1.系统自动,2.人工添加)
* @param subMethodNotList
*/
public CheckGoworkRecordQuery subMethodNotList(List<Integer> subMethodNotList){
this.subMethodNotList = subMethodNotList;
return this;
}
}
/**
* 设置 扣分人员
* @param deductPerson
*/
/**
* 设置 扣分人员
* @param deductPerson
*/
public CheckGoworkRecordQuery deductPerson(String deductPerson){
setDeductPerson(deductPerson);
return this;
return this;
}
/**
* 设置 扣分人员
* @param deductPersonList
*/
* 设置 扣分人员
* @param deductPersonList
*/
public CheckGoworkRecordQuery deductPersonList(List<String> deductPersonList){
this.deductPersonList = deductPersonList;
return this;
return this;
}
/**
* 设置 扣分或增加分值
* @param score
*/
* 设置 扣分或增加分值
* @param score
*/
public CheckGoworkRecordQuery score(BigDecimal score){
setScore(score);
return this;
}
/**
* 设置 开始 扣分或增加分值
* @param scoreStart
*/
setScore(score);
return this;
}
/**
* 设置 开始 扣分或增加分值
* @param scoreStart
*/
public CheckGoworkRecordQuery scoreStart(BigDecimal scoreStart){
this.scoreStart = scoreStart;
return this;
this.scoreStart = scoreStart;
return this;
}
/**
* 设置 结束 扣分或增加分值
* @param scoreEnd
*/
* 设置 结束 扣分或增加分值
* @param scoreEnd
*/
public CheckGoworkRecordQuery scoreEnd(BigDecimal scoreEnd){
this.scoreEnd = scoreEnd;
return this;
this.scoreEnd = scoreEnd;
return this;
}
/**
* 设置 增加 扣分或增加分值
* @param scoreIncrement
*/
* 设置 增加 扣分或增加分值
* @param scoreIncrement
*/
public CheckGoworkRecordQuery scoreIncrement(BigDecimal scoreIncrement){
this.scoreIncrement = scoreIncrement;
return this;
this.scoreIncrement = scoreIncrement;
return this;
}
/**
* 设置 扣分或增加分值
* @param scoreList
*/
* 设置 扣分或增加分值
* @param scoreList
*/
public CheckGoworkRecordQuery scoreList(List<BigDecimal> scoreList){
this.scoreList = scoreList;
return this;
}
/**
* 设置 扣分或增加分值
* @param scoreNotList
*/
public CheckGoworkRecordQuery scoreNotList(List<BigDecimal> scoreNotList){
return this;
}
/**
* 设置 扣分或增加分值
* @param scoreNotList
*/
public CheckGoworkRecordQuery scoreNotList(List<BigDecimal> scoreNotList){
this.scoreNotList = scoreNotList;
return this;
}
}
/**
* 设置 核查人员
* @param checkPerson
*/
/**
* 设置 核查人员
* @param checkPerson
*/
public CheckGoworkRecordQuery checkPerson(String checkPerson){
setCheckPerson(checkPerson);
return this;
return this;
}
/**
* 设置 核查人员
* @param checkPersonList
*/
* 设置 核查人员
* @param checkPersonList
*/
public CheckGoworkRecordQuery checkPersonList(List<String> checkPersonList){
this.checkPersonList = checkPersonList;
return this;
return this;
}
/**
* 设置 核查说明
* @param checkDesc
*/
/**
* 设置 核查说明
* @param checkDesc
*/
public CheckGoworkRecordQuery checkDesc(String checkDesc){
setCheckDesc(checkDesc);
return this;
return this;
}
/**
* 设置 核查说明
* @param checkDescList
*/
* 设置 核查说明
* @param checkDescList
*/
public CheckGoworkRecordQuery checkDescList(List<String> checkDescList){
this.checkDescList = checkDescList;
return this;
return this;
}
/**
* 设置 核查结果
* @param checkResult
*/
/**
* 设置 核查结果
* @param checkResult
*/
public CheckGoworkRecordQuery checkResult(String checkResult){
setCheckResult(checkResult);
return this;
return this;
}
/**
* 设置 核查结果
* @param checkResultList
*/
* 设置 核查结果
* @param checkResultList
*/
public CheckGoworkRecordQuery checkResultList(List<String> checkResultList){
this.checkResultList = checkResultList;
return this;
return this;
}
/**
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatus
*/
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatus
*/
public CheckGoworkRecordQuery checkStatus(Integer checkStatus){
setCheckStatus(checkStatus);
return this;
}
/**
* 设置 开始 处理状态(1.未处理,2.已处理)
* @param checkStatusStart
*/
setCheckStatus(checkStatus);
return this;
}
/**
* 设置 开始 处理状态(1.未处理,2.已处理)
* @param checkStatusStart
*/
public CheckGoworkRecordQuery checkStatusStart(Integer checkStatusStart){
this.checkStatusStart = checkStatusStart;
return this;
this.checkStatusStart = checkStatusStart;
return this;
}
/**
* 设置 结束 处理状态(1.未处理,2.已处理)
* @param checkStatusEnd
*/
* 设置 结束 处理状态(1.未处理,2.已处理)
* @param checkStatusEnd
*/
public CheckGoworkRecordQuery checkStatusEnd(Integer checkStatusEnd){
this.checkStatusEnd = checkStatusEnd;
return this;
this.checkStatusEnd = checkStatusEnd;
return this;
}
/**
* 设置 增加 处理状态(1.未处理,2.已处理)
* @param checkStatusIncrement
*/
* 设置 增加 处理状态(1.未处理,2.已处理)
* @param checkStatusIncrement
*/
public CheckGoworkRecordQuery checkStatusIncrement(Integer checkStatusIncrement){
this.checkStatusIncrement = checkStatusIncrement;
return this;
this.checkStatusIncrement = checkStatusIncrement;
return this;
}
/**
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusList
*/
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusList
*/
public CheckGoworkRecordQuery checkStatusList(List<Integer> checkStatusList){
this.checkStatusList = checkStatusList;
return this;
}
/**
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusNotList
*/
public CheckGoworkRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){
return this;
}
/**
* 设置 处理状态(1.未处理,2.已处理)
* @param checkStatusNotList
*/
public CheckGoworkRecordQuery checkStatusNotList(List<Integer> checkStatusNotList){
this.checkStatusNotList = checkStatusNotList;
return this;
}
}
/**
* 设置 备注
* @param remark
*/
/**
* 设置 备注
* @param remark
*/
public CheckGoworkRecordQuery remark(String remark){
setRemark(remark);
return this;
return this;
}
/**
* 设置 备注
* @param remarkList
*/
* 设置 备注
* @param remarkList
*/
public CheckGoworkRecordQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
* 设置 创建用户
* @param createUserId
*/
public CheckGoworkRecordQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public CheckGoworkRecordQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public CheckGoworkRecordQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public CheckGoworkRecordQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
* 设置 创建用户
* @param createUserIdList
*/
public CheckGoworkRecordQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public CheckGoworkRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public CheckGoworkRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
}
/**
* 设置 更新用户
* @param updateUserId
*/
* 设置 更新用户
* @param updateUserId
*/
public CheckGoworkRecordQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public CheckGoworkRecordQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public CheckGoworkRecordQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public CheckGoworkRecordQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
* 设置 更新用户
* @param updateUserIdList
*/
public CheckGoworkRecordQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public CheckGoworkRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public CheckGoworkRecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
/**
* 设置 附件名称,多个逗号分割
* @param fileNames
*/
public CheckGoworkRecordQuery fileNames(String fileNames){
setFileNames(fileNames);
return this;
return this;
}
/**
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
* 设置 附件名称,多个逗号分割
* @param fileNamesList
*/
public CheckGoworkRecordQuery fileNamesList(List<String> fileNamesList){
this.fileNamesList = fileNamesList;
return this;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
/**
* 设置 附件下载地址,多个逗号分割
* @param filePaths
*/
public CheckGoworkRecordQuery filePaths(String filePaths){
setFilePaths(filePaths);
return this;
return this;
}
/**
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
* 设置 附件下载地址,多个逗号分割
* @param filePathsList
*/
public CheckGoworkRecordQuery filePathsList(List<String> filePathsList){
this.filePathsList = filePathsList;
return this;
return this;
}
/**
* 设置 绩效规则分类id
* @param categoryId
*/
* 设置 绩效规则分类id
* @param categoryId
*/
public CheckGoworkRecordQuery categoryId(Long categoryId){
setCategoryId(categoryId);
return this;
}
/**
* 设置 开始 绩效规则分类id
* @param categoryIdStart
*/
setCategoryId(categoryId);
return this;
}
/**
* 设置 开始 绩效规则分类id
* @param categoryIdStart
*/
public CheckGoworkRecordQuery categoryIdStart(Long categoryIdStart){
this.categoryIdStart = categoryIdStart;
return this;
this.categoryIdStart = categoryIdStart;
return this;
}
/**
* 设置 结束 绩效规则分类id
* @param categoryIdEnd
*/
* 设置 结束 绩效规则分类id
* @param categoryIdEnd
*/
public CheckGoworkRecordQuery categoryIdEnd(Long categoryIdEnd){
this.categoryIdEnd = categoryIdEnd;
return this;
this.categoryIdEnd = categoryIdEnd;
return this;
}
/**
* 设置 增加 绩效规则分类id
* @param categoryIdIncrement
*/
* 设置 增加 绩效规则分类id
* @param categoryIdIncrement
*/
public CheckGoworkRecordQuery categoryIdIncrement(Long categoryIdIncrement){
this.categoryIdIncrement = categoryIdIncrement;
return this;
this.categoryIdIncrement = categoryIdIncrement;
return this;
}
/**
* 设置 绩效规则分类id
* @param categoryIdList
*/
* 设置 绩效规则分类id
* @param categoryIdList
*/
public CheckGoworkRecordQuery categoryIdList(List<Long> categoryIdList){
this.categoryIdList = categoryIdList;
return this;
}
/**
* 设置 绩效规则分类id
* @param categoryIdNotList
*/
public CheckGoworkRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
return this;
}
/**
* 设置 绩效规则分类id
* @param categoryIdNotList
*/
public CheckGoworkRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
this.categoryIdNotList = categoryIdNotList;
return this;
}
}
/**
* 设置 规则名称
* @param categoryName
*/
/**
* 设置 规则名称
* @param categoryName
*/
public CheckGoworkRecordQuery categoryName(String categoryName){
setCategoryName(categoryName);
return this;
return this;
}
/**
* 设置 规则名称
* @param categoryNameList
*/
* 设置 规则名称
* @param categoryNameList
*/
public CheckGoworkRecordQuery categoryNameList(List<String> categoryNameList){
this.categoryNameList = categoryNameList;
return this;
return this;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddType
*/
* 设置 增减类型(1.增加,2.扣除)
* @param subAddType
*/
public CheckGoworkRecordQuery subAddType(Integer subAddType){
setSubAddType(subAddType);
return this;
}
/**
* 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart
*/
setSubAddType(subAddType);
return this;
}
/**
* 设置 开始 增减类型(1.增加,2.扣除)
* @param subAddTypeStart
*/
public CheckGoworkRecordQuery subAddTypeStart(Integer subAddTypeStart){
this.subAddTypeStart = subAddTypeStart;
return this;
this.subAddTypeStart = subAddTypeStart;
return this;
}
/**
* 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd
*/
* 设置 结束 增减类型(1.增加,2.扣除)
* @param subAddTypeEnd
*/
public CheckGoworkRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
this.subAddTypeEnd = subAddTypeEnd;
return this;
this.subAddTypeEnd = subAddTypeEnd;
return this;
}
/**
* 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement
*/
* 设置 增加 增减类型(1.增加,2.扣除)
* @param subAddTypeIncrement
*/
public CheckGoworkRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
this.subAddTypeIncrement = subAddTypeIncrement;
return this;
this.subAddTypeIncrement = subAddTypeIncrement;
return this;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList
*/
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeList
*/
public CheckGoworkRecordQuery subAddTypeList(List<Integer> subAddTypeList){
this.subAddTypeList = subAddTypeList;
return this;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList
*/
public CheckGoworkRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
return this;
}
/**
* 设置 增减类型(1.增加,2.扣除)
* @param subAddTypeNotList
*/
public CheckGoworkRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
this.subAddTypeNotList = subAddTypeNotList;
return this;
}
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatus
*/
public CheckGoworkRecordQuery auditStatus(Integer auditStatus){
setAuditStatus(auditStatus);
return this;
}
/**
* 设置 开始 审核状态(1.同意,2.不同意)
* @param auditStatusStart
*/
public CheckGoworkRecordQuery auditStatusStart(Integer auditStatusStart){
this.auditStatusStart = auditStatusStart;
return this;
}
/**
* 设置 结束 审核状态(1.同意,2.不同意)
* @param auditStatusEnd
*/
public CheckGoworkRecordQuery auditStatusEnd(Integer auditStatusEnd){
this.auditStatusEnd = auditStatusEnd;
return this;
}
/**
* 设置 增加 审核状态(1.同意,2.不同意)
* @param auditStatusIncrement
*/
public CheckGoworkRecordQuery auditStatusIncrement(Integer auditStatusIncrement){
this.auditStatusIncrement = auditStatusIncrement;
return this;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusList
*/
public CheckGoworkRecordQuery auditStatusList(List<Integer> auditStatusList){
this.auditStatusList = auditStatusList;
return this;
}
/**
* 设置 审核状态(1.同意,2.不同意)
* @param auditStatusNotList
*/
public CheckGoworkRecordQuery auditStatusNotList(List<Integer> auditStatusNotList){
this.auditStatusNotList = auditStatusNotList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<CheckGoworkRecordQuery> getOrConditionList(){
return this.orConditionList;
return this.orConditionList;
}
/**
* 设置 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
* 设置 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<CheckGoworkRecordQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
* 获取 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<CheckGoworkRecordQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
* 设置 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<CheckGoworkRecordQuery> andConditionList){
this.andConditionList = andConditionList;
}
......
......@@ -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.model.BaseEntityLong;
......@@ -12,7 +15,7 @@ import lombok.Data;
* 其它绩效核查信息实体对象
*
* @author zxfei
* @date 2023-07-17
* @date 2023-07-27
*/
@Data
public class CheckOtherRecordEntity extends CheckOtherRecordVo {
......@@ -53,7 +56,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/**
* 违规类型(1.工作纪律)
*/
@Excel(name = "违规类型", readConverterExp = "1=工作纪律")
@Excel(name = "违规类型", readConverterExp = "违规类型(1.工作纪律)")
private Integer irregularOtherType;
/**
* 发生时间
......@@ -145,6 +148,10 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
*/
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -162,61 +169,34 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
}
public void initAttrValue(){
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.deptId = null;
this.deptId = 0L;
this.deptName = "";
this.windowNum = "";
this.irregularOtherType = 1;
this.happenTime = null;
this.irregularOtherType = 0;
this.happenTime = new Date();
this.duration = 0;
this.ruleId = 0L;
this.ruleName = "";
this.ruleDesc = "";
this.subMethod = 1;
this.deductPerson = "";
this.deductTime = null;
this.score = BigDecimal.valueOf(0.00);
this.deductTime = new Date();
this.score = BigDecimal.ZERO;
this.checkPerson = "";
this.checkTime = null;
this.checkTime = new Date();
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = null;
this.categoryId = 0L;
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
}
}
\ No newline at end of file
......@@ -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.model.BaseEntityLong;
......@@ -12,7 +15,7 @@ import lombok.Data;
* 评价差评绩效核查信息实体对象
*
* @author zxfei
* @date 2023-07-17
* @date 2023-07-27
*/
@Data
public class CheckReviewRecordEntity extends CheckReviewRecordVo {
......@@ -63,7 +66,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/
@Excel(name = "评价来源", readConverterExp = "评价来源")
@Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource;
/**
* 评价设备
......@@ -147,6 +150,10 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
*/
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -164,61 +171,34 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
}
public void initAttrValue(){
this.recordId = 0L;
this.staffId = 0L;
this.staffName = "";
this.workNum = "";
this.windowNum = "";
this.deptId = 0L;
this.deptName = "";
this.reviewResult = 1;
this.reviewTime = null;
this.reviewResult = 0;
this.reviewTime = new Date();
this.reviewSource = "";
this.reviewDevice = "";
this.ruleId = 0L;
this.ruleName = "";
this.subMethod = 1;
this.deductPerson = "";
this.deductTime = null;
this.score = BigDecimal.valueOf(0.00);
this.deductTime = new Date();
this.score = BigDecimal.ZERO;
this.checkPerson = "";
this.checkTime = null;
this.checkTime = new Date();
this.checkDesc = "";
this.checkResult = "";
this.checkStatus = 1;
this.remark = "";
this.fileNames = "";
this.filePaths = "";
this.categoryId = 0L;
this.categoryName = "";
this.subAddType = 1;
this.auditStatus = 1;
}
}
\ No newline at end of file
......@@ -20,4 +20,8 @@ public class CheckAttendRecordVo extends BaseEntityLong {
/** 结束 创建时间 */
private String createTimeEnd;
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -20,4 +20,8 @@ public class CheckComplainRecordVo extends BaseEntityLong {
/** 结束 创建时间 */
private String createTimeEnd;
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -20,4 +20,8 @@ public class CheckEffectRecordVo extends BaseEntityLong {
/** 结束 创建时间 */
private String createTimeEnd;
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -20,4 +20,8 @@ public class CheckGoworkRecordVo extends BaseEntityLong {
/** 结束 创建时间 */
private String createTimeEnd;
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -20,4 +20,8 @@ public class CheckOtherRecordVo extends BaseEntityLong {
/** 结束 创建时间 */
private String createTimeEnd;
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -20,4 +20,7 @@ public class CheckReviewRecordVo extends BaseEntityLong {
/** 结束 创建时间 */
private String createTimeEnd;
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -10,11 +10,9 @@ import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.util.ThreadPool;
import com.mortals.xhx.base.system.message.MessageService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.utils.AttendPostServiceThread;
import com.mortals.xhx.common.utils.AuditUtil;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
......@@ -106,7 +104,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
/* AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
ThreadPool.getInstance().execute(attendPostServiceThread);*/
sendCheckDingTalk(entity);
// sendCheckDingTalk(entity);
}
try {
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
......@@ -155,6 +153,11 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName());
}
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
......@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.AuditUtil;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
......@@ -102,11 +103,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
@Override
protected void saveAfter(CheckComplainRecordEntity entity, Context context) throws AppException {
//发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
try {
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
query.setStaffId(entity.getStaffId());
......@@ -156,6 +153,9 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName());
}
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
......@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.AuditUtil;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
......@@ -156,6 +157,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName());
}
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
......@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.AuditUtil;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
......@@ -102,11 +103,6 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
@Override
protected void saveAfter(CheckGoworkRecordEntity entity, Context context) throws AppException {
//发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
try{
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
query.setStaffId(entity.getStaffId());
......@@ -154,6 +150,9 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName());
}
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
......@@ -10,6 +10,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.AuditUtil;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
......@@ -102,11 +103,6 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
@Override
protected void saveAfter(CheckOtherRecordEntity entity, Context context) throws AppException {
//发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
try {
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
query.setStaffId(entity.getStaffId());
......@@ -158,6 +154,9 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName());
}
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
......@@ -10,6 +10,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.AuditUtil;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
......@@ -115,11 +116,6 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
log.error("汇总已审核的核查记录出错", e);
}
//发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
}
private void sendCheckDingTalk(CheckReviewRecordEntity entity) {
......@@ -159,6 +155,9 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName());
}
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
......@@ -53,9 +53,6 @@ public class DeptTreeSelect implements Serializable {
this.personNum = entity.getPersonNum();
if (!ObjectUtils.isEmpty(entity.getChildren())) {
this.children = entity.getChildren().stream().map(DeptTreeSelect::new).collect(Collectors.toList());
int sum = entity.getChildren().stream().mapToInt(i -> i.getPersonNum()).sum();
this.personNum = this.personNum + sum;
}
this.personList = entity.getPersonList();
......
package com.mortals.xhx.module.dept.service;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.dept.dao.DeptDao;
......@@ -6,54 +8,61 @@ import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptTreeSelect;
import java.util.List;
/**
* DeptService
*
* 部门信息 service接口
*
* @author zxfei
* @date 2023-03-06
*/
public interface DeptService extends ICRUDService<DeptEntity,Long>{
* DeptService
* <p>
* 部门信息 service接口
*
* @author zxfei
* @date 2023-03-06
*/
public interface DeptService extends ICRUDService<DeptEntity, Long> {
DeptDao getDao();
/**
* 是否存在部门信息节点
*
* @param deptId 部门信息ID
* @return 结果
*/
* 是否存在部门信息节点
*
* @param deptId 部门信息ID
* @return 结果
*/
boolean hasChildByDeptId(Long deptId);
/**
* 查询部门信息数据
*
* @param dept 部门信息
* @return 部门信息集合
*/
* 查询部门信息数据
*
* @param dept 部门信息
* @return 部门信息集合
*/
List<DeptEntity> selectDeptList(DeptEntity dept);
/**
* 构建前端所需要下拉树结构
*
* @param deptList 部门信息列表
* @return 下拉树结构列表
*/
* 构建前端所需要下拉树结构
*
* @param deptList 部门信息列表
* @return 下拉树结构列表
*/
List<DeptTreeSelect> buildDeptTreeSelect(List<DeptEntity> deptList);
/**
* 根据父id查询子节点
* @param parentId
* @param context
* @return
*/
List<DeptTreeSelect> getListByParentId(Long parentId,Context context);
* 根据父id查询子节点
*
* @param parentId
* @param context
* @return
*/
List<DeptTreeSelect> getListByParentId(Long parentId, Context context);
/**
* 更新部门人员数量
*
* @param context
*/
Rest<Void> updateDeptNum(Context context);
}
\ No newline at end of file
package com.mortals.xhx.module.dept.service.impl;
import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.code.EnableEnum;
import com.mortals.xhx.common.code.EnabledEnum;
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.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.exception.AppException;
......@@ -28,6 +30,7 @@ import java.util.stream.Collectors;
* @date 2023-03-06
*/
@Service("deptService")
@Slf4j
public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity, Long> implements DeptService {
@Autowired
......@@ -208,5 +211,49 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
return collect;
}
@Override
public Rest<Void> updateDeptNum(Context context) {
log.info("更新部门用户数量");
Map<Long, Long> collect = staffService.find(new StaffQuery()).stream().collect(Collectors.groupingBy(x -> x.getDeptId(), Collectors.counting()));
DeptEntity deptEntity1 = new DeptEntity();
deptEntity1.setPersonNum(0);
this.getDao().update(deptEntity1, new HashMap<>());
collect.entrySet().stream().forEach(item -> {
Long deptId = item.getKey();
Long count = item.getValue();
log.info("deptId:{},num:{}", deptId, count);
DeptEntity deptEntity = this.get(deptId);
if (!ObjectUtils.isEmpty(deptEntity)) {
deptEntity.setPersonNum(count.intValue());
this.update(deptEntity);
}
});
for (Map.Entry<Long, Long> item : collect.entrySet()) {
Long deptId = item.getKey();
if (deptId == null) continue;
DeptEntity deptEntity = this.get(deptId);
if (!ObjectUtils.isEmpty(deptEntity)) {
//查询当前父节点的所有子部门
DeptQuery deptQuery = new DeptQuery();
deptQuery.setParentId(deptEntity.getParentId());
int sum = this.find(new DeptQuery().parentId(deptEntity.getParentId())).stream().map(i -> i.getPersonNum()).reduce(0, Integer::sum);
DeptEntity parentDept = this.get(deptEntity.getParentId());
if (!ObjectUtils.isEmpty(parentDept)) {
log.info("parentDept:{},sum:{}", parentDept.getDeptName(), sum);
parentDept.setPersonNum(sum);
this.update(parentDept);
}
}else {
log.info("deptEntity is null.deptId:{}",item.getKey());
}
}
return Rest.ok();
}
}
......@@ -170,11 +170,11 @@ public class StaffEntity extends StaffVo {
this.politicalstatus = 1;
this.deptId = -1L;
this.deptId = null;
this.deptName = "";
this.positionId = -1L;
this.positionId = null;
this.positionName = "";
......
package com.mortals.xhx.module.staff.service;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDCacheService;
import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
......@@ -17,7 +18,7 @@ import java.util.List;
public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
//查询所有数据
StaffInfoVo queryAll();
StaffInfoVo queryAll(Context context);
//统计所有在职员工
int queryAllPerson();
}
\ No newline at end of file
......@@ -10,6 +10,7 @@ import com.mortals.xhx.base.system.role.service.RoleUserService;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.staff.dao.StaffDao;
import com.mortals.xhx.module.staff.dao.ibatis.StaffDaoImpl;
import com.mortals.xhx.module.staff.dao.ibatis.StaffLeaveDaoImpl;
......@@ -39,6 +40,8 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
@Autowired
private UserService userService;
@Autowired
private DeptService deptService;
@Autowired
private RoleUserService roleUserService;
......@@ -53,13 +56,13 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
@Override
protected void saveBefore(StaffEntity entity, Context context) throws AppException {
int count = this.count(new StaffQuery().workNum(entity.getWorkNum()), context);
if(count>0){
if (count > 0) {
throw new AppException("工号重复!");
}
}
@Override
public StaffInfoVo queryAll() {
public StaffInfoVo queryAll(Context context) {
StaffInfoVo staffInfoVo = new StaffInfoVo();
//在职
StaffQuery staffQuery = new StaffQuery();
......@@ -133,9 +136,12 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
}
public static void main(String[] args) {
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
deptService.updateDeptNum(context);
}
public static void main(String[] args) {
System.out.println("1" + StrUtil.padPre("125", 7, "0"));
}
......
......@@ -26,15 +26,14 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
*
* 员工基本信息
*
* @author zxfei
* @date 2023-04-07
*/
* 员工基本信息
*
* @author zxfei
* @date 2023-04-07
*/
@RestController
@RequestMapping("staff")
public class StaffController extends BaseCRUDJsonBodyMappingController<StaffService,StaffEntity,Long> {
public class StaffController extends BaseCRUDJsonBodyMappingController<StaffService, StaffEntity, Long> {
@Autowired
private ParamService paramService;
......@@ -43,20 +42,21 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
@Autowired
private DeptService deptService;
public StaffController(){
super.setModuleDesc( "员工基本信息");
public StaffController() {
super.setModuleDesc("员工基本信息");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "gender", paramService.getParamBySecondOrganize("Staff","gender"));
this.addDict(model, "politicalstatus", paramService.getParamBySecondOrganize("Staff","politicalstatus"));
this.addDict(model, "staffType", paramService.getParamBySecondOrganize("Staff","staffType"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("Staff","status"));
this.addDict(model, "positionId", jobService.queryPositionName(new JobQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getJobName(),(o,n)->n)));
this.addDict(model, "gender", paramService.getParamBySecondOrganize("Staff", "gender"));
this.addDict(model, "politicalstatus", paramService.getParamBySecondOrganize("Staff", "politicalstatus"));
this.addDict(model, "staffType", paramService.getParamBySecondOrganize("Staff", "staffType"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("Staff", "status"));
this.addDict(model, "positionId", jobService.queryPositionName(new JobQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getJobName(), (o, n) -> n)));
List<DeptEntity> list = deptService.find(new DeptQuery());
List<DeptTreeSelect> treeSelects = deptService.buildDeptTreeSelect(list);
this.addDict(model,"deptPerson",treeSelects);
this.addDict(model, "deptPerson", treeSelects);
this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
......@@ -68,7 +68,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
@Override
protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException {
//todo 员工信息统计--员工关系统计
StaffInfoVo staffInfoVo = this.service.queryAll();
StaffInfoVo staffInfoVo = this.service.queryAll(context);
staffInfoVo.setRefreshDate(new Date());
model.put("staff", staffInfoVo);
return super.doListAfter(query, model, context);
......@@ -79,7 +79,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
protected int infoAfter(Long id, Map<String, Object> model, StaffEntity entity, Context context) throws AppException {
//todo 员工统计信息
List<HolidayListVo> holidayListVos = new ArrayList<>();
HolidayListVo vo =new HolidayListVo();
HolidayListVo vo = new HolidayListVo();
StaffEntity staffEntity = this.service.get(id);
vo.setWorkName(staffEntity.getName());
vo.setWorkStatus(String.valueOf(staffEntity.getStatus()));
......@@ -99,9 +99,19 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
vo.setPaternityLeaveDay("10");
holidayListVos.add(vo);
entity.setHolidayLists(holidayListVos);
// StaffEntity cache = this.service.getCache(entity.getWorkNum());
// StaffEntity cache = this.service.getCache(entity.getWorkNum());
return super.infoAfter(id, model, entity, context);
}
@Override
protected int saveAfter(StaffEntity entity, Map<String, Object> model, Context context) throws AppException {
deptService.updateDeptNum(context);
return super.saveAfter(entity, model, context);
}
@Override
public String delete(Long[] id) {
return super.delete(id);
}
}
......@@ -41,6 +41,7 @@
<result property="deductPerson" column="deductPerson" />
<result property="deductTime" column="deductTime" />
<result property="windowNum" column="windowNum" />
<result property="auditStatus" column="auditStatus" />
</resultMap>
......@@ -156,23 +157,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowNum') or colPickMode == 1 and data.containsKey('windowNum')))">
a.windowNum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('auditStatus') or colPickMode == 1 and data.containsKey('auditStatus')))">
a.auditStatus,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckAttendRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_attend_record
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName,deductPerson,deductTime,windowNum)
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName,deductPerson,deductTime,windowNum,auditStatus)
VALUES
(#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod},#{remark},#{fileNames},#{filePaths},#{categoryId},#{categoryName},#{deductPerson},#{deductTime},#{windowNum})
(#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod},#{remark},#{fileNames},#{filePaths},#{categoryId},#{categoryName},#{deductPerson},#{deductTime},#{windowNum},#{auditStatus})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_attend_record
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName,deductPerson,deductTime,windowNum)
(recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName,deductPerson,deductTime,windowNum,auditStatus)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod},#{item.remark},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName},#{item.deductPerson},#{item.deductTime},#{item.windowNum})
(#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod},#{item.remark},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName},#{item.deductPerson},#{item.deductTime},#{item.windowNum},#{item.auditStatus})
</foreach>
</insert>
......@@ -323,6 +327,12 @@
<if test="(colPickMode==0 and data.containsKey('windowNum')) or (colPickMode==1 and !data.containsKey('windowNum'))">
a.windowNum=#{data.windowNum},
</if>
<if test="(colPickMode==0 and data.containsKey('auditStatus')) or (colPickMode==1 and !data.containsKey('auditStatus'))">
a.auditStatus=#{data.auditStatus},
</if>
<if test="(colPickMode==0 and data.containsKey('auditStatusIncrement')) or (colPickMode==1 and !data.containsKey('auditStatusIncrement'))">
a.auditStatus=ifnull(a.auditStatus,0) + #{data.auditStatusIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -640,6 +650,18 @@
</if>
</foreach>
</trim>
<trim prefix="auditStatus=(case" suffix="ELSE auditStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('auditStatus')) or (colPickMode==1 and !item.containsKey('auditStatus'))">
when a.id=#{item.id} then #{item.auditStatus}
</when>
<when test="(colPickMode==0 and item.containsKey('auditStatusIncrement')) or (colPickMode==1 and !item.containsKey('auditStatusIncrement'))">
when a.id=#{item.id} then ifnull(a.auditStatus,0) + #{item.auditStatusIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1548,6 +1570,33 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('auditStatus')">
<if test="conditionParamRef.auditStatus != null ">
${_conditionType_} a.auditStatus = #{${_conditionParam_}.auditStatus}
</if>
<if test="conditionParamRef.auditStatus == null">
${_conditionType_} a.auditStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('auditStatusList') and conditionParamRef.auditStatusList.size() > 0">
${_conditionType_} a.auditStatus in
<foreach collection="conditionParamRef.auditStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('auditStatusNotList') and conditionParamRef.auditStatusNotList.size() > 0">
${_conditionType_} a.auditStatus not in
<foreach collection="conditionParamRef.auditStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('auditStatusStart') and conditionParamRef.auditStatusStart != null">
${_conditionType_} a.auditStatus <![CDATA[ >= ]]> #{${_conditionParam_}.auditStatusStart}
</if>
<if test="conditionParamRef.containsKey('auditStatusEnd') and conditionParamRef.auditStatusEnd != null">
${_conditionType_} a.auditStatus <![CDATA[ <= ]]> #{${_conditionParam_}.auditStatusEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1741,6 +1790,11 @@
<if test='orderCol.windowNum != null and "DESC".equalsIgnoreCase(orderCol.windowNum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('auditStatus')">
a.auditStatus
<if test='orderCol.auditStatus != null and "DESC".equalsIgnoreCase(orderCol.auditStatus)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
......@@ -805,3 +805,14 @@ ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `signOutResult` tinyint
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `attendType` varchar(128) DEFAULT '0' COMMENT '考勤类型';
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `punchResult` tinyint(2) DEFAULT '0' COMMENT '打卡结果(0.否,1.是)';
-- ----------------------------
-- 07-27
-- ----------------------------
ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `auditStatus` tinyint(1) DEFAULT '1' COMMENT '审核状态(1.同意,2.不同意)';
ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `auditStatus` tinyint(1) DEFAULT '1' COMMENT '审核状态(1.同意,2.不同意)';
ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `auditStatus` tinyint(1) DEFAULT '1' COMMENT '审核状态(1.同意,2.不同意)';
ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `auditStatus` tinyint(1) DEFAULT '1' COMMENT '审核状态(1.同意,2.不同意)';
ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `auditStatus` tinyint(1) DEFAULT '1' COMMENT '审核状态(1.同意,2.不同意)';
ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `auditStatus` tinyint(1) DEFAULT '1' COMMENT '审核状态(1.同意,2.不同意)';
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