feat(oa): 添加考勤数据看板功能并优化考勤记录查询
- 新增数据看板接口和相关 VO 类 -优化考勤记录查询逻辑,支持多值查询和区间查询 - 添加考勤记录数据统计功能
This commit is contained in:
@@ -4,9 +4,12 @@ import java.util.List;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import com.gear.oa.domain.vo.GearAttendanceRecordDataVo;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import javax.validation.constraints.*;
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
@@ -64,7 +67,7 @@ public class GearAttendanceRecordController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@GetMapping("/{recordId}")
|
@GetMapping("/{recordId}")
|
||||||
public R<GearAttendanceRecordVo> getInfo(@NotNull(message = "主键不能为空")
|
public R<GearAttendanceRecordVo> getInfo(@NotNull(message = "主键不能为空")
|
||||||
@PathVariable Long recordId) {
|
@PathVariable Long recordId) {
|
||||||
return R.ok(iGearAttendanceRecordService.queryById(recordId));
|
return R.ok(iGearAttendanceRecordService.queryById(recordId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,4 +102,10 @@ public class GearAttendanceRecordController extends BaseController {
|
|||||||
@PathVariable Long[] recordIds) {
|
@PathVariable Long[] recordIds) {
|
||||||
return toAjax(iGearAttendanceRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true));
|
return toAjax(iGearAttendanceRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//数据看板接口
|
||||||
|
@GetMapping("/dataBoard")
|
||||||
|
public R<GearAttendanceRecordDataVo> dataBoard(GearAttendanceRecordBo bo) {
|
||||||
|
return R.ok(iGearAttendanceRecordService.dataBoard(bo));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.gear.oa.domain.vo;
|
||||||
|
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class GearAttendanceRecordDataVo {
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.gear.oa.service;
|
package com.gear.oa.service;
|
||||||
|
|
||||||
import com.gear.oa.domain.GearAttendanceRecord;
|
import com.gear.oa.domain.GearAttendanceRecord;
|
||||||
|
import com.gear.oa.domain.vo.GearAttendanceRecordDataVo;
|
||||||
import com.gear.oa.domain.vo.GearAttendanceRecordVo;
|
import com.gear.oa.domain.vo.GearAttendanceRecordVo;
|
||||||
import com.gear.oa.domain.bo.GearAttendanceRecordBo;
|
import com.gear.oa.domain.bo.GearAttendanceRecordBo;
|
||||||
import com.gear.common.core.page.TableDataInfo;
|
import com.gear.common.core.page.TableDataInfo;
|
||||||
@@ -46,4 +47,6 @@ public interface IGearAttendanceRecordService {
|
|||||||
* 校验并批量删除考勤(含考勤/加班/出差)信息
|
* 校验并批量删除考勤(含考勤/加班/出差)信息
|
||||||
*/
|
*/
|
||||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||||
|
|
||||||
|
GearAttendanceRecordDataVo dataBoard(GearAttendanceRecordBo bo);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import com.gear.common.core.domain.PageQuery;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import com.gear.oa.domain.vo.GearAttendanceRecordDataVo;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.gear.oa.domain.bo.GearAttendanceRecordBo;
|
import com.gear.oa.domain.bo.GearAttendanceRecordBo;
|
||||||
@@ -16,6 +17,7 @@ import com.gear.oa.domain.GearAttendanceRecord;
|
|||||||
import com.gear.oa.mapper.GearAttendanceRecordMapper;
|
import com.gear.oa.mapper.GearAttendanceRecordMapper;
|
||||||
import com.gear.oa.service.IGearAttendanceRecordService;
|
import com.gear.oa.service.IGearAttendanceRecordService;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -56,7 +58,15 @@ public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordSer
|
|||||||
// 使用表别名 ar 来构建查询条件
|
// 使用表别名 ar 来构建查询条件
|
||||||
lqw.eq(bo.getUserId()!=null, "ar.user_id", bo.getUserId());
|
lqw.eq(bo.getUserId()!=null, "ar.user_id", bo.getUserId());
|
||||||
lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate());
|
lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getRecordType()), "ar.record_type", bo.getRecordType());
|
// 修改record_type查询逻辑,支持逗号分隔的多个值
|
||||||
|
if (StringUtils.isNotBlank(bo.getRecordType())) {
|
||||||
|
String[] recordTypes = bo.getRecordType().split(",");
|
||||||
|
if (recordTypes.length == 1) {
|
||||||
|
lqw.eq("ar.record_type", bo.getRecordType());
|
||||||
|
} else {
|
||||||
|
lqw.in("ar.record_type", Arrays.asList(recordTypes));
|
||||||
|
}
|
||||||
|
}
|
||||||
// 修改开始时间和结束时间为区间查询
|
// 修改开始时间和结束时间为区间查询
|
||||||
if (bo.getStartTime() != null) {
|
if (bo.getStartTime() != null) {
|
||||||
lqw.ge("ar.start_time", bo.getStartTime()); // 大于等于开始时间
|
lqw.ge("ar.start_time", bo.getStartTime()); // 大于等于开始时间
|
||||||
@@ -132,4 +142,9 @@ public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordSer
|
|||||||
}
|
}
|
||||||
return baseMapper.deleteBatchIds(ids) > 0;
|
return baseMapper.deleteBatchIds(ids) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GearAttendanceRecordDataVo dataBoard(GearAttendanceRecordBo bo) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user