feat(oa): 考勤记录查询支持导出功能并优化相关接口
- 移除了考勤记录相关接口的权限注解 - 新增了考勤记录的自定义查询方法 - 添加了昵称字段到考勤记录的 VO 类 - 更新了 mapper 和 XML 文件以支持新的查询功能
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.gear.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.gear.common.utils.StringUtils;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
@@ -44,11 +45,26 @@ public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordSer
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<GearAttendanceRecordVo> queryPageList(GearAttendanceRecordBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<GearAttendanceRecord> lqw = buildQueryWrapper(bo);
|
||||
Page<GearAttendanceRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
QueryWrapper<GearAttendanceRecord> lqw = buildQueryWrapperPlus(bo);
|
||||
Page<GearAttendanceRecordVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
private QueryWrapper<GearAttendanceRecord> buildQueryWrapperPlus(GearAttendanceRecordBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
QueryWrapper<GearAttendanceRecord> lqw = Wrappers.query();
|
||||
// 使用表别名 ar 来构建查询条件
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getUserId()), "ar.user_id", bo.getUserId());
|
||||
lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRecordType()), "ar.record_type", bo.getRecordType());
|
||||
lqw.eq(bo.getStartTime() != null, "ar.start_time", bo.getStartTime());
|
||||
lqw.eq(bo.getEndTime() != null, "ar.end_time", bo.getEndTime());
|
||||
lqw.eq(bo.getDurationHour() != null, "ar.duration_hour", bo.getDurationHour());
|
||||
//逻辑删除
|
||||
lqw.eq("ar.del_flag", "0");
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询考勤(含考勤/加班/出差)列表
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user