refactor(perf): 重构车间考核参数配置实体类结构
- 移除 JsonFormat 注解依赖 - 将 createdAt 和 updatedAt 字段替换为 createTime、createBy、updateTime、updateBy 字段 - 添加 delFlag 删除标志字段并配置 TableLogic 注解 - 更新备注字段的注释说明 - 修改查询条件构建逻辑以适配新字段结构 - 更新数据映射配置以匹配数据库表结构变化
This commit is contained in:
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -17,8 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="baseDivisor" column="base_divisor"/>
|
||||
<result property="month" column="month"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createdAt" column="created_at"/>
|
||||
<result property="updatedAt" column="updated_at"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user