From 139f0ebb3e0ff8b428e9ede0ec0456a75c8e7efe Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 12 May 2026 17:09:37 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E9=87=8D=E6=9E=84=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E8=A7=84=E5=88=99=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将迟到一级相关字段从 late1 重命名为 lateOne - 将迟到二级相关字段从 late2 重命名为 lateTwo - 将迟到一级扣款字段从 deduct1 重命名为 deductOne - 将迟到二级扣款字段从 deduct2 重命名为 deductTwo - 更新所有相关的 getter/setter 方法调用 - 修改映射文件中的字段映射配置 - 更新查询条件中的字段引用 --- .../com/klp/domain/WmsAttendanceRule.java | 8 ++--- .../klp/domain/bo/WmsAttendanceRuleBo.java | 8 ++--- .../klp/domain/vo/WmsAttendanceRuleVo.java | 8 ++--- .../impl/WmsAttendanceCheckServiceImpl.java | 30 +++++++++---------- .../impl/WmsAttendanceRuleServiceImpl.java | 8 ++--- .../mapper/klp/WmsAttendanceRuleMapper.xml | 8 ++--- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java index 1062ea88..41045b71 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java @@ -32,19 +32,19 @@ public class WmsAttendanceRule extends BaseEntity { /** * 迟到一级阈值（分钟） */ - private Long late1; + private Long lateOne; /** * 迟到二级阈值（分钟） */ - private Long late2; + private Long lateTwo; /** * 迟到一级扣款（元/次） */ - private BigDecimal deduct1; + private BigDecimal deductOne; /** * 迟到二级扣款（元/次） */ - private BigDecimal deduct2; + private BigDecimal deductTwo; /** * 超过多少分钟按旷工半天处理 */ 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 index 0ba75cc1..e1ab3110 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceRuleBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceRuleBo.java @@ -31,22 +31,22 @@ public class WmsAttendanceRuleBo extends BaseEntity { /** * 迟到一级阈值（分钟） */ - private Long late1; + private Long lateOne; /** * 迟到二级阈值（分钟） */ - private Long late2; + private Long lateTwo; /** * 迟到一级扣款（元/次） */ - private BigDecimal deduct1; + private BigDecimal deductOne; /** * 迟到二级扣款（元/次） */ - private BigDecimal deduct2; + private BigDecimal deductTwo; /** * 超过多少分钟按旷工半天处理 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 index 5d7a73d7..c107c851 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java @@ -38,28 +38,28 @@ public class WmsAttendanceRuleVo { */ @ExcelProperty(value = "迟到一级阈值", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "分=钟") - private Long late1; + private Long lateOne; /** * 迟到二级阈值（分钟） */ @ExcelProperty(value = "迟到二级阈值", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "分=钟") - private Long late2; + private Long lateTwo; /** * 迟到一级扣款（元/次） */ @ExcelProperty(value = "迟到一级扣款", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "元=/次") - private BigDecimal deduct1; + private BigDecimal deductOne; /** * 迟到二级扣款（元/次） */ @ExcelProperty(value = "迟到二级扣款", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "元=/次") - private BigDecimal deduct2; + private BigDecimal deductTwo; /** * 超过多少分钟按旷工半天处理 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java index 5c48a5ca..d15e3144 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java @@ -127,10 +127,10 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService if (rule == null) { rule = new WmsAttendanceRule(); rule.setLateWarn(3L); - rule.setLate1(5L); - rule.setLate2(15L); - rule.setDeduct1(new BigDecimal("10")); - rule.setDeduct2(new BigDecimal("30")); + rule.setLateOne(5L); + rule.setLateTwo(15L); + rule.setDeductOne(new BigDecimal("10")); + rule.setDeductTwo(new BigDecimal("30")); rule.setAbsentHalfDay(15L); rule.setContinuousAbsentDays(3L); } @@ -242,14 +242,14 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService lateMinutes = (int) Duration.between(expStart, firstCheck).toMinutes(); if (lateMinutes > rule.getAbsentHalfDay()) { status = "absent_half"; - } else if (lateMinutes > rule.getLate2()) { + } else if (lateMinutes > rule.getLateTwo()) { status = "absent_half"; - } else if (lateMinutes > rule.getLate1()) { - status = "late_2"; - deduct = deduct.add(rule.getDeduct2()); + } else if (lateMinutes > rule.getLateOne()) { + status = "late_two"; + deduct = deduct.add(rule.getDeductTwo()); } else if (lateMinutes > rule.getLateWarn()) { - status = "late_1"; - deduct = deduct.add(rule.getDeduct1()); + status = "late_one"; + deduct = deduct.add(rule.getDeductOne()); } else { status = "late_warn"; } @@ -261,16 +261,16 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService if (min > rule.getAbsentHalfDay()) { status = maxSeverity(status, "absent_half"); earlyMinutes = min; - } else if (min > rule.getLate2()) { + } else if (min > rule.getLateTwo()) { status = maxSeverity(status, "absent_half"); earlyMinutes = min; - } else if (min > rule.getLate1()) { + } else if (min > rule.getLateOne()) { status = maxSeverity(status, "early_2"); - deduct = deduct.add(rule.getDeduct2()); + deduct = deduct.add(rule.getDeductTwo()); earlyMinutes = min; } else if (min > rule.getLateWarn()) { status = maxSeverity(status, "early_1"); - deduct = deduct.add(rule.getDeduct1()); + deduct = deduct.add(rule.getDeductOne()); earlyMinutes = min; } else { if ("normal".equals(status)) { @@ -307,7 +307,7 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService } private String maxSeverity(String a, String b) { - List severity = java.util.Arrays.asList("normal", "late_warn", "early_warn", "late_1", "early_1", "late_2", "early_2", "absent_half"); + List severity = java.util.Arrays.asList("normal", "late_warn", "early_warn", "late_one", "early_1", "late_two", "early_2", "absent_half"); int ai = severity.indexOf(a); int bi = severity.indexOf(b); return severity.get(Math.max(ai, bi)); 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 index abf822ca..0d80fbbd 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceRuleServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceRuleServiceImpl.java @@ -61,10 +61,10 @@ public class WmsAttendanceRuleServiceImpl implements IWmsAttendanceRuleService { 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.getLateOne() != null, WmsAttendanceRule::getLateOne, bo.getLateOne()); + lqw.eq(bo.getLateTwo() != null, WmsAttendanceRule::getLateTwo, bo.getLateTwo()); + lqw.eq(bo.getDeductOne() != null, WmsAttendanceRule::getDeductOne, bo.getDeductOne()); + lqw.eq(bo.getDeductTwo() != null, WmsAttendanceRule::getDeductTwo, bo.getDeductTwo()); lqw.eq(bo.getAbsentHalfDay() != null, WmsAttendanceRule::getAbsentHalfDay, bo.getAbsentHalfDay()); lqw.eq(bo.getContinuousAbsentDays() != null, WmsAttendanceRule::getContinuousAbsentDays, bo.getContinuousAbsentDays()); return lqw; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml index 57d4b5c9..5cf61d2a 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml @@ -7,10 +7,10 @@ - - - - + + + +