From 3e9a6da99aae968123ee7bca352fc08becd7f1f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 17:29:21 +0800
Subject: [PATCH] 工单过程图接口更换
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 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..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
@@ -7,8 +7,6 @@
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;
@@ -25,14 +23,12 @@
@ExcelIgnoreUnannotated
@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
@TableName("t_calculate_rule")
-public class CalculateRule extends TreeNode {
- private static final long serialVersionUID = 1L;
+public class CalculateRule {
/**
- * 涓婚敭
+ * id
*/
- @ExcelProperty("搴忓彿")
- private Long id;
+ private Integer id;
/**
* 鍚堝悓id
@@ -46,23 +42,24 @@
private String ruleName;
/**
- * 鍏宠仈涓婄骇id
- */
- 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