From 38fe4ba31a92e3955a36f0916b790fcf53efaac9 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 26 七月 2024 11:29:02 +0800
Subject: [PATCH] refactor：合同导入模板
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 b6af342..22e3f62 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
@@ -7,12 +7,12 @@
import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.ycl.system.domain.TreeEntity;
import com.ycl.system.domain.TreeNode;
import enumeration.converter.RuleDeductCategoryConverter;
import enumeration.general.RuleDeductCategoryEnum;
import lombok.Data;
+import java.io.Serial;
import java.util.Date;
/**
@@ -26,13 +26,9 @@
@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
@TableName("t_calculate_rule")
public class CalculateRule extends TreeNode {
- private static final long serialVersionUID = 1L;
- /**
- * 涓婚敭
- */
- @ExcelProperty("搴忓彿")
- private Long id;
+ @Serial
+ private static final long serialVersionUID = 1L;
/**
* 鍚堝悓id
@@ -51,18 +47,24 @@
private Long parentId;
/**
- * 瑙勫垯鎻忚堪
- */
- @ExcelProperty("璇勫垽鏍囧噯")
- private String ruleDesc;
-
- /**
* 瑙勫垯鏉′欢
*/
@ExcelProperty("鑰冩牳瑕佹眰")
private String ruleCondition;
/**
+ * 杩濊鏈�灏忓��
+ */
+ @ExcelProperty("杩濊鏈�灏忓��")
+ private Double min;
+
+ /**
+ * 杩濊鏈�澶у��
+ */
+ @ExcelProperty("杩濊鏈�澶у��")
+ private Double max;
+
+ /**
* 鎵ｅ噺鏂瑰紡 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
*/
@ExcelProperty(value = "鎵ｅ垎鏂瑰紡", converter = RuleDeductCategoryConverter.class)
--
Gitblit v1.8.0