feat(oa): 新增考勤（含考勤/加班/出差）相关功能

- 添加 GearAttendanceRecord 模型类 - 创建 GearAttendanceRecordBo 业务对象类 - 实现 GearAttendanceRecordController 控制器 - 编写 GearAttendanceRecordMapper Mapper 接口和 XML 文件 - 开发 GearAttendanceRecordServiceImpl 服务实现类- 定义 IGearAttendanceRecordService 服务接口 - 创建 GearAttendanceRecordVo 视图对象类
2025-08-06 16:23:17 +08:00
parent 3909a19335
commit 86f40f2a9a
10 changed files with 522 additions and 0 deletions
--- a/gear-oa/src/main/java/com/gear/oa/controller/GearAttendanceRecordController.java
+++ b/gear-oa/src/main/java/com/gear/oa/controller/GearAttendanceRecordController.java
@@ -0,0 +1,108 @@
+package com.gear.oa.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.gear.common.annotation.RepeatSubmit;
+import com.gear.common.annotation.Log;
+import com.gear.common.core.controller.BaseController;
+import com.gear.common.core.domain.PageQuery;
+import com.gear.common.core.domain.R;
+import com.gear.common.core.validate.AddGroup;
+import com.gear.common.core.validate.EditGroup;
+import com.gear.common.core.validate.QueryGroup;
+import com.gear.common.enums.BusinessType;
+import com.gear.common.utils.poi.ExcelUtil;
+import com.gear.oa.domain.vo.GearAttendanceRecordVo;
+import com.gear.oa.domain.bo.GearAttendanceRecordBo;
+import com.gear.oa.service.IGearAttendanceRecordService;
+import com.gear.common.core.page.TableDataInfo;
+
+/**
+ * 考勤（含考勤/加班/出差）
+ *
+ * @author ruoyi
+ * @date 2025-08-06
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/attendanceRecord")
+public class GearAttendanceRecordController extends BaseController {
+
+    private final IGearAttendanceRecordService iGearAttendanceRecordService;
+
+    /**
+     * 查询考勤（含考勤/加班/出差）列表
+     */
+    @SaCheckPermission("oa:attendanceRecord:list")
+    @GetMapping("/list")
+    public TableDataInfo<GearAttendanceRecordVo> list(GearAttendanceRecordBo bo, PageQuery pageQuery) {
+        return iGearAttendanceRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出考勤（含考勤/加班/出差）列表
+     */
+    @SaCheckPermission("oa:attendanceRecord:export")
+    @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(GearAttendanceRecordBo bo, HttpServletResponse response) {
+        List<GearAttendanceRecordVo> list = iGearAttendanceRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "考勤（含考勤/加班/出差）", GearAttendanceRecordVo.class, response);
+    }
+
+    /**
+     * 获取考勤（含考勤/加班/出差）详细信息
+     *
+     * @param recordId 主键
+     */
+    @SaCheckPermission("oa:attendanceRecord:query")
+    @GetMapping("/{recordId}")
+    public R<GearAttendanceRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long recordId) {
+        return R.ok(iGearAttendanceRecordService.queryById(recordId));
+    }
+
+    /**
+     * 新增考勤（含考勤/加班/出差）
+     */
+    @SaCheckPermission("oa:attendanceRecord:add")
+    @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody GearAttendanceRecordBo bo) {
+        return toAjax(iGearAttendanceRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改考勤（含考勤/加班/出差）
+     */
+    @SaCheckPermission("oa:attendanceRecord:edit")
+    @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody GearAttendanceRecordBo bo) {
+        return toAjax(iGearAttendanceRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除考勤（含考勤/加班/出差）
+     *
+     * @param recordIds 主键串
+     */
+    @SaCheckPermission("oa:attendanceRecord:remove")
+    @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{recordIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] recordIds) {
+        return toAjax(iGearAttendanceRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true));
+    }
+}
--- a/gear-oa/src/main/java/com/gear/oa/domain/GearAttendanceRecord.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/GearAttendanceRecord.java
@@ -0,0 +1,70 @@
+package com.gear.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gear.common.core.domain.BaseEntity;
+
+/**
+ * 考勤（含考勤/加班/出差）对象 gear_attendance_record
+ *
+ * @author ruoyi
+ * @date 2025-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("gear_attendance_record")
+public class GearAttendanceRecord extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "record_id")
+    private Long recordId;
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 记录日期
+     */
+    private Date recordDate;
+    /**
+     * 记录类型: attendance(考勤), overtime(加班), travel(出差)
+     */
+    private String recordType;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 时长(小时) - 用于考勤/加班/出差
+     */
+    private Long durationHour;
+    /**
+     * 审批状态
+     */
+    private String status;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearAttendanceRecordBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearAttendanceRecordBo.java
@@ -0,0 +1,66 @@
+package com.gear.oa.domain.bo;
+
+import com.gear.common.core.validate.AddGroup;
+import com.gear.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gear.common.core.domain.BaseEntity;
+
+/**
+ * 考勤（含考勤/加班/出差）业务对象 gear_attendance_record
+ *
+ * @author ruoyi
+ * @date 2025-08-06
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GearAttendanceRecordBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long recordId;
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 记录日期
+     */
+    private Date recordDate;
+
+    /**
+     * 记录类型: attendance(考勤), overtime(加班), travel(出差)
+     */
+    private String recordType;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 时长(小时) - 用于考勤/加班/出差
+     */
+    private Long durationHour;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
--- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java
@@ -0,0 +1,75 @@
+package com.gear.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.gear.common.annotation.ExcelDictFormat;
+import com.gear.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 考勤（含考勤/加班/出差）视图对象 gear_attendance_record
+ *
+ * @author ruoyi
+ * @date 2025-08-06
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class GearAttendanceRecordVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long recordId;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private String userId;
+
+    /**
+     * 记录日期
+     */
+    @ExcelProperty(value = "记录日期")
+    private Date recordDate;
+
+    /**
+     * 记录类型: attendance(考勤), overtime(加班), travel(出差)
+     */
+    @ExcelProperty(value = "记录类型: attendance(考勤), overtime(加班), travel(出差)")
+    private String recordType;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 时长(小时) - 用于考勤/加班/出差
+     */
+    @ExcelProperty(value = "时长(小时) - 用于考勤/加班/出差")
+    private Long durationHour;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}
--- a/gear-oa/src/main/java/com/gear/oa/mapper/GearAttendanceRecordMapper.java
+++ b/gear-oa/src/main/java/com/gear/oa/mapper/GearAttendanceRecordMapper.java
@@ -0,0 +1,15 @@
+package com.gear.oa.mapper;
+
+import com.gear.oa.domain.GearAttendanceRecord;
+import com.gear.oa.domain.vo.GearAttendanceRecordVo;
+import com.gear.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 考勤（含考勤/加班/出差）Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-08-06
+ */
+public interface GearAttendanceRecordMapper extends BaseMapperPlus<GearAttendanceRecordMapper, GearAttendanceRecord, GearAttendanceRecordVo> {
+
+}
--- a/gear-oa/src/main/java/com/gear/oa/service/IGearAttendanceRecordService.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/IGearAttendanceRecordService.java
@@ -0,0 +1,49 @@
+package com.gear.oa.service;
+
+import com.gear.oa.domain.GearAttendanceRecord;
+import com.gear.oa.domain.vo.GearAttendanceRecordVo;
+import com.gear.oa.domain.bo.GearAttendanceRecordBo;
+import com.gear.common.core.page.TableDataInfo;
+import com.gear.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考勤（含考勤/加班/出差）Service接口
+ *
+ * @author ruoyi
+ * @date 2025-08-06
+ */
+public interface IGearAttendanceRecordService {
+
+    /**
+     * 查询考勤（含考勤/加班/出差）
+     */
+    GearAttendanceRecordVo queryById(Long recordId);
+
+    /**
+     * 查询考勤（含考勤/加班/出差）列表
+     */
+    TableDataInfo<GearAttendanceRecordVo> queryPageList(GearAttendanceRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询考勤（含考勤/加班/出差）列表
+     */
+    List<GearAttendanceRecordVo> queryList(GearAttendanceRecordBo bo);
+
+    /**
+     * 新增考勤（含考勤/加班/出差）
+     */
+    Boolean insertByBo(GearAttendanceRecordBo bo);
+
+    /**
+     * 修改考勤（含考勤/加班/出差）
+     */
+    Boolean updateByBo(GearAttendanceRecordBo bo);
+
+    /**
+     * 校验并批量删除考勤（含考勤/加班/出差）信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
--- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearAttendanceRecordServiceImpl.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearAttendanceRecordServiceImpl.java
@@ -0,0 +1,114 @@
+package com.gear.oa.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.gear.common.utils.StringUtils;
+import com.gear.common.core.page.TableDataInfo;
+import com.gear.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.gear.oa.domain.bo.GearAttendanceRecordBo;
+import com.gear.oa.domain.vo.GearAttendanceRecordVo;
+import com.gear.oa.domain.GearAttendanceRecord;
+import com.gear.oa.mapper.GearAttendanceRecordMapper;
+import com.gear.oa.service.IGearAttendanceRecordService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 考勤（含考勤/加班/出差）Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-08-06
+ */
+@RequiredArgsConstructor
+@Service
+public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordService {
+
+    private final GearAttendanceRecordMapper baseMapper;
+
+    /**
+     * 查询考勤（含考勤/加班/出差）
+     */
+    @Override
+    public GearAttendanceRecordVo queryById(Long recordId){
+        return baseMapper.selectVoById(recordId);
+    }
+
+    /**
+     * 查询考勤（含考勤/加班/出差）列表
+     */
+    @Override
+    public TableDataInfo<GearAttendanceRecordVo> queryPageList(GearAttendanceRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<GearAttendanceRecord> lqw = buildQueryWrapper(bo);
+        Page<GearAttendanceRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询考勤（含考勤/加班/出差）列表
+     */
+    @Override
+    public List<GearAttendanceRecordVo> queryList(GearAttendanceRecordBo bo) {
+        LambdaQueryWrapper<GearAttendanceRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<GearAttendanceRecord> buildQueryWrapper(GearAttendanceRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GearAttendanceRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getUserId()), GearAttendanceRecord::getUserId, bo.getUserId());
+        lqw.eq(bo.getRecordDate() != null, GearAttendanceRecord::getRecordDate, bo.getRecordDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getRecordType()), GearAttendanceRecord::getRecordType, bo.getRecordType());
+        lqw.eq(bo.getStartTime() != null, GearAttendanceRecord::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, GearAttendanceRecord::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getDurationHour() != null, GearAttendanceRecord::getDurationHour, bo.getDurationHour());
+        return lqw;
+    }
+
+    /**
+     * 新增考勤（含考勤/加班/出差）
+     */
+    @Override
+    public Boolean insertByBo(GearAttendanceRecordBo bo) {
+        GearAttendanceRecord add = BeanUtil.toBean(bo, GearAttendanceRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setRecordId(add.getRecordId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改考勤（含考勤/加班/出差）
+     */
+    @Override
+    public Boolean updateByBo(GearAttendanceRecordBo bo) {
+        GearAttendanceRecord update = BeanUtil.toBean(bo, GearAttendanceRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(GearAttendanceRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除考勤（含考勤/加班/出差）
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}