From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 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 c554b6c..2e2cb7e 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
@@ -6,8 +6,12 @@
import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.ycl.system.domain.TreeEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import enumeration.converter.RuleDeductCategoryConverter;
+import enumeration.general.RuleDeductCategoryEnum;
import lombok.Data;
+
+import java.util.Date;
/**
* 鍒嗘暟鏍哥畻瑙勫垯瀵硅薄 t_default_rule
@@ -18,19 +22,18 @@
@Data
@ExcelIgnoreUnannotated
@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
-public class CalculateRule extends TreeEntity {
- private static final long serialVersionUID = 1L;
+@TableName("t_calculate_rule")
+public class CalculateRule {
/**
- * 涓婚敭
+ * id
*/
- @ExcelProperty("搴忓彿")
- private Long id;
+ private Integer id;
/**
- * 鍗曚綅id
+ * 鍚堝悓id
*/
- private Integer unitId;
+ private Integer contractId;
/**
* 瑙勫垯鍚嶇О
@@ -39,27 +42,28 @@
private String ruleName;
/**
- * 鍏宠仈涓婄骇id
- */
- private Long parentId;
-
- /**
- * 瑙勫垯鎻忚堪
- */
- @ExcelProperty("璇勫垽鏍囧噯")
- private String ruleDesc;
-
- /**
* 瑙勫垯鏉′欢
*/
@ExcelProperty("鑰冩牳瑕佹眰")
private String ruleCondition;
/**
- * 鎵ｅ噺鏂瑰紡 1/2/3 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
+ * 杩濊鏈�灏忓��
*/
- @ExcelProperty("鎵ｅ垎鏂瑰紡")
- private String deductCategory;
+ @ExcelProperty("杩濊鏈�灏忓��")
+ private Double min;
+
+ /**
+ * 杩濊鏈�澶у��
+ */
+ @ExcelProperty("杩濊鏈�澶у��")
+ private Double max;
+
+ /**
+ * 鎵ｅ噺鏂瑰紡 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
+ */
+ @ExcelProperty(value = "鎵ｅ垎鏂瑰紡", converter = RuleDeductCategoryConverter.class)
+ private RuleDeductCategoryEnum deductCategory;
/**
* 鎵ｉ櫎鍒嗘暟
@@ -73,7 +77,10 @@
@ExcelProperty("闄や互鏁伴噺")
private Integer calcUnit;
+ private Date createTime;
+ private Date updateTime;
+
@TableLogic
- private String deleted;
+ private Integer deleted;
}
--
Gitblit v1.8.0