Skip to content

A
attendance-performance-platform
Commit dbc7755d authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改核查状态

parent 04c44aa9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14729 additions and 13373 deletions
attendance-performance-manager-ui/admin/src/assets/mixins/tree.js
View file @ dbc7755d
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
<i style="font-size:16px;color:#409EFF" class={data.icon}></i> <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">{node.label}</span>
<span style="padding-left: 2px;font-size:14px;margin-left:20px"> <span style="padding-left: 2px;font-size:14px;margin-left:20px">
({data.personList?data.personList.length:0}) ({data.personNum?data.personNum:0})
</span> </span>
</span> </span>
) )
...@@ -43,12 +43,6 @@ export default { ...@@ -43,12 +43,6 @@ export default {
return; return;
} }
resolve(data.result); resolve(data.result);
// this.$post("/area/getListByParentId", {
// parentId: node.data.id,
// }).then(({ data }) => {
// resolve(data.result);
// });
}, },
refreshNodeBy(id) { refreshNodeBy(id) {
...@@ -65,6 +59,7 @@ export default { ...@@ -65,6 +59,7 @@ export default {
treeProps: { treeProps: {
id: "id", id: "id",
label: "label", label: "label",
personNum: "personNum",
areaCode:"areaCode", areaCode:"areaCode",
type: "type", type: "type",
isLeaf: "isLeaf", isLeaf: "isLeaf",
......
attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
View file @ dbc7755d
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50},
{label: "员工姓名", prop: "staffName"}, {label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"}, {label: "工号", prop: "workNum"},
// {label: "部门", prop: "deptName"}, {label: "部门", prop: "deptName"},
// {label: "考勤组", prop: "attendanceGroupName"}, // {label: "考勤组", prop: "attendanceGroupName"},
// {label: "职位", prop: "positionName"}, // {label: "职位", prop: "positionName"},
// {label: "班次", prop: "shiftsName"}, // {label: "班次", prop: "shiftsName"},
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
// width: 240, // width: 240,
// formatter: row => { // formatter: row => {
// return ( // 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} /> // onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
// ) // )
// } // }
...@@ -342,4 +342,4 @@ ...@@ -342,4 +342,4 @@
.details{ .details{
cursor: pointer; cursor: pointer;
} }
</style> </style>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/staff/list.vue
View file @ dbc7755d
...@@ -254,7 +254,6 @@ export default { ...@@ -254,7 +254,6 @@ export default {
}, },
handleNodeClick(node) { handleNodeClick(node) {
console.log(node, 123123);
this.currentNode = node; this.currentNode = node;
this.query = { deptId: node.id }; this.query = { deptId: node.id };
this.getData(); this.getData();
......
attendance-performance-manager-ui/admin/vue.config.js
View file @ dbc7755d
...@@ -18,8 +18,8 @@ module.exports = { ...@@ -18,8 +18,8 @@ module.exports = {
proxy: { proxy: {
'/attendance': { '/attendance': {
//target: 'http://192.168.0.98:11039', //target: 'http://192.168.0.98:11039',
target: 'http://112.19.80.237:11039', //target: 'http://112.19.80.237:11039',
// target: 'http://localhost:17500', target: 'http://localhost:17500',
changeOrigin: true, changeOrigin: true,
secure: false, secure: false,
cookieDomainRewrite: 'localhost', cookieDomainRewrite: 'localhost',
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java
View file @ dbc7755d
...@@ -214,7 +214,6 @@ public class TestController { ...@@ -214,7 +214,6 @@ public class TestController {
deptEntity.setPersonNum(count.intValue()); deptEntity.setPersonNum(count.intValue());
deptService.update(deptEntity); deptService.update(deptEntity);
} }
}); });
......
attendance-performance-manager/src/main/java/com/mortals/xhx/common/utils/AuditUtil.java 0 → 100644
View file @ dbc7755d
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());
}
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventAfterTaskImpl.java
View file @ dbc7755d
...@@ -51,7 +51,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService { ...@@ -51,7 +51,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
syncDoorEvents(); syncDoorEvents();
calculateAttendByDay(); //calculateAttendByDay();
} }
private void calculateAttendByDay() { private void calculateAttendByDay() {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
View file @ dbc7755d
...@@ -51,7 +51,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService { ...@@ -51,7 +51,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
syncDoorEvents(); syncDoorEvents();
calculateAttendByDay(); //calculateAttendByDay();
} }
private void calculateAttendByDay() { private void calculateAttendByDay() {
...@@ -87,7 +87,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService { ...@@ -87,7 +87,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
doorEventReq.setEventTypes(eventTypes); doorEventReq.setEventTypes(eventTypes);
// 获取当天的开始时间 // 获取当天的开始时间
//Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate(); //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()); Date todayEnd = DateUtil.endOfDay(new Date());
doorEventReq.setStartTime(todayStart); doorEventReq.setStartTime(todayStart);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
View file @ dbc7755d
package com.mortals.xhx.module.attendance.service.impl; 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 org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -6,14 +14,54 @@ import com.mortals.framework.model.Context; ...@@ -6,14 +14,54 @@ import com.mortals.framework.model.Context;
import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao; import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity;
import com.mortals.xhx.module.attendance.service.AttendanceRecordErrorService; import com.mortals.xhx.module.attendance.service.AttendanceRecordErrorService;
import org.springframework.util.ObjectUtils;
import java.util.List;
/** /**
* AttendanceRecordErrorService * AttendanceRecordErrorService
* 考勤打卡记录异常信息 service实现 * 考勤打卡记录异常信息 service实现
* *
* @author zxfei * @author zxfei
* @date 2023-04-08 * @date 2023-04-08
*/ */
@Service("attendanceRecordErrorService") @Service("attendanceRecordErrorService")
public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<AttendanceRecordErrorDao, AttendanceRecordErrorEntity, Long> implements 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
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceClassDetailController.java
View file @ dbc7755d
package com.mortals.xhx.module.attendance.web; package com.mortals.xhx.module.attendance.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; 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.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity; import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService; import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import java.util.Arrays; import java.util.Arrays;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
/** /**
* * 考勤班次详细信息
* 考勤班次详细信息 *
* * @author zxfei
* @author zxfei * @date 2023-04-08
* @date 2023-04-08 */
*/
@RestController @RestController
@RequestMapping("attendance/class/detail") @RequestMapping("attendance/class/detail")
public class AttendanceClassDetailController extends BaseCRUDJsonBodyMappingController<AttendanceClassDetailService,AttendanceClassDetailEntity,Long> { public class AttendanceClassDetailController extends BaseCRUDJsonBodyMappingController<AttendanceClassDetailService, AttendanceClassDetailEntity, Long> {
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private AttendanceClassService classService;
public AttendanceClassDetailController(){
super.setModuleDesc( "考勤班次详细信息"); public AttendanceClassDetailController() {
super.setModuleDesc("考勤班次详细信息");
} }
@Override @Override
...@@ -46,4 +61,13 @@ public class AttendanceClassDetailController extends BaseCRUDJsonBodyMappingCont ...@@ -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());
}
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java
View file @ dbc7755d
...@@ -3,6 +3,9 @@ import java.math.BigDecimal; ...@@ -3,6 +3,9 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -12,7 +15,7 @@ import lombok.Data; ...@@ -12,7 +15,7 @@ import lombok.Data;
* 考勤绩效记录核查信息实体对象 * 考勤绩效记录核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-17 * @date 2023-07-27
*/ */
@Data @Data
public class CheckAttendRecordEntity extends CheckAttendRecordVo { public class CheckAttendRecordEntity extends CheckAttendRecordVo {
...@@ -71,7 +74,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -71,7 +74,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除") @Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType; private Integer subAddType;
/** /**
* 扣分或增加分值 * 扣分或增加分值
...@@ -116,7 +119,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -116,7 +119,7 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
/** /**
* 核查结果(1.加分或扣分,2.不扣分) * 核查结果(1.加分或扣分,2.不扣分)
*/ */
@Excel(name = "核查结果", readConverterExp = "加分或扣分=加分或扣分,不扣分=不扣分") @Excel(name = "核查结果", readConverterExp = "1=加分或扣分,2=不扣分")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
...@@ -144,9 +147,9 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -144,9 +147,9 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 种类名称 * 规则名称
*/ */
@Excel(name = "种类名称") @Excel(name = "规则名称")
private String categoryName; private String categoryName;
/** /**
* 扣分人员 * 扣分人员
...@@ -163,6 +166,10 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -163,6 +166,10 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
*/ */
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -180,67 +187,37 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo { ...@@ -180,67 +187,37 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
} }
public void initAttrValue(){ public void initAttrValue(){
this.recordId = 0L; this.recordId = 0L;
this.staffId = 0L; this.staffId = 0L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.deptId = 0L; this.deptId = 0L;
this.deptName = ""; this.deptName = "";
this.attendanceGroupId = 0L; this.attendanceGroupId = 0L;
this.attendanceGroupName = ""; this.attendanceGroupName = "";
this.attendanceDate = new Date();
this.attendanceDate = null;
this.ruleId = 0L; this.ruleId = 0L;
this.ruleName = ""; this.ruleName = "";
this.subAddType = 1; this.subAddType = 1;
this.score = BigDecimal.ZERO;
this.score = BigDecimal.valueOf(0.00);
this.goOffTimeStr = ""; this.goOffTimeStr = "";
this.errorTime = new Date();
this.errorTime = null; this.actualAttendTime = new Date();
this.actualAttendTime = null;
this.errorResult = ""; this.errorResult = "";
this.checkPerson = ""; this.checkPerson = "";
this.checkTime = new Date();
this.checkTime = null;
this.checkDesc = ""; this.checkDesc = "";
this.checkResult = ""; this.checkResult = "";
this.checkStatus = 1; this.checkStatus = 1;
this.subMethod = 1; this.subMethod = 1;
this.remark = ""; this.remark = "";
this.fileNames = ""; this.fileNames = "";
this.filePaths = ""; this.filePaths = "";
this.categoryId = 0L; this.categoryId = 0L;
this.categoryName = ""; this.categoryName = "";
this.deductPerson = ""; this.deductPerson = "";
this.deductTime = new Date(); this.deductTime = new Date();
this.windowNum = ""; this.windowNum = "";
this.auditStatus = 1;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordQuery.java
View file @ dbc7755d
...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
* 考勤绩效记录核查信息查询对象 * 考勤绩效记录核查信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-16 * @date 2023-07-27
*/ */
public class CheckAttendRecordQuery extends CheckAttendRecordEntity { public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -328,6 +328,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -328,6 +328,21 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
/** 窗口编号排除列表 */ /** 窗口编号排除列表 */
private List <String> windowNumNotList; 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) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CheckAttendRecordQuery> orConditionList; private List<CheckAttendRecordQuery> orConditionList;
...@@ -2125,6 +2140,87 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -2125,6 +2140,87 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
this.windowNumNotList = windowNumNotList; 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 * @param id
...@@ -3138,6 +3234,60 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity { ...@@ -3138,6 +3234,60 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
return this; 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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java
View file @ dbc7755d
...@@ -3,159 +3,171 @@ import java.math.BigDecimal; ...@@ -3,159 +3,171 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckComplainRecordVo; import com.mortals.xhx.module.check.model.vo.CheckComplainRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 评价绩效投诉核查信息实体对象 * 评价绩效投诉核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-11 * @date 2023-07-27
*/ */
@Data @Data
public class CheckComplainRecordEntity extends CheckComplainRecordVo { public class CheckComplainRecordEntity extends CheckComplainRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 记录ID * 记录ID
*/ */
private Long recordId; private Long recordId;
/** /**
* 员工ID * 员工ID
*/ */
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名") @Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号") @Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称") @Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 投诉标题 * 投诉标题
*/ */
@Excel(name = "投诉标题") @Excel(name = "投诉标题")
private String complainTitle; private String complainTitle;
/** /**
* 投诉内容 * 投诉内容
*/ */
@Excel(name = "投诉内容") @Excel(name = "投诉内容")
private String complainContent; private String complainContent;
/** /**
* 投诉人真实姓名 * 投诉人真实姓名
*/ */
@Excel(name = "投诉人真实姓名")
private String complainRealName; private String complainRealName;
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话") @Excel(name = "联系电话")
private String contact; private String contact;
/** /**
* 投诉时间 * 投诉时间
*/ */
@Excel(name = "投诉时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date complainTime; private Date complainTime;
/** /**
* 投诉来源 * 投诉来源
*/ */
@Excel(name = "投诉来源")
private String complainSource; private String complainSource;
/** /**
* 投诉设备 * 投诉设备
*/ */
@Excel(name = "投诉设备")
private String complainDevice; private String complainDevice;
/** /**
* 绩效规则id * 绩效规则id
*/ */
private Long ruleId; private Long ruleId;
/** /**
* 规则名称 * 规则名称
*/ */
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员") @Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
*/ */
private Date deductTime; private Date deductTime;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员") @Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
*/ */
private Date checkTime; private Date checkTime;
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明") @Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果") @Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
*/ */
private Integer checkStatus; private Integer checkStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 附件名称，多个逗号分割 * 附件名称，多个逗号分割
*/ */
private String fileNames; private String fileNames;
/** /**
* 附件下载地址，多个逗号分割 * 附件下载地址，多个逗号分割
*/ */
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 规则名称 * 规则名称
*/ */
private String categoryName; private String categoryName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType; private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -163,74 +175,44 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo { ...@@ -163,74 +175,44 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
if (obj instanceof CheckComplainRecordEntity) { if (obj instanceof CheckComplainRecordEntity) {
CheckComplainRecordEntity tmp = (CheckComplainRecordEntity) obj; CheckComplainRecordEntity tmp = (CheckComplainRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public void initAttrValue(){ public void initAttrValue(){
this.recordId = 0L;
this.recordId = 0L; this.staffId = 0L;
this.staffName = "";
this.staffId = 0L; this.workNum = "";
this.windowNum = "";
this.staffName = ""; this.deptId = 0L;
this.deptName = "";
this.workNum = ""; this.complainTitle = "";
this.complainContent = "";
this.windowNum = ""; this.complainRealName = "";
this.contact = "";
this.deptId = 0L; this.complainTime = new Date();
this.complainSource = "";
this.deptName = ""; this.complainDevice = "";
this.ruleId = 0L;
this.complainTitle = ""; this.ruleName = "";
this.subMethod = 1;
this.complainContent = ""; this.deductPerson = "";
this.deductTime = new Date();
this.complainRealName = ""; this.score = BigDecimal.ZERO;
this.checkPerson = "";
this.contact = ""; this.checkTime = new Date();
this.checkDesc = "";
this.complainTime = null; this.checkResult = "";
this.checkStatus = 1;
this.complainSource = ""; this.remark = "";
this.fileNames = "";
this.complainDevice = ""; this.filePaths = "";
this.categoryId = 0L;
this.ruleId = 0L; this.categoryName = "";
this.subAddType = 1;
this.ruleName = ""; this.auditStatus = 1;
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;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java
View file @ dbc7755d
...@@ -3,152 +3,159 @@ import java.math.BigDecimal; ...@@ -3,152 +3,159 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckEffectRecordVo; import com.mortals.xhx.module.check.model.vo.CheckEffectRecordVo;
import lombok.Data; import lombok.Data;
/** /**
* 效能绩效核查信息实体对象 * 效能绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-11 * @date 2023-07-27
*/ */
@Data @Data
public class CheckEffectRecordEntity extends CheckEffectRecordVo { public class CheckEffectRecordEntity extends CheckEffectRecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 记录ID * 记录ID
*/ */
private Long recordId; private Long recordId;
/** /**
* 员工ID * 员工ID
*/ */
private Long staffId; private Long staffId;
/** /**
* 员工姓名 * 员工姓名
*/ */
@Excel(name = "员工姓名") @Excel(name = "员工姓名")
private String staffName; private String staffName;
/** /**
* 工号 * 工号
*/ */
@Excel(name = "工号") @Excel(name = "工号")
private String workNum; private String workNum;
/** /**
* 窗口编号 * 窗口编号
*/ */
@Excel(name = "窗口编号") @Excel(name = "窗口编号")
private String windowNum; private String windowNum;
/** /**
* 所属部门 * 所属部门
*/ */
private Long deptId; private Long deptId;
/** /**
* 所属部门名称 * 所属部门名称
*/ */
@Excel(name = "所属部门名称") @Excel(name = "所属部门名称")
private String deptName; private String deptName;
/** /**
* 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉) * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=脱岗,2=离岗,3=玩手机,4=睡觉") @Excel(name = "违规类型", readConverterExp = "1=脱岗,2=离岗,3=玩手机,4=睡觉")
private Integer irregularType; private Integer irregularType;
/** /**
* 发生时间 * 发生时间
*/ */
@Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date happenTime; private Date happenTime;
/** /**
* 持续时间，秒 * 持续时间，秒
*/ */
private Integer duration; private Integer duration;
/** /**
* 报警时间 * 报警时间
*/ */
private Date alarmTime; private Date alarmTime;
/** /**
* 图片凭证地址 * 图片凭证地址
*/ */
private String snapPath; private String snapPath;
/** /**
* 绩效规则id * 绩效规则id
*/ */
private Long ruleId; private Long ruleId;
/** /**
* 规则名称 * 规则名称
*/ */
private String ruleName; private String ruleName;
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
private Integer subMethod; private Integer subMethod;
/** /**
* 扣分人员 * 扣分人员
*/ */
@Excel(name = "扣分人员") @Excel(name = "扣分人员")
private String deductPerson; private String deductPerson;
/** /**
* 扣分时间 * 扣分时间
*/ */
private Date deductTime; private Date deductTime;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
private BigDecimal score; private BigDecimal score;
/** /**
* 核查人员 * 核查人员
*/ */
@Excel(name = "核查人员") @Excel(name = "核查人员")
private String checkPerson; private String checkPerson;
/** /**
* 核查时间 * 核查时间
*/ */
private Date checkTime; private Date checkTime;
/** /**
* 核查说明 * 核查说明
*/ */
@Excel(name = "核查说明") @Excel(name = "核查说明")
private String checkDesc; private String checkDesc;
/** /**
* 核查结果 * 核查结果
*/ */
@Excel(name = "核查结果") @Excel(name = "核查结果")
private String checkResult; private String checkResult;
/** /**
* 处理状态(1.未处理,2.已处理) * 处理状态(1.未处理,2.已处理)
*/ */
private Integer checkStatus; private Integer checkStatus;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 附件名称，多个逗号分割 * 附件名称，多个逗号分割
*/ */
@Excel(name = "附件名称，多个逗号分割") @Excel(name = "附件名称，多个逗号分割")
private String fileNames; private String fileNames;
/** /**
* 附件下载地址，多个逗号分割 * 附件下载地址，多个逗号分割
*/ */
@Excel(name = "附件下载地址，多个逗号分割") @Excel(name = "附件下载地址，多个逗号分割")
private String filePaths; private String filePaths;
/** /**
* 绩效规则分类id * 绩效规则分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 规则名称 * 规则名称
*/ */
private String categoryName; private String categoryName;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
private Integer subAddType; private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -156,70 +163,42 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo { ...@@ -156,70 +163,42 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
if (obj instanceof CheckEffectRecordEntity) { if (obj instanceof CheckEffectRecordEntity) {
CheckEffectRecordEntity tmp = (CheckEffectRecordEntity) obj; CheckEffectRecordEntity tmp = (CheckEffectRecordEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public void initAttrValue(){ public void initAttrValue(){
this.recordId = 0L;
this.recordId = 0L; this.staffId = 0L;
this.staffName = "";
this.staffId = 0L; this.workNum = "";
this.windowNum = "";
this.staffName = ""; this.deptId = 0L;
this.deptName = "";
this.workNum = ""; this.irregularType = 0;
this.happenTime = new Date();
this.windowNum = ""; this.duration = 0;
this.alarmTime = new Date();
this.deptId = 0L; this.snapPath = "";
this.ruleId = 0L;
this.deptName = ""; this.ruleName = "";
this.subMethod = 1;
this.irregularType = 1; this.deductPerson = "";
this.deductTime = new Date();
this.happenTime = null; this.score = BigDecimal.ZERO;
this.checkPerson = "";
this.duration = 0; this.checkTime = new Date();
this.checkDesc = "";
this.alarmTime = null; this.checkResult = "";
this.checkStatus = 1;
this.snapPath = ""; this.remark = "";
this.fileNames = "";
this.ruleId = 0L; this.filePaths = "";
this.categoryId = 0L;
this.ruleName = ""; this.categoryName = "";
this.subAddType = 1;
this.subMethod = 1; this.auditStatus = 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;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java
View file @ dbc7755d
...@@ -3,6 +3,9 @@ import java.math.BigDecimal; ...@@ -3,6 +3,9 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -12,7 +15,7 @@ import lombok.Data; ...@@ -12,7 +15,7 @@ import lombok.Data;
* 办件绩效核查信息实体对象 * 办件绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-17 * @date 2023-07-27
*/ */
@Data @Data
public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
...@@ -82,7 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -82,7 +85,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 扣分方式(1.系统自动,2.人工添加) * 扣分方式(1.系统自动,2.人工添加)
*/ */
@Excel(name = "扣分方式", readConverterExp = "1=系统自动,2.人工添加") @Excel(name = "扣分方式", readConverterExp = "1=系统自动,2=人工添加")
private Integer subMethod; private Integer subMethod;
/** /**
* 扣分人员 * 扣分人员
...@@ -146,8 +149,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -146,8 +149,12 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2.扣除") @Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType; private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -165,61 +172,34 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo { ...@@ -165,61 +172,34 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
} }
public void initAttrValue(){ public void initAttrValue(){
this.recordId = 0L; this.recordId = 0L;
this.staffId = 0L; this.staffId = 0L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.windowNum = ""; this.windowNum = "";
this.deptId = 0L; this.deptId = 0L;
this.deptName = ""; this.deptName = "";
this.goworkCode = ""; this.goworkCode = "";
this.goworkDepts = ""; this.goworkDepts = "";
this.matterlName = ""; this.matterlName = "";
this.goworkTime = new Date();
this.goworkTime = null;
this.ruleId = 0L; this.ruleId = 0L;
this.ruleName = ""; this.ruleName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
this.deductTime = new Date();
this.deductTime = null; this.score = BigDecimal.ZERO;
this.score = BigDecimal.valueOf(0.00);
this.checkPerson = ""; this.checkPerson = "";
this.checkTime = new Date();
this.checkTime = null;
this.checkDesc = ""; this.checkDesc = "";
this.checkResult = ""; this.checkResult = "";
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = ""; this.fileNames = "";
this.filePaths = ""; this.filePaths = "";
this.categoryId = 0L; this.categoryId = 0L;
this.categoryName = ""; this.categoryName = "";
this.subAddType = 1; this.subAddType = 1;
this.auditStatus = 1;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java
View file @ dbc7755d
...@@ -3,6 +3,9 @@ import java.math.BigDecimal; ...@@ -3,6 +3,9 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -12,7 +15,7 @@ import lombok.Data; ...@@ -12,7 +15,7 @@ import lombok.Data;
* 其它绩效核查信息实体对象 * 其它绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-17 * @date 2023-07-27
*/ */
@Data @Data
public class CheckOtherRecordEntity extends CheckOtherRecordVo { public class CheckOtherRecordEntity extends CheckOtherRecordVo {
...@@ -53,7 +56,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -53,7 +56,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
/** /**
* 违规类型(1.工作纪律) * 违规类型(1.工作纪律)
*/ */
@Excel(name = "违规类型", readConverterExp = "1=工作纪律") @Excel(name = "违规类型", readConverterExp = "违规类型(1.工作纪律)")
private Integer irregularOtherType; private Integer irregularOtherType;
/** /**
* 发生时间 * 发生时间
...@@ -145,6 +148,10 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -145,6 +148,10 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除") @Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType; private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -162,61 +169,34 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo { ...@@ -162,61 +169,34 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
} }
public void initAttrValue(){ public void initAttrValue(){
this.recordId = 0L; this.recordId = 0L;
this.staffId = 0L; this.staffId = 0L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.deptId = 0L;
this.deptId = null;
this.deptName = ""; this.deptName = "";
this.windowNum = ""; this.windowNum = "";
this.irregularOtherType = 0;
this.irregularOtherType = 1; this.happenTime = new Date();
this.happenTime = null;
this.duration = 0; this.duration = 0;
this.ruleId = 0L; this.ruleId = 0L;
this.ruleName = ""; this.ruleName = "";
this.ruleDesc = ""; this.ruleDesc = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
this.deductTime = new Date();
this.deductTime = null; this.score = BigDecimal.ZERO;
this.score = BigDecimal.valueOf(0.00);
this.checkPerson = ""; this.checkPerson = "";
this.checkTime = new Date();
this.checkTime = null;
this.checkDesc = ""; this.checkDesc = "";
this.checkResult = ""; this.checkResult = "";
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = ""; this.fileNames = "";
this.filePaths = ""; this.filePaths = "";
this.categoryId = 0L;
this.categoryId = null;
this.categoryName = ""; this.categoryName = "";
this.subAddType = 1; this.subAddType = 1;
this.auditStatus = 1;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java
View file @ dbc7755d
...@@ -3,6 +3,9 @@ import java.math.BigDecimal; ...@@ -3,6 +3,9 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -12,7 +15,7 @@ import lombok.Data; ...@@ -12,7 +15,7 @@ import lombok.Data;
* 评价差评绩效核查信息实体对象 * 评价差评绩效核查信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-17 * @date 2023-07-27
*/ */
@Data @Data
public class CheckReviewRecordEntity extends CheckReviewRecordVo { public class CheckReviewRecordEntity extends CheckReviewRecordVo {
...@@ -63,7 +66,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -63,7 +66,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
/** /**
* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它) * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
*/ */
@Excel(name = "评价来源", readConverterExp = "评价来源") @Excel(name = "评价来源", readConverterExp = "评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)")
private String reviewSource; private String reviewSource;
/** /**
* 评价设备 * 评价设备
...@@ -147,6 +150,10 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -147,6 +150,10 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
*/ */
@Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除") @Excel(name = "增减类型", readConverterExp = "1=增加,2=扣除")
private Integer subAddType; private Integer subAddType;
/**
* 审核状态(1.同意,2.不同意)
*/
private Integer auditStatus;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -164,61 +171,34 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo { ...@@ -164,61 +171,34 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
} }
public void initAttrValue(){ public void initAttrValue(){
this.recordId = 0L; this.recordId = 0L;
this.staffId = 0L; this.staffId = 0L;
this.staffName = ""; this.staffName = "";
this.workNum = ""; this.workNum = "";
this.windowNum = ""; this.windowNum = "";
this.deptId = 0L; this.deptId = 0L;
this.deptName = ""; this.deptName = "";
this.reviewResult = 0;
this.reviewResult = 1; this.reviewTime = new Date();
this.reviewTime = null;
this.reviewSource = ""; this.reviewSource = "";
this.reviewDevice = ""; this.reviewDevice = "";
this.ruleId = 0L; this.ruleId = 0L;
this.ruleName = ""; this.ruleName = "";
this.subMethod = 1; this.subMethod = 1;
this.deductPerson = ""; this.deductPerson = "";
this.deductTime = new Date();
this.deductTime = null; this.score = BigDecimal.ZERO;
this.score = BigDecimal.valueOf(0.00);
this.checkPerson = ""; this.checkPerson = "";
this.checkTime = new Date();
this.checkTime = null;
this.checkDesc = ""; this.checkDesc = "";
this.checkResult = ""; this.checkResult = "";
this.checkStatus = 1; this.checkStatus = 1;
this.remark = ""; this.remark = "";
this.fileNames = ""; this.fileNames = "";
this.filePaths = ""; this.filePaths = "";
this.categoryId = 0L; this.categoryId = 0L;
this.categoryName = ""; this.categoryName = "";
this.subAddType = 1; this.subAddType = 1;
this.auditStatus = 1;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java
View file @ dbc7755d
...@@ -20,4 +20,8 @@ public class CheckAttendRecordVo extends BaseEntityLong { ...@@ -20,4 +20,8 @@ public class CheckAttendRecordVo extends BaseEntityLong {
/** 结束 创建时间 */ /** 结束 创建时间 */
private String createTimeEnd; private String createTimeEnd;
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
View file @ dbc7755d
...@@ -20,4 +20,8 @@ public class CheckComplainRecordVo extends BaseEntityLong { ...@@ -20,4 +20,8 @@ public class CheckComplainRecordVo extends BaseEntityLong {
/** 结束 创建时间 */ /** 结束 创建时间 */
private String createTimeEnd; private String createTimeEnd;
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
View file @ dbc7755d
...@@ -20,4 +20,8 @@ public class CheckEffectRecordVo extends BaseEntityLong { ...@@ -20,4 +20,8 @@ public class CheckEffectRecordVo extends BaseEntityLong {
/** 结束 创建时间 */ /** 结束 创建时间 */
private String createTimeEnd; private String createTimeEnd;
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
View file @ dbc7755d
...@@ -20,4 +20,8 @@ public class CheckGoworkRecordVo extends BaseEntityLong { ...@@ -20,4 +20,8 @@ public class CheckGoworkRecordVo extends BaseEntityLong {
/** 结束 创建时间 */ /** 结束 创建时间 */
private String createTimeEnd; private String createTimeEnd;
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
View file @ dbc7755d
...@@ -20,4 +20,8 @@ public class CheckOtherRecordVo extends BaseEntityLong { ...@@ -20,4 +20,8 @@ public class CheckOtherRecordVo extends BaseEntityLong {
/** 结束 创建时间 */ /** 结束 创建时间 */
private String createTimeEnd; private String createTimeEnd;
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
View file @ dbc7755d
...@@ -20,4 +20,7 @@ public class CheckReviewRecordVo extends BaseEntityLong { ...@@ -20,4 +20,7 @@ public class CheckReviewRecordVo extends BaseEntityLong {
/** 结束 创建时间 */ /** 结束 创建时间 */
private String createTimeEnd; private String createTimeEnd;
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java
View file @ dbc7755d
...@@ -10,11 +10,9 @@ import com.mortals.framework.util.DateUtils; ...@@ -10,11 +10,9 @@ import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.framework.util.ThreadPool; import com.mortals.framework.util.ThreadPool;
import com.mortals.xhx.base.system.message.MessageService; import com.mortals.xhx.base.system.message.MessageService;
import com.mortals.xhx.common.code.CheckStatusEnum; import com.mortals.xhx.common.code.*;
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.AttendPostServiceThread; 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.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckAttendRecordDao; import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
...@@ -106,7 +104,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -106,7 +104,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) { if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
/* AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity); /* AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
ThreadPool.getInstance().execute(attendPostServiceThread);*/ ThreadPool.getInstance().execute(attendPostServiceThread);*/
sendCheckDingTalk(entity); // sendCheckDingTalk(entity);
} }
try { try {
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery(); StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
...@@ -155,6 +153,11 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -155,6 +153,11 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName()); entity.setCheckPerson(user.getRealName());
} }
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date()); entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime()); entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理) entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java
View file @ dbc7755d
...@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum; ...@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum; import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum; import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum; 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.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckComplainRecordDao; import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity; import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
...@@ -102,11 +103,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec ...@@ -102,11 +103,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
@Override @Override
protected void saveAfter(CheckComplainRecordEntity entity, Context context) throws AppException { protected void saveAfter(CheckComplainRecordEntity entity, Context context) throws AppException {
//发送钉钉通知信息 //发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
try { try {
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery(); StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
query.setStaffId(entity.getStaffId()); query.setStaffId(entity.getStaffId());
...@@ -156,6 +153,9 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec ...@@ -156,6 +153,9 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName()); entity.setCheckPerson(user.getRealName());
} }
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date()); entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime()); entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理) entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java
View file @ dbc7755d
...@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum; ...@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum; import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum; import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum; 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.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckEffectRecordDao; import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
import com.mortals.xhx.module.check.model.CheckComplainRecordEntity; import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
...@@ -156,6 +157,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -156,6 +157,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName()); entity.setCheckPerson(user.getRealName());
} }
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date()); entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime()); entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理) entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java
View file @ dbc7755d
...@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum; ...@@ -13,6 +13,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum; import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum; import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum; 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.common.utils.BeanUtil;
import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao; import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
import com.mortals.xhx.module.check.model.CheckEffectRecordEntity; import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
...@@ -102,11 +103,6 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -102,11 +103,6 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
@Override @Override
protected void saveAfter(CheckGoworkRecordEntity entity, Context context) throws AppException { protected void saveAfter(CheckGoworkRecordEntity entity, Context context) throws AppException {
//发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
try{ try{
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery(); StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
query.setStaffId(entity.getStaffId()); query.setStaffId(entity.getStaffId());
...@@ -154,6 +150,9 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -154,6 +150,9 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName()); entity.setCheckPerson(user.getRealName());
} }
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date()); entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime()); entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理) entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java
View file @ dbc7755d
...@@ -10,6 +10,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum; ...@@ -10,6 +10,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum; import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum; import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum; 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.common.utils.BeanUtil;
import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity; import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
import com.mortals.xhx.module.check.model.CheckReviewRecordEntity; import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
...@@ -102,11 +103,6 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt ...@@ -102,11 +103,6 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
@Override @Override
protected void saveAfter(CheckOtherRecordEntity entity, Context context) throws AppException { protected void saveAfter(CheckOtherRecordEntity entity, Context context) throws AppException {
//发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
try { try {
StaffCheckSummaryQuery query = new StaffCheckSummaryQuery(); StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
query.setStaffId(entity.getStaffId()); query.setStaffId(entity.getStaffId());
...@@ -158,6 +154,9 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt ...@@ -158,6 +154,9 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName()); entity.setCheckPerson(user.getRealName());
} }
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date()); entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime()); entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理) entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java
View file @ dbc7755d
...@@ -10,6 +10,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum; ...@@ -10,6 +10,7 @@ import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum; import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum; import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.code.YesNoEnum; 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.common.utils.BeanUtil;
import com.mortals.xhx.module.check.model.CheckOtherRecordEntity; import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery; import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
...@@ -115,11 +116,6 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -115,11 +116,6 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
log.error("汇总已审核的核查记录出错", e); log.error("汇总已审核的核查记录出错", e);
} }
//发送钉钉通知信息
if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
sendCheckDingTalk(entity);
}
} }
private void sendCheckDingTalk(CheckReviewRecordEntity entity) { private void sendCheckDingTalk(CheckReviewRecordEntity entity) {
...@@ -159,6 +155,9 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -159,6 +155,9 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
entity.setCheckPerson(user.getRealName()); entity.setCheckPerson(user.getRealName());
} }
if(!ObjectUtils.isEmpty(entity.getSubAddType())&&!ObjectUtils.isEmpty(entity.getCheckResult())){
AuditUtil.audit(entity);
}
entity.setCheckTime(new Date()); entity.setCheckTime(new Date());
entity.setUpdateTime(entity.getCheckTime()); entity.setUpdateTime(entity.getCheckTime());
entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理) entity.setCheckStatus(CheckStatusEnum.已处理.getValue()); //处理状态(1.未处理,2.已处理)
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptTreeSelect.java
View file @ dbc7755d
...@@ -53,9 +53,6 @@ public class DeptTreeSelect implements Serializable { ...@@ -53,9 +53,6 @@ public class DeptTreeSelect implements Serializable {
this.personNum = entity.getPersonNum(); this.personNum = entity.getPersonNum();
if (!ObjectUtils.isEmpty(entity.getChildren())) { if (!ObjectUtils.isEmpty(entity.getChildren())) {
this.children = entity.getChildren().stream().map(DeptTreeSelect::new).collect(Collectors.toList()); 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(); this.personList = entity.getPersonList();
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/DeptService.java
View file @ dbc7755d
package com.mortals.xhx.module.dept.service; package com.mortals.xhx.module.dept.service;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.dept.dao.DeptDao; import com.mortals.xhx.module.dept.dao.DeptDao;
...@@ -6,54 +8,61 @@ import com.mortals.xhx.module.dept.model.DeptEntity; ...@@ -6,54 +8,61 @@ import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptTreeSelect; import com.mortals.xhx.module.dept.model.DeptTreeSelect;
import java.util.List; import java.util.List;
/** /**
* DeptService * DeptService
* * <p>
* 部门信息 service接口 * 部门信息 service接口
* *
* @author zxfei * @author zxfei
* @date 2023-03-06 * @date 2023-03-06
*/ */
public interface DeptService extends ICRUDService<DeptEntity,Long>{ public interface DeptService extends ICRUDService<DeptEntity, Long> {
DeptDao getDao(); DeptDao getDao();
/** /**
* 是否存在部门信息节点 * 是否存在部门信息节点
* *
* @param deptId 部门信息ID * @param deptId 部门信息ID
* @return 结果 * @return 结果
*/ */
boolean hasChildByDeptId(Long deptId); boolean hasChildByDeptId(Long deptId);
/** /**
* 查询部门信息数据 * 查询部门信息数据
* *
* @param dept 部门信息 * @param dept 部门信息
* @return 部门信息集合 * @return 部门信息集合
*/ */
List<DeptEntity> selectDeptList(DeptEntity dept); List<DeptEntity> selectDeptList(DeptEntity dept);
/** /**
* 构建前端所需要下拉树结构 * 构建前端所需要下拉树结构
* *
* @param deptList 部门信息列表 * @param deptList 部门信息列表
* @return 下拉树结构列表 * @return 下拉树结构列表
*/ */
List<DeptTreeSelect> buildDeptTreeSelect(List<DeptEntity> deptList); List<DeptTreeSelect> buildDeptTreeSelect(List<DeptEntity> deptList);
/** /**
* 根据父id查询子节点 * 根据父id查询子节点
* @param parentId *
* @param context * @param parentId
* @return * @param context
*/ * @return
List<DeptTreeSelect> getListByParentId(Long parentId,Context context); */
List<DeptTreeSelect> getListByParentId(Long parentId, Context context);
/**
* 更新部门人员数量
*
* @param context
*/
Rest<Void> updateDeptNum(Context context);
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @ dbc7755d
package com.mortals.xhx.module.dept.service.impl; 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.EnableEnum;
import com.mortals.xhx.common.code.EnabledEnum; import com.mortals.xhx.common.code.EnabledEnum;
import com.mortals.xhx.module.staff.model.StaffEntity; import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.StaffQuery; import com.mortals.xhx.module.staff.model.StaffQuery;
import com.mortals.xhx.module.staff.service.StaffService; import com.mortals.xhx.module.staff.service.StaffService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -28,6 +30,7 @@ import java.util.stream.Collectors; ...@@ -28,6 +30,7 @@ import java.util.stream.Collectors;
* @date 2023-03-06 * @date 2023-03-06
*/ */
@Service("deptService") @Service("deptService")
@Slf4j
public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity, Long> implements DeptService { public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity, Long> implements DeptService {
@Autowired @Autowired
...@@ -208,5 +211,49 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -208,5 +211,49 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
return collect; 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();
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
View file @ dbc7755d
...@@ -170,11 +170,11 @@ public class StaffEntity extends StaffVo { ...@@ -170,11 +170,11 @@ public class StaffEntity extends StaffVo {
this.politicalstatus = 1; this.politicalstatus = 1;
this.deptId = -1L; this.deptId = null;
this.deptName = ""; this.deptName = "";
this.positionId = -1L; this.positionId = null;
this.positionName = ""; this.positionName = "";
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java
View file @ dbc7755d
package com.mortals.xhx.module.staff.service; package com.mortals.xhx.module.staff.service;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDCacheService; import com.mortals.framework.service.ICRUDCacheService;
import com.mortals.xhx.module.staff.model.StaffEntity; import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.model.vo.StaffInfoVo; import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
...@@ -17,7 +18,7 @@ import java.util.List; ...@@ -17,7 +18,7 @@ import java.util.List;
public interface StaffService extends ICRUDCacheService<StaffEntity,Long> { public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
//查询所有数据 //查询所有数据
StaffInfoVo queryAll(); StaffInfoVo queryAll(Context context);
//统计所有在职员工 //统计所有在职员工
int queryAllPerson(); int queryAllPerson();
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @ dbc7755d
...@@ -10,6 +10,7 @@ import com.mortals.xhx.base.system.role.service.RoleUserService; ...@@ -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.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*; 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.StaffDao;
import com.mortals.xhx.module.staff.dao.ibatis.StaffDaoImpl; import com.mortals.xhx.module.staff.dao.ibatis.StaffDaoImpl;
import com.mortals.xhx.module.staff.dao.ibatis.StaffLeaveDaoImpl; import com.mortals.xhx.module.staff.dao.ibatis.StaffLeaveDaoImpl;
...@@ -39,6 +40,8 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -39,6 +40,8 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
@Autowired @Autowired
private UserService userService; private UserService userService;
@Autowired
private DeptService deptService;
@Autowired @Autowired
private RoleUserService roleUserService; private RoleUserService roleUserService;
...@@ -53,13 +56,13 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -53,13 +56,13 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
@Override @Override
protected void saveBefore(StaffEntity entity, Context context) throws AppException { protected void saveBefore(StaffEntity entity, Context context) throws AppException {
int count = this.count(new StaffQuery().workNum(entity.getWorkNum()), context); int count = this.count(new StaffQuery().workNum(entity.getWorkNum()), context);
if(count>0){ if (count > 0) {
throw new AppException("工号重复！"); throw new AppException("工号重复！");
} }
} }
@Override @Override
public StaffInfoVo queryAll() { public StaffInfoVo queryAll(Context context) {
StaffInfoVo staffInfoVo = new StaffInfoVo(); StaffInfoVo staffInfoVo = new StaffInfoVo();
//在职 //在职
StaffQuery staffQuery = new StaffQuery(); StaffQuery staffQuery = new StaffQuery();
...@@ -133,9 +136,12 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -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")); System.out.println("1" + StrUtil.padPre("125", 7, "0"));
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @ dbc7755d
...@@ -26,15 +26,14 @@ import java.util.Map; ...@@ -26,15 +26,14 @@ import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* * 员工基本信息
* 员工基本信息 *
* * @author zxfei
* @author zxfei * @date 2023-04-07
* @date 2023-04-07 */
*/
@RestController @RestController
@RequestMapping("staff") @RequestMapping("staff")
public class StaffController extends BaseCRUDJsonBodyMappingController<StaffService,StaffEntity,Long> { public class StaffController extends BaseCRUDJsonBodyMappingController<StaffService, StaffEntity, Long> {
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
...@@ -43,20 +42,21 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -43,20 +42,21 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
@Autowired @Autowired
private DeptService deptService; private DeptService deptService;
public StaffController(){
super.setModuleDesc( "员工基本信息"); public StaffController() {
super.setModuleDesc("员工基本信息");
} }
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "gender", paramService.getParamBySecondOrganize("Staff","gender")); this.addDict(model, "gender", paramService.getParamBySecondOrganize("Staff", "gender"));
this.addDict(model, "politicalstatus", paramService.getParamBySecondOrganize("Staff","politicalstatus")); this.addDict(model, "politicalstatus", paramService.getParamBySecondOrganize("Staff", "politicalstatus"));
this.addDict(model, "staffType", paramService.getParamBySecondOrganize("Staff","staffType")); this.addDict(model, "staffType", paramService.getParamBySecondOrganize("Staff", "staffType"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("Staff","status")); 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, "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<DeptEntity> list = deptService.find(new DeptQuery());
List<DeptTreeSelect> treeSelects = deptService.buildDeptTreeSelect(list); 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()))); 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 ...@@ -68,7 +68,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
@Override @Override
protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException { protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException {
//todo 员工信息统计--员工关系统计 //todo 员工信息统计--员工关系统计
StaffInfoVo staffInfoVo = this.service.queryAll(); StaffInfoVo staffInfoVo = this.service.queryAll(context);
staffInfoVo.setRefreshDate(new Date()); staffInfoVo.setRefreshDate(new Date());
model.put("staff", staffInfoVo); model.put("staff", staffInfoVo);
return super.doListAfter(query, model, context); return super.doListAfter(query, model, context);
...@@ -79,7 +79,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -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 { protected int infoAfter(Long id, Map<String, Object> model, StaffEntity entity, Context context) throws AppException {
//todo 员工统计信息 //todo 员工统计信息
List<HolidayListVo> holidayListVos = new ArrayList<>(); List<HolidayListVo> holidayListVos = new ArrayList<>();
HolidayListVo vo =new HolidayListVo(); HolidayListVo vo = new HolidayListVo();
StaffEntity staffEntity = this.service.get(id); StaffEntity staffEntity = this.service.get(id);
vo.setWorkName(staffEntity.getName()); vo.setWorkName(staffEntity.getName());
vo.setWorkStatus(String.valueOf(staffEntity.getStatus())); vo.setWorkStatus(String.valueOf(staffEntity.getStatus()));
...@@ -99,9 +99,19 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -99,9 +99,19 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
vo.setPaternityLeaveDay("10"); vo.setPaternityLeaveDay("10");
holidayListVos.add(vo); holidayListVos.add(vo);
entity.setHolidayLists(holidayListVos); entity.setHolidayLists(holidayListVos);
// StaffEntity cache = this.service.getCache(entity.getWorkNum()); // StaffEntity cache = this.service.getCache(entity.getWorkNum());
return super.infoAfter(id, model, entity, context); 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);
}
} }
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml
View file @ dbc7755d
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
<result property="deductPerson" column="deductPerson" /> <result property="deductPerson" column="deductPerson" />
<result property="deductTime" column="deductTime" /> <result property="deductTime" column="deductTime" />
<result property="windowNum" column="windowNum" /> <result property="windowNum" column="windowNum" />
<result property="auditStatus" column="auditStatus" />
</resultMap> </resultMap>
...@@ -156,23 +157,26 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowNum') or colPickMode == 1 and data.containsKey('windowNum')))">
a.windowNum, a.windowNum,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CheckAttendRecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CheckAttendRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_check_attend_record 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 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>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_check_attend_record 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 VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -323,6 +327,12 @@ ...@@ -323,6 +327,12 @@
<if test="(colPickMode==0 and data.containsKey('windowNum')) or (colPickMode==1 and !data.containsKey('windowNum'))"> <if test="(colPickMode==0 and data.containsKey('windowNum')) or (colPickMode==1 and !data.containsKey('windowNum'))">
a.windowNum=#{data.windowNum}, a.windowNum=#{data.windowNum},
</if> </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>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -640,6 +650,18 @@ ...@@ -640,6 +650,18 @@
</if> </if>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1548,6 +1570,33 @@ ...@@ -1548,6 +1570,33 @@
#{item} #{item}
</foreach> </foreach>
</if> </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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1741,6 +1790,11 @@ ...@@ -1741,6 +1790,11 @@
<if test='orderCol.windowNum != null and "DESC".equalsIgnoreCase(orderCol.windowNum)'>DESC</if> <if test='orderCol.windowNum != null and "DESC".equalsIgnoreCase(orderCol.windowNum)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('auditStatus')">
a.auditStatus
<if test='orderCol.auditStatus != null and "DESC".equalsIgnoreCase(orderCol.auditStatus)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
db/add.sql
View file @ dbc7755d
...@@ -805,3 +805,14 @@ ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `signOutResult` tinyint ...@@ -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 `attendType` varchar(128) DEFAULT '0' COMMENT '考勤类型';
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `punchResult` tinyint(2) DEFAULT '0' COMMENT '打卡结果(0.否,1.是)'; 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