From 736b786ff934dc659047ac873dbfc4296241ebb5 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 12 May 2026 15:55:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E8=A7=84=E5=88=99=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建考勤规则实体类WmsAttendanceRule，包含迟到、早退、旷工相关配置字段 - 实现考勤规则业务对象WmsAttendanceRuleBo和视图对象WmsAttendanceRuleVo - 开发考勤规则服务接口IWmsAttendanceRuleService及其实现类 - 构建考勤规则控制器WmsAttendanceRuleController，提供增删改查API - 配置考勤规则数据访问层WmsAttendanceRuleMapper及对应的XML映射文件 - 实现考勤规则列表查询、详情获取、新增修改、删除导出等功能 - 添加数据验证、分页查询、Excel导出等基础功能支持 --- .../WmsAttendanceRuleController.java | 99 +++++++++++++++ .../com/klp/domain/WmsAttendanceRule.java | 66 ++++++++++ .../klp/domain/bo/WmsAttendanceRuleBo.java | 67 ++++++++++ .../klp/domain/vo/WmsAttendanceRuleVo.java | 83 +++++++++++++ .../klp/mapper/WmsAttendanceRuleMapper.java | 15 +++ .../service/IWmsAttendanceRuleService.java | 49 ++++++++ .../impl/WmsAttendanceRuleServiceImpl.java | 114 ++++++++++++++++++ .../mapper/klp/WmsAttendanceRuleMapper.xml | 25 ++++ 8 files changed, 518 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsAttendanceRuleController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceRuleBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsAttendanceRuleMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsAttendanceRuleService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceRuleServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceRuleController.java b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceRuleController.java new file mode 100644 index 00000000..2b5f4e53 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceRuleController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsAttendanceRuleVo; +import com.klp.domain.bo.WmsAttendanceRuleBo; +import com.klp.service.IWmsAttendanceRuleService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 考勤规则（迟到/早退/旷工规则配置） + * + * @author klp + * @date 2026-05-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/attendanceRule") +public class WmsAttendanceRuleController extends BaseController { + + private final IWmsAttendanceRuleService iWmsAttendanceRuleService; + + /** + * 查询考勤规则（迟到/早退/旷工规则配置）列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsAttendanceRuleBo bo, PageQuery pageQuery) { + return iWmsAttendanceRuleService.queryPageList(bo, pageQuery); + } + + /** + * 导出考勤规则（迟到/早退/旷工规则配置）列表 + */ + @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsAttendanceRuleBo bo, HttpServletResponse response) { + List list = iWmsAttendanceRuleService.queryList(bo); + ExcelUtil.exportExcel(list, "考勤规则（迟到/早退/旷工规则配置）", WmsAttendanceRuleVo.class, response); + } + + /** + * 获取考勤规则（迟到/早退/旷工规则配置）详细信息 + * + * @param ruleId 主键 + */ + @GetMapping("/{ruleId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long ruleId) { + return R.ok(iWmsAttendanceRuleService.queryById(ruleId)); + } + + /** + * 新增考勤规则（迟到/早退/旷工规则配置） + */ + @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsAttendanceRuleBo bo) { + return toAjax(iWmsAttendanceRuleService.insertByBo(bo)); + } + + /** + * 修改考勤规则（迟到/早退/旷工规则配置） + */ + @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsAttendanceRuleBo bo) { + return toAjax(iWmsAttendanceRuleService.updateByBo(bo)); + } + + /** + * 删除考勤规则（迟到/早退/旷工规则配置） + * + * @param ruleIds 主键串 + */ + @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.DELETE) + @DeleteMapping("/{ruleIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ruleIds) { + return toAjax(iWmsAttendanceRuleService.deleteWithValidByIds(Arrays.asList(ruleIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java new file mode 100644 index 00000000..1062ea88 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java @@ -0,0 +1,66 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 考勤规则（迟到/早退/旷工规则配置）对象 wms_attendance_rule + * + * @author klp + * @date 2026-05-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_attendance_rule") +public class WmsAttendanceRule extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "rule_id") + private Long ruleId; + /** + * 迟到警告阈值（分钟内仅警告，不扣款） + */ + private Long lateWarn; + /** + * 迟到一级阈值（分钟） + */ + private Long late1; + /** + * 迟到二级阈值（分钟） + */ + private Long late2; + /** + * 迟到一级扣款（元/次） + */ + private BigDecimal deduct1; + /** + * 迟到二级扣款（元/次） + */ + private BigDecimal deduct2; + /** + * 超过多少分钟按旷工半天处理 + */ + private Long absentHalfDay; + /** + * 连续旷工多少天自动离职 + */ + private Long continuousAbsentDays; + /** + * 备注 + */ + private String remark; + /** + * 删除标记(0正常 1删除) + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceRuleBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceRuleBo.java new file mode 100644 index 00000000..0ba75cc1 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceRuleBo.java @@ -0,0 +1,67 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.math.BigDecimal; + +/** + * 考勤规则（迟到/早退/旷工规则配置）业务对象 wms_attendance_rule + * + * @author klp + * @date 2026-05-12 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsAttendanceRuleBo extends BaseEntity { + + /** + * 主键ID + */ + private Long ruleId; + + /** + * 迟到警告阈值（分钟内仅警告，不扣款） + */ + private Long lateWarn; + + /** + * 迟到一级阈值（分钟） + */ + private Long late1; + + /** + * 迟到二级阈值（分钟） + */ + private Long late2; + + /** + * 迟到一级扣款（元/次） + */ + private BigDecimal deduct1; + + /** + * 迟到二级扣款（元/次） + */ + private BigDecimal deduct2; + + /** + * 超过多少分钟按旷工半天处理 + */ + private Long absentHalfDay; + + /** + * 连续旷工多少天自动离职 + */ + private Long continuousAbsentDays; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java new file mode 100644 index 00000000..5d7a73d7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java @@ -0,0 +1,83 @@ +package com.klp.domain.vo; + +import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 考勤规则（迟到/早退/旷工规则配置）视图对象 wms_attendance_rule + * + * @author klp + * @date 2026-05-12 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsAttendanceRuleVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long ruleId; + + /** + * 迟到警告阈值（分钟内仅警告，不扣款） + */ + @ExcelProperty(value = "迟到警告阈值", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "分=钟内仅警告，不扣款") + private Long lateWarn; + + /** + * 迟到一级阈值（分钟） + */ + @ExcelProperty(value = "迟到一级阈值", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "分=钟") + private Long late1; + + /** + * 迟到二级阈值（分钟） + */ + @ExcelProperty(value = "迟到二级阈值", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "分=钟") + private Long late2; + + /** + * 迟到一级扣款（元/次） + */ + @ExcelProperty(value = "迟到一级扣款", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "元=/次") + private BigDecimal deduct1; + + /** + * 迟到二级扣款（元/次） + */ + @ExcelProperty(value = "迟到二级扣款", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "元=/次") + private BigDecimal deduct2; + + /** + * 超过多少分钟按旷工半天处理 + */ + @ExcelProperty(value = "超过多少分钟按旷工半天处理") + private Long absentHalfDay; + + /** + * 连续旷工多少天自动离职 + */ + @ExcelProperty(value = "连续旷工多少天自动离职") + private Long continuousAbsentDays; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsAttendanceRuleMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsAttendanceRuleMapper.java new file mode 100644 index 00000000..6c4d884c --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsAttendanceRuleMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsAttendanceRule; +import com.klp.domain.vo.WmsAttendanceRuleVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 考勤规则（迟到/早退/旷工规则配置）Mapper接口 + * + * @author klp + * @date 2026-05-12 + */ +public interface WmsAttendanceRuleMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsAttendanceRuleService.java b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceRuleService.java new file mode 100644 index 00000000..e7f3a6e9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceRuleService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsAttendanceRule; +import com.klp.domain.vo.WmsAttendanceRuleVo; +import com.klp.domain.bo.WmsAttendanceRuleBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 考勤规则（迟到/早退/旷工规则配置）Service接口 + * + * @author klp + * @date 2026-05-12 + */ +public interface IWmsAttendanceRuleService { + + /** + * 查询考勤规则（迟到/早退/旷工规则配置） + */ + WmsAttendanceRuleVo queryById(Long ruleId); + + /** + * 查询考勤规则（迟到/早退/旷工规则配置）列表 + */ + TableDataInfo queryPageList(WmsAttendanceRuleBo bo, PageQuery pageQuery); + + /** + * 查询考勤规则（迟到/早退/旷工规则配置）列表 + */ + List queryList(WmsAttendanceRuleBo bo); + + /** + * 新增考勤规则（迟到/早退/旷工规则配置） + */ + Boolean insertByBo(WmsAttendanceRuleBo bo); + + /** + * 修改考勤规则（迟到/早退/旷工规则配置） + */ + Boolean updateByBo(WmsAttendanceRuleBo bo); + + /** + * 校验并批量删除考勤规则（迟到/早退/旷工规则配置）信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceRuleServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceRuleServiceImpl.java new file mode 100644 index 00000000..abf822ca --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceRuleServiceImpl.java @@ -0,0 +1,114 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.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.klp.domain.bo.WmsAttendanceRuleBo; +import com.klp.domain.vo.WmsAttendanceRuleVo; +import com.klp.domain.WmsAttendanceRule; +import com.klp.mapper.WmsAttendanceRuleMapper; +import com.klp.service.IWmsAttendanceRuleService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 考勤规则（迟到/早退/旷工规则配置）Service业务层处理 + * + * @author klp + * @date 2026-05-12 + */ +@RequiredArgsConstructor +@Service +public class WmsAttendanceRuleServiceImpl implements IWmsAttendanceRuleService { + + private final WmsAttendanceRuleMapper baseMapper; + + /** + * 查询考勤规则（迟到/早退/旷工规则配置） + */ + @Override + public WmsAttendanceRuleVo queryById(Long ruleId){ + return baseMapper.selectVoById(ruleId); + } + + /** + * 查询考勤规则（迟到/早退/旷工规则配置）列表 + */ + @Override + public TableDataInfo queryPageList(WmsAttendanceRuleBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询考勤规则（迟到/早退/旷工规则配置）列表 + */ + @Override + public List queryList(WmsAttendanceRuleBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsAttendanceRuleBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getLateWarn() != null, WmsAttendanceRule::getLateWarn, bo.getLateWarn()); + lqw.eq(bo.getLate1() != null, WmsAttendanceRule::getLate1, bo.getLate1()); + lqw.eq(bo.getLate2() != null, WmsAttendanceRule::getLate2, bo.getLate2()); + lqw.eq(bo.getDeduct1() != null, WmsAttendanceRule::getDeduct1, bo.getDeduct1()); + lqw.eq(bo.getDeduct2() != null, WmsAttendanceRule::getDeduct2, bo.getDeduct2()); + lqw.eq(bo.getAbsentHalfDay() != null, WmsAttendanceRule::getAbsentHalfDay, bo.getAbsentHalfDay()); + lqw.eq(bo.getContinuousAbsentDays() != null, WmsAttendanceRule::getContinuousAbsentDays, bo.getContinuousAbsentDays()); + return lqw; + } + + /** + * 新增考勤规则（迟到/早退/旷工规则配置） + */ + @Override + public Boolean insertByBo(WmsAttendanceRuleBo bo) { + WmsAttendanceRule add = BeanUtil.toBean(bo, WmsAttendanceRule.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRuleId(add.getRuleId()); + } + return flag; + } + + /** + * 修改考勤规则（迟到/早退/旷工规则配置） + */ + @Override + public Boolean updateByBo(WmsAttendanceRuleBo bo) { + WmsAttendanceRule update = BeanUtil.toBean(bo, WmsAttendanceRule.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsAttendanceRule entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除考勤规则（迟到/早退/旷工规则配置） + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml new file mode 100644 index 00000000..57d4b5c9 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + +