From a7a8a50f48c1bff5ddc52b3bad1782328f8043d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 12 四月 2024 18:50:20 +0800
Subject: [PATCH] 基础数据配置接口修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java
index cd4e1ca..46d76e3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java
@@ -1,13 +1,19 @@
 package com.ruoyi.system.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.enums.DataScreenConfigEnum;
+import com.ruoyi.common.enums.SubTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 import java.io.Serializable;
 import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * <p>
@@ -20,7 +26,7 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("tb_data_screen_config")
-@ApiModel(value="TbDataScreenConfig对象", description="大屏数据配置表")
+@ApiModel(value = "TbDataScreenConfig对象", description = "大屏数据配置表")
 public class TbDataScreenConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -31,15 +37,35 @@
 
     @ApiModelProperty(value = "配置类型(1=风险等级设置 2=数据指标设置 3=形式指标设置)")
     @TableField("type")
-    private Boolean type;
+    private DataScreenConfigEnum type;
 
-    @ApiModelProperty(value = "得分计算规则(多个规则使用','隔开)")
+    @ApiModelProperty(value = "得分计算规则")
     @TableField("calculate_formula")
     private String calculateFormula;
 
+    @ApiModelProperty(value = "得分率计算规则")
+    @TableField("calculate_rate_formula")
+    private String calculateRateFormula;
+
     @ApiModelProperty(value = "配置类型子类型(1=数据指标一/形式指标一 2=数据指标二/形式指标二 3=数据指标三/形式指标三 4=数据指标四/形式指标四)")
     @TableField("sub_type")
-    private Integer subType;
+    private SubTypeEnum subType;
+
+    @ApiModelProperty(value = "风险等级范围-高风险得分")
+    @TableField("high_risk")
+    private String highRisk;
+
+    @ApiModelProperty(value = "风险等级范围-低风险得分")
+    @TableField("medium_risk")
+    private String mediumRisk;
+
+    @ApiModelProperty(value = "风险等级范围-无风险得分")
+    @TableField("low_risk")
+    private String lowRisk;
+
+    @ApiModelProperty(value = "得分计算规则(多个规则使用','隔开)")
+    @TableField("no_risk")
+    private String noRisk;
 
     @ApiModelProperty(value = "删除标志(0代表存在 1代表删除)")
     @TableField("del_flag")

--
Gitblit v1.7.1