From f5e1051a7e6d3ffccc815a631d8be372d772c58f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 11:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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..b6af342 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,14 @@
import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
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.util.Date;
/**
* 鍒嗘暟鏍哥畻瑙勫垯瀵硅薄 t_default_rule
@@ -18,7 +24,8 @@
@Data
@ExcelIgnoreUnannotated
@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
-public class CalculateRule extends TreeEntity {
+@TableName("t_calculate_rule")
+public class CalculateRule extends TreeNode {
private static final long serialVersionUID = 1L;
/**
@@ -28,9 +35,9 @@
private Long id;
/**
- * 鍗曚綅id
+ * 鍚堝悓id
*/
- private Integer unitId;
+ private Integer contractId;
/**
* 瑙勫垯鍚嶇О
@@ -56,10 +63,10 @@
private String ruleCondition;
/**
- * 鎵ｅ噺鏂瑰紡 1/2/3 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
+ * 鎵ｅ噺鏂瑰紡 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
*/
- @ExcelProperty("鎵ｅ垎鏂瑰紡")
- private String deductCategory;
+ @ExcelProperty(value = "鎵ｅ垎鏂瑰紡", converter = RuleDeductCategoryConverter.class)
+ private RuleDeductCategoryEnum deductCategory;
/**
* 鎵ｉ櫎鍒嗘暟
@@ -73,7 +80,10 @@
@ExcelProperty("闄や互鏁伴噺")
private Integer calcUnit;
+ private Date createTime;
+ private Date updateTime;
+
@TableLogic
- private String deleted;
+ private Integer deleted;
}
--
Gitblit v1.8.0