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" - - + + + + +