diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java index 43bb49c2c..291bead43 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java @@ -2,7 +2,7 @@ * @Project: emis * @Title: EmisNotCalcAging.java * @author linfso - * @date 2024-01-10 07:33:52 + * @date 2024-01-11 06:12:45 * @Copyright: ShangHai Duta 2022 All rights reserved. * @version v1.0 * @Description:

不计时效维护 实体类

@@ -25,7 +25,7 @@ import lombok.Data; * @ClassName EmisNotCalcAging * @Description 不计时效维护 * @author linfso - * @date 2024-01-10 07:33:52 + * @date 2024-01-11 06:12:45 */ @Data public class EmisNotCalcAging extends BaseEntity @@ -34,18 +34,11 @@ public class EmisNotCalcAging extends BaseEntity /* 序号 */ private Long id; - /* 不计时效名称 */ - private String name; - /* 英文名称 */ - private String nameEn; /* 所属国家,可能多个国家,逗号隔开 */ private String country; - /* 开始日期(含当日) */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date beginDate; - /* 结束日期(含当日) */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endDate; + /* 不计时效日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date noCalcDay; /* 启用状态 0-启用 1-停用 */ private Integer status; diff --git a/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml b/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml index aa2bd156a..1feed1024 100644 --- a/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml @@ -6,11 +6,8 @@ - - - - + @@ -22,18 +19,15 @@ - select id, name, name_en, country, begin_date, end_date, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_not_calc_aging + select id, country, no_calc_day, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_not_calc_aging @@ -56,11 +50,8 @@ insert into emis_not_calc_aging id, - name, - name_en, country, - begin_date, - end_date, + no_calc_day, status, remark, tenant_id, @@ -72,11 +63,8 @@ #{id}, - #{name}, - #{nameEn}, #{country}, - #{beginDate}, - #{endDate}, + #{noCalcDay}, #{status}, #{remark}, #{tenantId}, @@ -91,11 +79,8 @@ update emis_not_calc_aging - name = #{name}, - name_en = #{nameEn}, country = #{country}, - begin_date = #{beginDate}, - end_date = #{endDate}, + no_calc_day = #{noCalcDay}, status = #{status}, remark = #{remark}, tenant_id = #{tenantId},