From 137a13606b292c28a841b492deb7bbcc40257302 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 9 Jul 2026 14:09:18 +0800
Subject: [PATCH] =?UTF-8?q?refactor(perf):=20=E9=87=8D=E6=9E=84=E8=BD=A6?=
=?UTF-8?q?=E9=97=B4=E8=80=83=E6=A0=B8=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 移除 JsonFormat 注解依赖
- 将 createdAt 和 updatedAt 字段替换为 createTime、createBy、updateTime、updateBy 字段
- 添加 delFlag 删除标志字段并配置 TableLogic 注解
- 更新备注字段的注释说明
- 修改查询条件构建逻辑以适配新字段结构
- 更新数据映射配置以匹配数据库表结构变化
---
.../java/com/klp/perf/domain/PerfDeptConfig.java | 13 +++++--------
.../com/klp/perf/domain/bo/PerfDeptConfigBo.java | 11 -----------
.../com/klp/perf/domain/vo/PerfDeptConfigVo.java | 14 +-------------
.../service/impl/PerfDeptConfigServiceImpl.java | 2 --
.../resources/mapper/perf/PerfDeptConfigMapper.xml | 7 +++++--
5 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java
index 67b813bf5..cc772b46b 100644
--- a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java
+++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java
@@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 车间考核参数配置对象 perf_dept_config
@@ -68,16 +67,14 @@ public class PerfDeptConfig extends BaseEntity {
*/
private Date month;
/**
- *
+ * 备注
*/
private String remark;
+
/**
- *
+ * 删除标志（0=正常 1=已删除）
*/
- private Date createdAt;
- /**
- *
- */
- private Date updatedAt;
+ @TableLogic
+ private Integer delFlag;
}
diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java
index 442cb4b1b..1b08d65f4 100644
--- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java
+++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java
@@ -7,7 +7,6 @@ import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 车间考核参数配置业务对象 perf_dept_config
@@ -80,15 +79,5 @@ public class PerfDeptConfigBo extends BaseEntity {
*/
private String remark;
- /**
- *
- */
- private Date createdAt;
-
- /**
- *
- */
- private Date updatedAt;
-
}
diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java
index 1e1a01a44..e41dd81c6 100644
--- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java
+++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java
@@ -89,22 +89,10 @@ public class PerfDeptConfigVo {
private Date month;
/**
- *
+ *
*/
@ExcelProperty(value = "")
private String remark;
- /**
- *
- */
- @ExcelProperty(value = "")
- private Date createdAt;
-
- /**
- *
- */
- @ExcelProperty(value = "")
- private Date updatedAt;
-
}
diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java
index c5c86017f..98c34d60d 100644
--- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java
+++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java
@@ -71,8 +71,6 @@ public class PerfDeptConfigServiceImpl implements IPerfDeptConfigService {
lqw.eq(bo.getSalaryMode() != null, PerfDeptConfig::getSalaryMode, bo.getSalaryMode());
lqw.eq(bo.getBaseDivisor() != null, PerfDeptConfig::getBaseDivisor, bo.getBaseDivisor());
lqw.eq(bo.getMonth() != null, PerfDeptConfig::getMonth, bo.getMonth());
- lqw.eq(bo.getCreatedAt() != null, PerfDeptConfig::getCreatedAt, bo.getCreatedAt());
- lqw.eq(bo.getUpdatedAt() != null, PerfDeptConfig::getUpdatedAt, bo.getUpdatedAt());
return lqw;
}
diff --git a/klp-perf/src/main/resources/mapper/perf/PerfDeptConfigMapper.xml b/klp-perf/src/main/resources/mapper/perf/PerfDeptConfigMapper.xml
index 0c96822b8..a77133b5c 100644
--- a/klp-perf/src/main/resources/mapper/perf/PerfDeptConfigMapper.xml
+++ b/klp-perf/src/main/resources/mapper/perf/PerfDeptConfigMapper.xml
@@ -17,8 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
+
+
+
+
+