From 24417dad13f370cca36f6f52208daa0404de4dd6 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 03 四月 2024 14:26:02 +0800 Subject: [PATCH] 新核算 --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java index 98a8a31..9a4b697 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java @@ -1,7 +1,7 @@ package com.ycl.platform.domain.entity; import annotation.Excel; -import com.ycl.system.entity.BaseEntity; +import com.ycl.system.domain.TreeEntity; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; @@ -11,25 +11,22 @@ * 鏍哥畻瑙勫垯瀵硅薄 t_calculate_rule * * @author ruoyi - * @date 2024-04-01 + * @date 2024-04-03 */ -public class CalculateRule extends BaseEntity +public class CalculateRule extends TreeEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** */ private Long id; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + /** */ + @Excel(name = "") private String name; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + /** */ + @Excel(name = "") private Long templateId; - - /** $column.columnComment */ - private Long parentId; /** 鍗曚綅id */ @Excel(name = "鍗曚綅id") @@ -38,6 +35,10 @@ /** 姣忓皯1%鎵e綋鏈堟�绘湇鍔¤垂鐨勫灏� */ @Excel(name = "姣忓皯1%鎵e綋鏈堟�绘湇鍔¤垂鐨勫灏�") private BigDecimal value; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String description; public void setId(Long id) { @@ -66,15 +67,6 @@ { return templateId; } - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public Long getParentId() - { - return parentId; - } public void setUnitId(Long unitId) { this.unitId = unitId; @@ -93,6 +85,15 @@ { return value; } + public void setDescription(String description) + { + this.description = description; + } + + public String getDescription() + { + return description; + } @Override public String toString() { @@ -103,6 +104,7 @@ .append("parentId", getParentId()) .append("unitId", getUnitId()) .append("value", getValue()) + .append("description", getDescription()) .toString(); } } -- Gitblit v1.8.0