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 |  156 ++++++++++++++++++++++------------------------------
 1 files changed, 66 insertions(+), 90 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 9a4b697..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
@@ -1,110 +1,86 @@
 package com.ycl.platform.domain.entity;
 
-import annotation.Excel;
-import com.ycl.system.domain.TreeEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+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 enumeration.converter.RuleDeductCategoryConverter;
+import enumeration.general.RuleDeductCategoryEnum;
+import lombok.Data;
 
-import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 鏍哥畻瑙勫垯瀵硅薄 t_calculate_rule
- * 
+ * 鍒嗘暟鏍哥畻瑙勫垯瀵硅薄 t_default_rule
+ *
  * @author ruoyi
- * @date 2024-04-03
+ * @date 2024-04-01
  */
-public class CalculateRule extends TreeEntity
-{
-    private static final long serialVersionUID = 1L;
+@Data
+@ExcelIgnoreUnannotated
+@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
+@TableName("t_calculate_rule")
+public class CalculateRule {
 
-    /**  */
-    private Long id;
+    /**
+     * id
+     */
+    private Integer id;
 
-    /**  */
-    @Excel(name = "")
-    private String name;
+    /**
+     * 鍚堝悓id
+     */
+    private Integer contractId;
 
-    /**  */
-    @Excel(name = "")
-    private Long templateId;
+    /**
+     * 瑙勫垯鍚嶇О
+     */
+    @ExcelProperty("鑰冩牳鍐呭")
+    private String ruleName;
 
-    /** 鍗曚綅id */
-    @Excel(name = "鍗曚綅id")
-    private Long unitId;
+    /**
+     * 瑙勫垯鏉′欢
+     */
+    @ExcelProperty("鑰冩牳瑕佹眰")
+    private String ruleCondition;
 
-    /** 姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏� */
-    @Excel(name = "姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏�")
-    private BigDecimal value;
+    /**
+     * 杩濊鏈�灏忓��
+     */
+    @ExcelProperty("杩濊鏈�灏忓��")
+    private Double min;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String description;
+    /**
+     * 杩濊鏈�澶у��
+     */
+    @ExcelProperty("杩濊鏈�澶у��")
+    private Double max;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
+    /**
+     * 鎵ｅ噺鏂瑰紡 鎵ｆ寚瀹氬垎鏁�/鍒嗘暟涔樹互鏁伴噺/闄や互鏁伴噺鍚庝箻浠ュ垎鏁�
+     */
+    @ExcelProperty(value = "鎵ｅ垎鏂瑰紡", converter = RuleDeductCategoryConverter.class)
+    private RuleDeductCategoryEnum deductCategory;
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
+    /**
+     * 鎵ｉ櫎鍒嗘暟
+     */
+    @ExcelProperty("鎵ｅ垎鏁板��")
+    private Double calcFraction;
 
-    public String getName() 
-    {
-        return name;
-    }
-    public void setTemplateId(Long templateId) 
-    {
-        this.templateId = templateId;
-    }
+    /**
+     * 褰撴柟寮忎负闄や互鏃讹紝闄や互褰撳墠瀛楁鏁伴噺
+     */
+    @ExcelProperty("闄や互鏁伴噺")
+    private Integer calcUnit;
 
-    public Long getTemplateId() 
-    {
-        return templateId;
-    }
-    public void setUnitId(Long unitId) 
-    {
-        this.unitId = unitId;
-    }
+    private Date createTime;
+    private Date updateTime;
 
-    public Long getUnitId() 
-    {
-        return unitId;
-    }
-    public void setValue(BigDecimal value) 
-    {
-        this.value = value;
-    }
+    @TableLogic
+    private Integer deleted;
 
-    public BigDecimal getValue() 
-    {
-        return value;
-    }
-    public void setDescription(String description) 
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("templateId", getTemplateId())
-            .append("parentId", getParentId())
-            .append("unitId", getUnitId())
-            .append("value", getValue())
-            .append("description", getDescription())
-            .toString();
-    }
 }

--
Gitblit v1.8.0