From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性,避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
index 949196f..33818ce 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
@@ -27,6 +27,9 @@
/** 鏄惁鍙互閫夋嫨浠呯湅鎴�, 0:鍚�, 1:鏄� */
private Integer isRersonalButton;
+ /** 鏄惁纭鍙湅鎴�, 0:鍚�, 1:鏄� */
+ private Integer isRersonal;
+
/** 鑺傜偣绂佺敤 */
private boolean disabled = false;
@@ -51,7 +54,8 @@
{
this.id = menu.getMenuId();
this.label = menu.getMenuName();
- this.isRersonalButton = menu.geIsRersonalButton();
+ this.isRersonalButton = menu.getIsRersonalButton();
+ this.isRersonal = menu.getIsRersonal();
this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
@@ -95,7 +99,7 @@
this.children = children;
}
- public Integer geIsRersonalButton()
+ public Integer getIsRersonalButton()
{
return isRersonalButton;
}
@@ -104,4 +108,14 @@
{
this.isRersonalButton = isRersonalButton;
}
+
+ public Integer getIsRersonal()
+ {
+ return isRersonal;
+ }
+
+ public void setIsRersonal(Integer isRersonalButton)
+ {
+ this.isRersonal = isRersonal;
+ }
}
--
Gitblit v1.9.3