feat: 批量操作交互逻辑统一&解耦规则与应用的状态

Framework/YLErp.Core/DBModels/glms_risk_variable.cs

@@ -23,6 +23,8 @@ namespace YLErp.DBModels
         public string Description { get; set; }
         /// <summary>取值表达式（C# 表达式，用于计算变量值）</summary>
         public string VariableExpr { get; set; }
+        /// <summary>状态: 1=Active, 2=Disabled, 3=Deleted</summary>
+        public RiskRuleStatus Status { get; set; } = RiskRuleStatus.Active;
         /// <summary>版本号（乐观锁）</summary>
         [ConcurrencyCheck]
         public int Version { get; set; } = 1;

Framework/YLErp.Resources/DbUpdate/Ver-5.6.0/add_risk_variable_status.sql

@@ -0,0 +1,12 @@
+-- ============================================================
+-- 增量迁移：为 glms_risk_variable 表增加 Status 字段
+-- 目的：将变量删除由硬删除改造为软删除，与 glms_risk_rule / glms_risk_rule_application 保持一致
+-- 状态：1=Active, 2=Disabled, 3=Deleted
+-- 默认值：1（Active），存量数据自动标记为可用
+-- ============================================================
+
+ALTER TABLE `yltrs_ylcms`.`glms_risk_variable`
+  ADD COLUMN `Status` tinyint NOT NULL DEFAULT 1 COMMENT '状态: 1=Active, 2=Disabled, 3=Deleted' AFTER `VariableExpr`;
+
+ALTER TABLE `yltrs_ylcms`.`glms_risk_variable`
+  ADD INDEX `idx_status`(`Status` ASC) USING BTREE;

Framework/YLErp.Resources/DbUpdate/Ver-5.6.0/create_risk_engine_table.sql

@@ -68,6 +68,7 @@ CREATE TABLE `yltrs_ylcms`.`glms_risk_variable`  (
   `ValueDomain` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '值域描述',
   `Description` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
   `VariableExpr` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '变量表达式(C#表达式)',
+  `Status` tinyint NOT NULL DEFAULT 1 COMMENT '状态: 1=Active, 2=Disabled, 3=Deleted',
   `Version` int NOT NULL DEFAULT 1 COMMENT '版本号(乐观锁)',
   `SortOrder` int NOT NULL DEFAULT 0 COMMENT '排序',
   `OptId` int NULL DEFAULT NULL COMMENT '创建人Id',
@@ -76,5 +77,6 @@ CREATE TABLE `yltrs_ylcms`.`glms_risk_variable`  (
   `UpdateOptId` int NULL DEFAULT NULL COMMENT '最后修改人Id',
   `UpdateOptName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '最后修改人名称',
   `UpdateDate` datetime NULL DEFAULT NULL COMMENT '最后修改时间',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_status`(`Status` ASC) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '风控变量池定义表' ROW_FORMAT = Dynamic;

Framework/YLErp.Resources/DbUpdate/Ver-5.6.0/seed_risk_engine_variables.sql

@@ -13,7 +13,7 @@
 -- 说明：结构化 RuleExpr 的固定数值不追加 m；本文件 VariableExpr 为人工维护的 C# 表达式，原有 m 后缀保持不变。
 
 -- 插入当前数据库中的 6 条变量，保留原始 ID 以匹配规则 ConditionJson 中的 VariableId
-INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`, `DataType`, `Unit`, `ValueDomain`, `Description`, `VariableExpr`, `Version`, `SortOrder`, `OptId`, `OptName`, `OptDate`, `UpdateOptId`, `UpdateOptName`, `UpdateDate`) VALUES
+INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`, `DataType`, `Unit`, `ValueDomain`, `Description`, `VariableExpr`, `Status`, `Version`, `SortOrder`, `OptId`, `OptName`, `OptDate`, `UpdateOptId`, `UpdateOptName`, `UpdateDate`) VALUES
 (1,
  '合约名义本金',
  1,
@@ -22,6 +22,7 @@ INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`
  '≥ 0',
  '',
  'DbContext.trade.First(t => t.id == TradeId).StockEqvNotional',
+ 1,
  18,
  0,
  0,
@@ -38,6 +39,7 @@ INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`
  '≥ 0',
  '当前交易对手方所有存续交易涉及的标的数量（去重）合计（含本笔）',
  'DbContext.swap_position.Where(p => !string.IsNullOrEmpty(p.UnderlyingCode) && !p.IsInitial && p.PosiQuantity > 0 && !p.Invalid && p.PosiDirection > 0 && DbContext.trade.Any(t => t.id == p.SwapTradeId && t.ValidState != "InValid" && t.ClientId == DbContext.trade.First(x => x.id == TradeId).ClientId)).Select(p => p.UnderlyingCode).Distinct().Count()',
+ 1,
  3,
  0,
  0,
@@ -54,6 +56,7 @@ INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`
  '≥ 0',
  'abs(期初标的交割净价% - 上一收盘日中债估值净价)',
  'Math.Abs(DbContext.swap_position.First(p => p.SwapTradeId == TradeId && p.IsInitial && !p.Invalid && p.PosiDirection == 2 && !string.IsNullOrEmpty(p.UnderlyingCode)).PosiNetNoFeePrice.Value * 100 - DbContext.china_bond_valuation.Where(v => v.bond_id == DbContext.swap_position.First(p => p.SwapTradeId == TradeId && p.IsInitial && !p.Invalid && p.PosiDirection == 2 && !string.IsNullOrEmpty(p.UnderlyingCode)).UnderlyingCode && v.valuation_date < DbContext.trade.First(t => t.id == TradeId).TradeDate.Value.Date).OrderByDescending(v => v.valuation_date).First().net_price.Value)',
+ 1,
  6,
  0,
  0,
@@ -70,6 +73,7 @@ INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`
  '≥ 0',
  'abs(期初标的成交收益率% - 上一收盘日中债估值收益率)',
  'Math.Abs(DbContext.swap_position.First(p => p.SwapTradeId == TradeId && p.IsInitial && !p.Invalid && p.PosiDirection == 2 && !string.IsNullOrEmpty(p.UnderlyingCode)).InitYtm.Value * 100 - DbContext.china_bond_valuation.Where(v => v.bond_id == DbContext.swap_position.First(p => p.SwapTradeId == TradeId && p.IsInitial && !p.Invalid && p.PosiDirection == 2 && !string.IsNullOrEmpty(p.UnderlyingCode)).UnderlyingCode && v.valuation_date < DbContext.trade.First(t => t.id == TradeId).TradeDate.Value.Date).OrderBy(v => v.credibility).ThenByDescending(v => v.valuation_date).First().yield.Value)',
+ 1,
  3,
  0,
  0,
@@ -86,6 +90,7 @@ INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`
  '≥ 0',
  'abs(期初标的交割全价% - 上一日标的收盘价)',
  'Math.Abs(DbContext.swap_position.First(p => p.SwapTradeId == TradeId && p.IsInitial && !p.Invalid && p.PosiDirection == 2 && !string.IsNullOrEmpty(p.UnderlyingCode)).PosiGrossPrice * 100 - Convert.ToDecimal(DbContext.eod_commodity_future_price.Where(e => e.UnderlyingCode == DbContext.swap_position.First(p => p.SwapTradeId == TradeId && p.IsInitial && !p.Invalid && p.PosiDirection == 2 && !string.IsNullOrEmpty(p.UnderlyingCode)).UnderlyingCode && e.ValueDate < DbContext.trade.First(t => t.id == TradeId).TradeDate.Value.Date).OrderByDescending(e => e.ValueDate).First().ClosePrice))',
+ 1,
  4,
  0,
  0,
@@ -102,6 +107,7 @@ INSERT INTO `yltrs_ylcms`.`glms_risk_variable` (`id`, `VariableName`, `Category`
  '≥ 0',
  'ABS(利息端利率-FR007)/FR007*100',
  'Math.Abs(DbContext.swap_position.First(p => p.SwapTradeId == TradeId && p.InterestDirection == 1).InterestRateDefault)*100m',
+ 1,
  2,
  0,
  0,