lcl il y a 6 mois
Parent
commit
ef67edda63

+ 15 - 0
Controllers/Admin/Pri/PriListController.cs

@@ -103,6 +103,21 @@ namespace Controllers.Admin
         }
 
 
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 下拉框数据
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <returns>下拉框数据</returns>
+        [HttpGet]
+        [Route("/v1/pri/PriList/getPriListDic")]
+        public IActionResult getPriListDic([FromQuery] PagerInfo page)
+        {
+            var response = _PriListService.getPriListDic(page);
+            return SUCCESS(response);
+        }
+
+
 
 
     }

+ 2 - 1
Controllers/Base/ApiPubController.cs

@@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Authorization;
 using Model.Customer;
 using Base;
 using LitJson;
+using System;
 
 namespace Controllers
 {
@@ -136,7 +137,7 @@ namespace Controllers
                                 _SysMenuService.InsertReturnIdentity(new SysMenu()
                                 {
                                     name = "修改",
-                                    permission = "update",
+                                    permission = string.Concat("update", ApiEnName[..1].ToUpdate(), ApiEnName.AsSpan(1)),
                                     parentId = menuId,
                                     visible = "1",
                                     keepAlive = "1",

+ 14 - 0
Model/Database/PriCondition.cs

@@ -101,6 +101,20 @@ namespace Model
         public string? fieldQueryValueType { get; set; }
 
 
+        /// <summary>
+        /// 奖励比例
+        /// </summary>
+        [SugarColumn(ColumnDescription = "奖励比例", ColumnName = "prize_percent")]
+        public decimal prizePercent { get; set; }
+
+
+        /// <summary>
+        /// 奖励固定金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "奖励固定金额", ColumnName = "prize_amount")]
+        public decimal prizeAmount { get; set; }
+
+
 
     }
 }

+ 8 - 1
Model/Database/PriDatabaseSet.cs

@@ -41,7 +41,7 @@ namespace Model
         /// <summary>
         /// IP地址
         /// </summary>
-        [SugarColumn(ColumnDescription = "IP地址", Length = 50, ColumnName = "ip_address")]
+        [SugarColumn(ColumnDescription = "IP地址", Length = 200, ColumnName = "ip_address")]
         public string? ipAddress { get; set; }
 
 
@@ -66,6 +66,13 @@ namespace Model
         public string? password { get; set; }
 
 
+        /// <summary>
+        /// 数据库名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "数据库名", Length = 50, ColumnName = "database_name")]
+        public string? databaseName { get; set; }
+
+
         /// <summary>
         /// 项目
         /// </summary>

+ 7 - 0
Model/Database/PriPrizeObjectTable.cs

@@ -73,6 +73,13 @@ namespace Model
         public string? prizeListIds { get; set; }
 
 
+        /// <summary>
+        /// 取值字段
+        /// </summary>
+        [SugarColumn(ColumnDescription = "取值字段", Length = 50, ColumnName = "select_field")]
+        public string? selectField { get; set; }
+
+
 
     }
 }

+ 12 - 0
Model/Vo/Admin/GetPriConditionQueryVo.cs

@@ -49,6 +49,18 @@ namespace Vo.Admin
         public string fieldQueryValueType { get; set; }
 
 
+        /// <summary>
+        /// 奖励比例
+        /// </summary>
+        public decimal prizePercent { get; set; }
+
+
+        /// <summary>
+        /// 奖励固定金额
+        /// </summary>
+        public decimal prizeAmount { get; set; }
+
+
 
     }
 }

+ 6 - 0
Model/Vo/Admin/GetPriDatabaseSetQueryVo.cs

@@ -37,6 +37,12 @@ namespace Vo.Admin
         public string password { get; set; }
 
 
+        /// <summary>
+        /// 数据库名
+        /// </summary>
+        public string databaseName { get; set; }
+
+
         /// <summary>
         /// 项目
         /// </summary>

+ 14 - 0
Model/Vo/Admin/GetPriPrizeObjectTableQueryVo.cs

@@ -7,6 +7,14 @@ namespace Vo.Admin
     /// </summary>
     public class GetPriPrizeObjectTableQueryVo
     {
+
+
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        public int projectId { get; set; }
+
+
         /// <summary>
         /// 查询表
         /// </summary>
@@ -25,6 +33,12 @@ namespace Vo.Admin
         public string prizeListIds { get; set; }
 
 
+        /// <summary>
+        /// 取值字段
+        /// </summary>
+        public string selectField { get; set; }
+
+
 
     }
 }

+ 8 - 0
Services/IService/IPriListService.cs

@@ -17,6 +17,14 @@ namespace Services
         PagedInfo<GetPriListListVo> getPriListList([FromQuery] PagerInfo page, [FromQuery] PriList param);
 
 
+        /// <summary>
+        /// 奖励配置-下拉框数据
+        /// </summary>
+        /// <param name="page">分页参数</param>
+        /// <returns>下拉框数据</returns>
+        PagedInfo<GetPriListDicVo> getPriListDic([FromQuery] PagerInfo page);
+
+
 
     }
 }

+ 17 - 0
Services/PriListService.cs

@@ -37,6 +37,23 @@ namespace Services
         }
 
 
+        /// <summary>
+        /// 奖励配置-下拉框数据
+        /// </summary>
+        /// <param name="page">分页参数</param>
+        /// <returns>下拉框数据</returns>
+        public PagedInfo<GetPriListDicVo> getPriListDic([FromQuery] PagerInfo page)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<PriList>();
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .ToPage<PriList, GetPriListDicVo>(page);
+            return response;
+        }
+
+
 
     }
 }