DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms): 重构考勤规则字段命名

Browse Source 
- 将迟到一级相关字段从 late1 重命名为 lateOne
- 将迟到二级相关字段从 late2 重命名为 lateTwo
- 将迟到一级扣款字段从 deduct1 重命名为 deductOne
- 将迟到二级扣款字段从 deduct2 重命名为 deductTwo
- 更新所有相关的 getter/setter 方法调用
- 修改映射文件中的字段映射配置
- 更新查询条件中的字段引用
This commit is contained in:
Joshi
2026-05-12 17:09:37 +08:00
parent 693de2ad5e
commit 139f0ebb3e
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-wms/src/main/java/com/klp/domain/WmsAttendanceRule.java
View File

@@ -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;
/**
* 超过多少分钟按旷工半天处理
*/

8
klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceRuleBo.java
View File

@@ -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;
/**
* 超过多少分钟按旷工半天处理

8
klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java
View File

@@ -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;
/**
* 超过多少分钟按旷工半天处理

30
klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
View File

@@ -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<String> severity = java.util.Arrays.asList("normal", "late_warn", "early_warn", "late_1", "early_1", "late_2", "early_2", "absent_half");
List<String> 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));

8
klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceRuleServiceImpl.java
View File

@@ -61,10 +61,10 @@ public class WmsAttendanceRuleServiceImpl implements IWmsAttendanceRuleService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsAttendanceRule> 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;

8
klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml
View File

@@ -7,10 +7,10 @@
<resultMap type="com.klp.domain.WmsAttendanceRule" id="WmsAttendanceRuleResult">
<result property="ruleId" column="rule_id"/>
<result property="lateWarn" column="late_warn"/>
<result property="late1" column="late_1"/>
<result property="late2" column="late_2"/>
<result property="deduct1" column="deduct_1"/>
<result property="deduct2" column="deduct_2"/>
<result property="lateOne" column="late_one"/>
<result property="lateTwo" column="late_two"/>
<result property="deductOne" column="deduct_one"/>
<result property="deductTwo" column="deduct_two"/>
<result property="absentHalfDay" column="absent_half_day"/>
<result property="continuousAbsentDays" column="continuous_absent_days"/>
<result property="remark" column="remark"/>