feat(oa): 新增考勤计件明细功能并优化相关领域模型

- 新增考勤计件明细领域模型、BO、VO及相应CRUD接口和实现- 在考勤记录中添加薪酬类型、件数和工资金额字段
- 优化考勤记录查询逻辑,支持按薪酬类型筛选- 在产品领域模型中添加图像字段
This commit is contained in:
2025-09-17 13:41:32 +08:00
parent abe3c57300
commit fd78a14637
18 changed files with 562 additions and 3 deletions

View File

@@ -0,0 +1,102 @@
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.GearAttendancePieceDetailVo;
import com.gear.oa.domain.bo.GearAttendancePieceDetailBo;
import com.gear.oa.service.IGearAttendancePieceDetailService;
import com.gear.common.core.page.TableDataInfo;
/**
* 考勤计件明细 - 记录具体工件的数量和单价信息
*
* @author Joshi
* @date 2025-09-17
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/attendancePieceDetail")
public class GearAttendancePieceDetailController extends BaseController {
private final IGearAttendancePieceDetailService iGearAttendancePieceDetailService;
/**
* 查询考勤计件明细 - 记录具体工件的数量和单价信息列表
*/
@GetMapping("/list")
public TableDataInfo<GearAttendancePieceDetailVo> list(GearAttendancePieceDetailBo bo, PageQuery pageQuery) {
return iGearAttendancePieceDetailService.queryPageList(bo, pageQuery);
}
/**
* 导出考勤计件明细 - 记录具体工件的数量和单价信息列表
*/
@Log(title = "考勤计件明细 - 记录具体工件的数量和单价信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(GearAttendancePieceDetailBo bo, HttpServletResponse response) {
List<GearAttendancePieceDetailVo> list = iGearAttendancePieceDetailService.queryList(bo);
ExcelUtil.exportExcel(list, "考勤计件明细 - 记录具体工件的数量和单价信息", GearAttendancePieceDetailVo.class, response);
}
/**
* 获取考勤计件明细 - 记录具体工件的数量和单价信息详细信息
*
* @param detailId 主键
*/
@GetMapping("/{detailId}")
public R<GearAttendancePieceDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long detailId) {
return R.ok(iGearAttendancePieceDetailService.queryById(detailId));
}
/**
* 新增考勤计件明细 - 记录具体工件的数量和单价信息
*/
@Log(title = "考勤计件明细 - 记录具体工件的数量和单价信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody GearAttendancePieceDetailBo bo) {
return toAjax(iGearAttendancePieceDetailService.insertByBo(bo));
}
/**
* 修改考勤计件明细 - 记录具体工件的数量和单价信息
*/
@Log(title = "考勤计件明细 - 记录具体工件的数量和单价信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody GearAttendancePieceDetailBo bo) {
return toAjax(iGearAttendancePieceDetailService.updateByBo(bo));
}
/**
* 删除考勤计件明细 - 记录具体工件的数量和单价信息
*
* @param detailIds 主键串
*/
@Log(title = "考勤计件明细 - 记录具体工件的数量和单价信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{detailIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] detailIds) {
return toAjax(iGearAttendancePieceDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true));
}
}

View File

@@ -0,0 +1,61 @@
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.math.BigDecimal;
import com.gear.common.core.domain.BaseEntity;
/**
* 考勤计件明细 - 记录具体工件的数量和单价信息对象 gear_attendance_piece_detail
*
* @author Joshi
* @date 2025-09-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("gear_attendance_piece_detail")
public class GearAttendancePieceDetail extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 明细主键ID
*/
@TableId(value = "detail_id")
private Long detailId;
/**
* 关联考勤主表ID
*/
private Long recordId;
/**
* 工件编码
*/
private String workpieceCode;
/**
* 工件名称
*/
private String workpieceName;
/**
* 工件数量
*/
private Long pieceQuantity;
/**
* 单位单价
*/
private BigDecimal unitPrice;
/**
* 删除标志
*/
@TableLogic
private Long delFlag;
/**
* 备注
*/
private String remark;
}

View File

@@ -72,4 +72,16 @@ public class GearAttendanceRecord extends BaseEntity {
*/
private String remark;
/**
* 薪酬类型: hourly(计时), piecework(计件)
*/
private String paymentType;
/**
* 件数 - 仅用于计件类型
*/
private Long pieceCount;
/**
* 工资金额 - 计算后的应付工资
*/
private BigDecimal wage;
}

View File

@@ -70,4 +70,6 @@ public class GearProduct extends BaseEntity {
//附件
private String accessory;
//新增图像字段
private String image;
}

View File

@@ -0,0 +1,61 @@
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.math.BigDecimal;
import com.gear.common.core.domain.BaseEntity;
/**
* 考勤计件明细 - 记录具体工件的数量和单价信息业务对象 gear_attendance_piece_detail
*
* @author Joshi
* @date 2025-09-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class GearAttendancePieceDetailBo extends BaseEntity {
/**
* 明细主键ID
*/
private Long detailId;
/**
* 关联考勤主表ID
*/
private Long recordId;
/**
* 工件编码
*/
private String workpieceCode;
/**
* 工件名称
*/
private String workpieceName;
/**
* 工件数量
*/
private Long pieceQuantity;
/**
* 单位单价
*/
private BigDecimal unitPrice;
/**
* 备注
*/
private String remark;
}

View File

@@ -3,6 +3,7 @@ package com.gear.oa.domain.bo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -63,5 +64,17 @@ public class GearAttendanceRecordBo extends BaseEntity {
*/
private String remark;
/**
* 薪酬类型: hourly(计时), piecework(计件)
*/
private String paymentType;
/**
* 件数 - 仅用于计件类型
*/
private Long pieceCount;
/**
* 工资金额 - 计算后的应付工资
*/
private BigDecimal wage;
}

View File

@@ -72,5 +72,6 @@ public class GearProductBo extends BaseEntity {
private Long categoryId;
//附件
private String accessory;
//新增图像字段
private String image;
}

View File

@@ -0,0 +1,68 @@
package com.gear.oa.domain.vo;
import java.math.BigDecimal;
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_piece_detail
*
* @author Joshi
* @date 2025-09-17
*/
@Data
@ExcelIgnoreUnannotated
public class GearAttendancePieceDetailVo {
private static final long serialVersionUID = 1L;
/**
* 明细主键ID
*/
@ExcelProperty(value = "明细主键ID")
private Long detailId;
/**
* 关联考勤主表ID
*/
@ExcelProperty(value = "关联考勤主表ID")
private Long recordId;
/**
* 工件编码
*/
@ExcelProperty(value = "工件编码")
private String workpieceCode;
/**
* 工件名称
*/
@ExcelProperty(value = "工件名称")
private String workpieceName;
/**
* 工件数量
*/
@ExcelProperty(value = "工件数量")
private Long pieceQuantity;
/**
* 单位单价
*/
@ExcelProperty(value = "单位单价")
private BigDecimal unitPrice;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -1,5 +1,6 @@
package com.gear.oa.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -79,6 +80,17 @@ public class GearAttendanceRecordVo {
//昵称
@ExcelProperty(value = "姓名")
private String nickName;
/**
* 薪酬类型: hourly(计时), piecework(计件)
*/
private String paymentType;
/**
* 件数 - 仅用于计件类型
*/
private Long pieceCount;
/**
* 工资金额 - 计算后的应付工资
*/
private BigDecimal wage;
}

View File

@@ -83,4 +83,6 @@ public class GearProductVo {
private Long categoryId;
//附件
private String accessory;
//新增图像字段
private String image;
}

View File

@@ -0,0 +1,19 @@
package com.gear.oa.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gear.oa.domain.GearAttendancePieceDetail;
import com.gear.oa.domain.vo.GearAttendancePieceDetailVo;
import com.gear.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* 考勤计件明细 - 记录具体工件的数量和单价信息Mapper接口
*
* @author Joshi
* @date 2025-09-17
*/
public interface GearAttendancePieceDetailMapper extends BaseMapperPlus<GearAttendancePieceDetailMapper, GearAttendancePieceDetail, GearAttendancePieceDetailVo> {
Page<GearAttendancePieceDetailVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<GearAttendancePieceDetail> lqw);
}

View File

@@ -0,0 +1,49 @@
package com.gear.oa.service;
import com.gear.oa.domain.GearAttendancePieceDetail;
import com.gear.oa.domain.vo.GearAttendancePieceDetailVo;
import com.gear.oa.domain.bo.GearAttendancePieceDetailBo;
import com.gear.common.core.page.TableDataInfo;
import com.gear.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 考勤计件明细 - 记录具体工件的数量和单价信息Service接口
*
* @author Joshi
* @date 2025-09-17
*/
public interface IGearAttendancePieceDetailService {
/**
* 查询考勤计件明细 - 记录具体工件的数量和单价信息
*/
GearAttendancePieceDetailVo queryById(Long detailId);
/**
* 查询考勤计件明细 - 记录具体工件的数量和单价信息列表
*/
TableDataInfo<GearAttendancePieceDetailVo> queryPageList(GearAttendancePieceDetailBo bo, PageQuery pageQuery);
/**
* 查询考勤计件明细 - 记录具体工件的数量和单价信息列表
*/
List<GearAttendancePieceDetailVo> queryList(GearAttendancePieceDetailBo bo);
/**
* 新增考勤计件明细 - 记录具体工件的数量和单价信息
*/
Boolean insertByBo(GearAttendancePieceDetailBo bo);
/**
* 修改考勤计件明细 - 记录具体工件的数量和单价信息
*/
Boolean updateByBo(GearAttendancePieceDetailBo bo);
/**
* 校验并批量删除考勤计件明细 - 记录具体工件的数量和单价信息信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,125 @@
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;
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.GearAttendancePieceDetailBo;
import com.gear.oa.domain.vo.GearAttendancePieceDetailVo;
import com.gear.oa.domain.GearAttendancePieceDetail;
import com.gear.oa.mapper.GearAttendancePieceDetailMapper;
import com.gear.oa.service.IGearAttendancePieceDetailService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 考勤计件明细 - 记录具体工件的数量和单价信息Service业务层处理
*
* @author Joshi
* @date 2025-09-17
*/
@RequiredArgsConstructor
@Service
public class GearAttendancePieceDetailServiceImpl implements IGearAttendancePieceDetailService {
private final GearAttendancePieceDetailMapper baseMapper;
/**
* 查询考勤计件明细 - 记录具体工件的数量和单价信息
*/
@Override
public GearAttendancePieceDetailVo queryById(Long detailId){
return baseMapper.selectVoById(detailId);
}
/**
* 查询考勤计件明细 - 记录具体工件的数量和单价信息列表
*/
@Override
public TableDataInfo<GearAttendancePieceDetailVo> queryPageList(GearAttendancePieceDetailBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<GearAttendancePieceDetail> lqw = buildQueryWrapper(bo);
Page<GearAttendancePieceDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private QueryWrapper<GearAttendancePieceDetail> buildQueryWrapperPlus(GearAttendancePieceDetailBo bo) {
Map<String, Object> params = bo.getParams();
//需要改成对应的queryWrapper用来联查
QueryWrapper<GearAttendancePieceDetail> qw = new QueryWrapper<>();
qw.eq("d.del_flag", 0);
qw.eq(bo.getRecordId() != null, "d.record_id", bo.getRecordId());
qw.eq(StringUtils.isNotBlank(bo.getWorkpieceCode()), "d.workpiece_code", bo.getWorkpieceCode());
qw.like(StringUtils.isNotBlank(bo.getWorkpieceName()), "d.workpiece_name", bo.getWorkpieceName());
qw.eq(bo.getPieceQuantity() != null, "d.piece_quantity", bo.getPieceQuantity());
qw.eq(bo.getUnitPrice() != null, "d.unit_price", bo.getUnitPrice());
return qw;
}
/**
* 查询考勤计件明细 - 记录具体工件的数量和单价信息列表
*/
@Override
public List<GearAttendancePieceDetailVo> queryList(GearAttendancePieceDetailBo bo) {
LambdaQueryWrapper<GearAttendancePieceDetail> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<GearAttendancePieceDetail> buildQueryWrapper(GearAttendancePieceDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<GearAttendancePieceDetail> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getRecordId() != null, GearAttendancePieceDetail::getRecordId, bo.getRecordId());
lqw.eq(StringUtils.isNotBlank(bo.getWorkpieceCode()), GearAttendancePieceDetail::getWorkpieceCode, bo.getWorkpieceCode());
lqw.like(StringUtils.isNotBlank(bo.getWorkpieceName()), GearAttendancePieceDetail::getWorkpieceName, bo.getWorkpieceName());
lqw.eq(bo.getPieceQuantity() != null, GearAttendancePieceDetail::getPieceQuantity, bo.getPieceQuantity());
lqw.eq(bo.getUnitPrice() != null, GearAttendancePieceDetail::getUnitPrice, bo.getUnitPrice());
return lqw;
}
/**
* 新增考勤计件明细 - 记录具体工件的数量和单价信息
*/
@Override
public Boolean insertByBo(GearAttendancePieceDetailBo bo) {
GearAttendancePieceDetail add = BeanUtil.toBean(bo, GearAttendancePieceDetail.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setDetailId(add.getDetailId());
}
return flag;
}
/**
* 修改考勤计件明细 - 记录具体工件的数量和单价信息
*/
@Override
public Boolean updateByBo(GearAttendancePieceDetailBo bo) {
GearAttendancePieceDetail update = BeanUtil.toBean(bo, GearAttendancePieceDetail.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(GearAttendancePieceDetail entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除考勤计件明细 - 记录具体工件的数量和单价信息
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

View File

@@ -58,6 +58,8 @@ public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordSer
// 使用表别名 ar 来构建查询条件
lqw.eq(bo.getUserId()!=null, "ar.user_id", bo.getUserId());
lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate());
//支持薪酬类型查询
lqw.eq(StringUtils.isNotBlank(bo.getPaymentType()), "ar.payment_type", bo.getPaymentType());
// 修改record_type查询逻辑支持逗号分隔的多个值
if (StringUtils.isNotBlank(bo.getRecordType())) {
String[] recordTypes = bo.getRecordType().split(",");

View File

@@ -70,6 +70,8 @@ public class GearJournalServiceImpl implements IGearJournalService {
lqw.eq(bo.getIncomeAmount() != null, GearJournal::getIncomeAmount, bo.getIncomeAmount());
lqw.eq(bo.getExpenseAmount() != null, GearJournal::getExpenseAmount, bo.getExpenseAmount());
lqw.eq(bo.getBalanceAmount() != null, GearJournal::getBalanceAmount, bo.getBalanceAmount());
//根据这个日期进行一个倒叙
lqw.orderByDesc(GearJournal::getJournalDate);
return lqw;
}

View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gear.oa.mapper.GearAttendancePieceDetailMapper">
<resultMap type="com.gear.oa.domain.GearAttendancePieceDetail" id="GearAttendancePieceDetailResult">
<result property="detailId" column="detail_id"/>
<result property="recordId" column="record_id"/>
<result property="workpieceCode" column="workpiece_code"/>
<result property="workpieceName" column="workpiece_name"/>
<result property="pieceQuantity" column="piece_quantity"/>
<result property="unitPrice" column="unit_price"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="selectVoPagePlus" resultType="com.gear.oa.domain.vo.GearAttendancePieceDetailVo"></select>
</mapper>

View File

@@ -12,6 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="durationHour" column="duration_hour"/>
<result property="paymentType" column="payment_type"/>
<result property="pieceCount" column="piece_count"/>
<result property="wage" column="wage"/>
<result property="status" column="status"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
@@ -22,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectVoPagePlus" resultType="com.gear.oa.domain.vo.GearAttendanceRecordVo">
select ar.record_id, ar.user_id, ar.record_date, ar.record_type, ar.start_time,
ar.end_time, ar.duration_hour, ar.status, ar.create_time, ar.create_by,
ar.end_time, ar.duration_hour, ar.status, ar.payment_type, ar.piece_count, ar.wage, ar.create_time, ar.create_by,
ar.update_time, ar.update_by, ar.del_flag, ar.remark,
s.nick_name AS nickName
from gear_attendance_record ar

View File

@@ -14,6 +14,7 @@
<result property="bomId" column="bom_id"/>
<result property="type" column="type"/>
<result property="accessory" column="accessory"/>
<result property="image" column="image"/>
<result property="isEnabled" column="is_enabled"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>