奖励配置完善

Controllers/Admin/Pri/PriLoopSetController.cs

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

Controllers/Admin/Pri/PriRecursionStartConditionController.cs

@@ -0,0 +1,109 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// PriRecursionStartCondition)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "PriRecursionStartCondition")]
+    public class PriRecursionStartConditionController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly IPriRecursionStartConditionService _PriRecursionStartConditionService;
+
+
+        public PriRecursionStartConditionController(IPriRecursionStartConditionService PriRecursionStartConditionService)
+        {
+            _PriRecursionStartConditionService = PriRecursionStartConditionService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <param name="param">参数请求体</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/pri/PriRecursionStartCondition/getPriRecursionStartConditionList")]
+        public IActionResult getPriRecursionStartConditionList([FromQuery] PagerInfo page, [FromQuery] PriRecursionStartCondition param)
+        {
+            var response = _PriRecursionStartConditionService.getPriRecursionStartConditionList(page, param);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/pri/PriRecursionStartCondition/getPriRecursionStartConditionQuery")]
+        public IActionResult getPriRecursionStartConditionQuery([FromQuery] PriRecursionStartCondition param)
+        {
+            var response = _PriRecursionStartConditionService.GetFirst(m => m.id == param.id).Adapt<GetPriRecursionStartConditionQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/pri/PriRecursionStartCondition/addPriRecursionStartCondition")]
+        public IActionResult addPriRecursionStartCondition([FromBody] PriRecursionStartCondition param)
+        {
+            var modal = param.Adapt<PriRecursionStartCondition>().ToCreate(HttpContext);
+            var response = _PriRecursionStartConditionService.Add(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/pri/PriRecursionStartCondition/updatePriRecursionStartCondition")]
+        public IActionResult updatePriRecursionStartCondition([FromBody] PriRecursionStartCondition param)
+        {
+            var modal = param.Adapt<PriRecursionStartCondition>().ToCreate(HttpContext);
+            var response = _PriRecursionStartConditionService.Update(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">ID</param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/pri/PriRecursionStartCondition/deletePriRecursionStartCondition/{id}")]
+        public IActionResult deletePriRecursionStartCondition(int id)
+        {
+            var response = _PriRecursionStartConditionService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Controllers/Admin/Pri/PriRecursionStartReturnFieldController.cs

@@ -0,0 +1,109 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// PriRecursionStartReturnField)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "PriRecursionStartReturnField")]
+    public class PriRecursionStartReturnFieldController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly IPriRecursionStartReturnFieldService _PriRecursionStartReturnFieldService;
+
+
+        public PriRecursionStartReturnFieldController(IPriRecursionStartReturnFieldService PriRecursionStartReturnFieldService)
+        {
+            _PriRecursionStartReturnFieldService = PriRecursionStartReturnFieldService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <param name="param">参数请求体</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/pri/PriRecursionStartReturnField/getPriRecursionStartReturnFieldList")]
+        public IActionResult getPriRecursionStartReturnFieldList([FromQuery] PagerInfo page, [FromQuery] PriRecursionStartReturnField param)
+        {
+            var response = _PriRecursionStartReturnFieldService.getPriRecursionStartReturnFieldList(page, param);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/pri/PriRecursionStartReturnField/getPriRecursionStartReturnFieldQuery")]
+        public IActionResult getPriRecursionStartReturnFieldQuery([FromQuery] PriRecursionStartReturnField param)
+        {
+            var response = _PriRecursionStartReturnFieldService.GetFirst(m => m.id == param.id).Adapt<GetPriRecursionStartReturnFieldQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/pri/PriRecursionStartReturnField/addPriRecursionStartReturnField")]
+        public IActionResult addPriRecursionStartReturnField([FromBody] PriRecursionStartReturnField param)
+        {
+            var modal = param.Adapt<PriRecursionStartReturnField>().ToCreate(HttpContext);
+            var response = _PriRecursionStartReturnFieldService.Add(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/pri/PriRecursionStartReturnField/updatePriRecursionStartReturnField")]
+        public IActionResult updatePriRecursionStartReturnField([FromBody] PriRecursionStartReturnField param)
+        {
+            var modal = param.Adapt<PriRecursionStartReturnField>().ToCreate(HttpContext);
+            var response = _PriRecursionStartReturnFieldService.Update(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">ID</param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/pri/PriRecursionStartReturnField/deletePriRecursionStartReturnField/{id}")]
+        public IActionResult deletePriRecursionStartReturnField(int id)
+        {
+            var response = _PriRecursionStartReturnFieldService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Extensions/AppServiceExtensions.cs

@@ -60,10 +60,12 @@ namespace Infrastructure
             services.AddTransient<IPriPrizeObjectFieldService, PriPrizeObjectFieldService>(); 
             services.AddTransient<IPriPrizeObjectTableService, PriPrizeObjectTableService>(); 
             services.AddTransient<IPriRequestLogService, PriRequestLogService>(); 
-            services.AddTransient<IPriRecursionStartFieldService, PriRecursionStartFieldService>(); 
-            services.AddTransient<IPriRecursionStartTableService, PriRecursionStartTableService>(); 
-            services.AddTransient<IPriRecursionEndFieldService, PriRecursionEndFieldService>(); 
-            services.AddTransient<IPriRecursionEndTableService, PriRecursionEndTableService>(); 
+            services.AddTransient<IPriRecursionStartFieldService, PriRecursionStartFieldService>();
+            services.AddTransient<IPriRecursionStartTableService, PriRecursionStartTableService>();
+            services.AddTransient<IPriRecursionStartReturnFieldService, PriRecursionStartReturnFieldService>();
+            services.AddTransient<IPriRecursionStartConditionService, PriRecursionStartConditionService>();
+            services.AddTransient<IPriRecursionEndFieldService, PriRecursionEndFieldService>();
+            services.AddTransient<IPriRecursionEndTableService, PriRecursionEndTableService>();
             services.AddTransient<IPriPrizeInFieldService, PriPrizeInFieldService>(); 
             services.AddTransient<IPriPrizeInTableService, PriPrizeInTableService>(); 
             services.AddTransient<IPriPrizeInQueryFieldService, PriPrizeInQueryFieldService>(); 

Model/Base/SysMenu.cs

@@ -33,7 +33,7 @@ namespace Model
         /// <summary>
         /// 权限标识
         /// </summary>
-        [SugarColumn(ColumnDescription = "权限标识", Length = 32, ColumnName = "permission")]
+        [SugarColumn(ColumnDescription = "权限标识", Length = 200, ColumnName = "permission")]
         public string? permission { get; set; }
 
 

Model/Database/PriCondition.cs

@@ -69,8 +69,8 @@ namespace Model
         /// <summary>
         /// 条件返回字段
         /// </summary>
-        [SugarColumn(ColumnDescription = "条件返回字段", ColumnName = "return_field_id")]
-        public int returnFieldId { get; set; }
+        [SugarColumn(ColumnDescription = "条件返回字段", Length = 200, ColumnName = "return_field_id")]
+        public string? returnFieldId { get; set; }
 
 
         /// <summary>

Model/Database/PriRecursionStartCondition.cs

@@ -0,0 +1,120 @@
+using Mapster;
+
+
+namespace Model
+{
+    /// <summary>
+    /// 递归开始条件 pri_recursion_start_condition
+    /// </summary>
+    [SugarTable("pri_recursion_start_condition", "递归开始条件")]
+    [Tenant("0")]
+    public class PriRecursionStartCondition
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "状态", ColumnName = "status")]
+        public int status { get; set; }
+
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [SugarColumn(ColumnDescription = "排序", ColumnName = "sort")]
+        public int sort { get; set; }
+
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "版本号", ColumnName = "version")]
+        public int version { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_date")]
+        public DateTime? createDate { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新时间", ColumnName = "update_date")]
+        public DateTime? updateDate { get; set; }
+
+
+        /// <summary>
+        /// 项目
+        /// </summary>
+        [SugarColumn(ColumnDescription = "项目", ColumnName = "project_id")]
+        public int projectId { get; set; }
+
+
+        /// <summary>
+        /// 递归配置ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "递归配置ID", ColumnName = "loop_set_id")]
+        public int loopSetId { get; set; }
+
+
+        /// <summary>
+        /// 条件返回字段
+        /// </summary>
+        [SugarColumn(ColumnDescription = "条件返回字段", Length = 200, ColumnName = "return_field_id")]
+        public string? returnFieldId { get; set; }
+
+
+        /// <summary>
+        /// 匹配条件
+        /// </summary>
+        [SugarColumn(ColumnDescription = "匹配条件", Length = 50, ColumnName = "field_query_kind")]
+        public string? fieldQueryKind { get; set; }
+
+
+        /// <summary>
+        /// 匹配方式
+        /// </summary>
+        [SugarColumn(ColumnDescription = "匹配方式", Length = 20, ColumnName = "field_query_model")]
+        public string? fieldQueryModel { get; set; }
+
+
+        /// <summary>
+        /// 匹配值
+        /// </summary>
+        [SugarColumn(ColumnDescription = "匹配值", Length = 50, ColumnName = "field_query_value")]
+        public string? fieldQueryValue { get; set; }
+
+
+        /// <summary>
+        /// 匹配值类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "匹配值类型", Length = 20, ColumnName = "field_query_value_type")]
+        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; }
+
+
+
+    }
+}

Model/Database/PriRecursionStartReturnField.cs

@@ -0,0 +1,85 @@
+using Mapster;
+
+
+namespace Model
+{
+    /// <summary>
+    /// 递归开始条件返回字段 pri_recursion_start_return_field
+    /// </summary>
+    [SugarTable("pri_recursion_start_return_field", "递归开始条件返回字段")]
+    [Tenant("0")]
+    public class PriRecursionStartReturnField
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "状态", ColumnName = "status")]
+        public int status { get; set; }
+
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [SugarColumn(ColumnDescription = "排序", ColumnName = "sort")]
+        public int sort { get; set; }
+
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "版本号", ColumnName = "version")]
+        public int version { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_date")]
+        public DateTime? createDate { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新时间", ColumnName = "update_date")]
+        public DateTime? updateDate { get; set; }
+
+
+        /// <summary>
+        /// 字段名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "字段名称", Length = 50, ColumnName = "field_name")]
+        public string? fieldName { get; set; }
+
+
+        /// <summary>
+        /// 字段名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "字段名", Length = 50, ColumnName = "field_en_name")]
+        public string? fieldEnName { get; set; }
+
+
+        /// <summary>
+        /// 返回类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返回类型", Length = 50, ColumnName = "field_return_kind")]
+        public string? fieldReturnKind { get; set; }
+
+
+        /// <summary>
+        /// 对象表
+        /// </summary>
+        [SugarColumn(ColumnDescription = "对象表", ColumnName = "object_table_id")]
+        public int objectTableId { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetPriConditionListVo.cs

@@ -22,7 +22,7 @@ namespace Vo.Admin
         /// <summary>
         /// 条件返回字段
         /// </summary>
-        public int returnFieldId { get; set; }
+        public string returnFieldId { get; set; }
 
 
         /// <summary>

Model/Vo/Admin/GetPriConditionQueryVo.cs

@@ -22,7 +22,7 @@ namespace Vo.Admin
         /// <summary>
         /// 条件返回字段
         /// </summary>
-        public int returnFieldId { get; set; }
+        public string returnFieldId { get; set; }
 
 
         /// <summary>

Model/Vo/Admin/GetPriLoopSetDicVo.cs

@@ -0,0 +1,24 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 下拉框数据
+    /// </summary>
+    public class GetPriLoopSetDicVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 查询表
+        /// </summary>
+        public string tableEnName { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetPriRecursionStartConditionListVo.cs

@@ -0,0 +1,66 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetPriRecursionStartConditionListVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 递归配置ID
+        /// </summary>
+        public int loopSetId { get; set; }
+
+
+        /// <summary>
+        /// 条件返回字段
+        /// </summary>
+        public string returnFieldId { get; set; }
+
+
+        /// <summary>
+        /// 匹配条件
+        /// </summary>
+        public string fieldQueryKind { get; set; }
+
+
+        /// <summary>
+        /// 匹配方式
+        /// </summary>
+        public string fieldQueryModel { get; set; }
+
+
+        /// <summary>
+        /// 匹配值
+        /// </summary>
+        public string fieldQueryValue { get; set; }
+
+
+        /// <summary>
+        /// 匹配值类型
+        /// </summary>
+        public string fieldQueryValueType { get; set; }
+
+
+        /// <summary>
+        /// 奖励比例
+        /// </summary>
+        public decimal prizePercent { get; set; }
+
+
+        /// <summary>
+        /// 奖励固定金额
+        /// </summary>
+        public decimal prizeAmount { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetPriRecursionStartConditionQueryVo.cs

@@ -0,0 +1,66 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetPriRecursionStartConditionQueryVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 递归配置ID
+        /// </summary>
+        public int loopSetId { get; set; }
+
+
+        /// <summary>
+        /// 条件返回字段
+        /// </summary>
+        public string returnFieldId { get; set; }
+
+
+        /// <summary>
+        /// 匹配条件
+        /// </summary>
+        public string fieldQueryKind { get; set; }
+
+
+        /// <summary>
+        /// 匹配方式
+        /// </summary>
+        public string fieldQueryModel { get; set; }
+
+
+        /// <summary>
+        /// 匹配值
+        /// </summary>
+        public string fieldQueryValue { get; set; }
+
+
+        /// <summary>
+        /// 匹配值类型
+        /// </summary>
+        public string fieldQueryValueType { get; set; }
+
+
+        /// <summary>
+        /// 奖励比例
+        /// </summary>
+        public decimal prizePercent { get; set; }
+
+
+        /// <summary>
+        /// 奖励固定金额
+        /// </summary>
+        public decimal prizeAmount { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetPriRecursionStartReturnFieldListVo.cs

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetPriRecursionStartReturnFieldListVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 字段名称
+        /// </summary>
+        public string fieldName { get; set; }
+
+
+        /// <summary>
+        /// 字段名
+        /// </summary>
+        public string fieldEnName { get; set; }
+
+
+        /// <summary>
+        /// 返回类型
+        /// </summary>
+        public string fieldReturnKind { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetPriRecursionStartReturnFieldQueryVo.cs

@@ -0,0 +1,42 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetPriRecursionStartReturnFieldQueryVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 字段名称
+        /// </summary>
+        public string fieldName { get; set; }
+
+
+        /// <summary>
+        /// 字段名
+        /// </summary>
+        public string fieldEnName { get; set; }
+
+
+        /// <summary>
+        /// 返回类型
+        /// </summary>
+        public string fieldReturnKind { get; set; }
+
+
+        /// <summary>
+        /// 对象表
+        /// </summary>
+        public int objectTableId { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetPriRecursionStartTableListVo.cs

@@ -19,6 +19,12 @@ namespace Vo.Admin
         public string tableEnName { get; set; }
 
 
+        /// <summary>
+        /// 数据库
+        /// </summary>
+        public int databaseId { get; set; }
+
+
 
     }
 }

Services/IService/IPriLoopSetService.cs

@@ -17,6 +17,14 @@ namespace Services
         PagedInfo<GetPriLoopSetListVo> getPriLoopSetList([FromQuery] PagerInfo page, [FromQuery] PriLoopSet param);
 
 
+        /// <summary>
+        /// 递归配置-下拉框数据
+        /// </summary>
+        /// <param name="page">分页参数</param>
+        /// <returns>下拉框数据</returns>
+        PagedInfo<GetPriLoopSetDicVo> getPriLoopSetDic([FromQuery] PagerInfo page);
+
+
 
     }
 }

Services/IService/IPriRecursionStartConditionService.cs

@@ -0,0 +1,22 @@
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    public interface IPriRecursionStartConditionService : IBaseService<PriRecursionStartCondition>
+    {
+        /// <summary>
+        /// 递归开始条件-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetPriRecursionStartConditionListVo> getPriRecursionStartConditionList([FromQuery] PagerInfo page, [FromQuery] PriRecursionStartCondition param);
+
+
+
+    }
+}

Services/IService/IPriRecursionStartReturnFieldService.cs

@@ -0,0 +1,22 @@
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    public interface IPriRecursionStartReturnFieldService : IBaseService<PriRecursionStartReturnField>
+    {
+        /// <summary>
+        /// 递归开始条件返回字段-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetPriRecursionStartReturnFieldListVo> getPriRecursionStartReturnFieldList([FromQuery] PagerInfo page, [FromQuery] PriRecursionStartReturnField param);
+
+
+
+    }
+}

Services/PriLoopSetService.cs

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

Services/PriRecursionStartConditionService.cs

@@ -0,0 +1,40 @@
+using Attribute;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    /// <summary>
+    /// 递归开始条件Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IPriRecursionStartConditionService), ServiceLifetime = LifeTime.Transient)]
+    public class PriRecursionStartConditionService : BaseService<PriRecursionStartCondition>, IPriRecursionStartConditionService
+    {
+        /// <summary>
+        /// 递归开始条件-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetPriRecursionStartConditionListVo> getPriRecursionStartConditionList([FromQuery] PagerInfo page, [FromQuery] PriRecursionStartCondition param)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<PriRecursionStartCondition>();
+            predicate = predicate.AndIF(param.loopSetId > 0, m => m.loopSetId == param.loopSetId);
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.fieldQueryModel), m => m.fieldQueryModel.Contains(param.fieldQueryModel));
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .ToPage<PriRecursionStartCondition, GetPriRecursionStartConditionListVo>(page);
+            return response;
+        }
+
+
+
+    }
+}

Services/PriRecursionStartReturnFieldService.cs

@@ -0,0 +1,41 @@
+using Attribute;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    /// <summary>
+    /// 递归开始条件返回字段Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IPriRecursionStartReturnFieldService), ServiceLifetime = LifeTime.Transient)]
+    public class PriRecursionStartReturnFieldService : BaseService<PriRecursionStartReturnField>, IPriRecursionStartReturnFieldService
+    {
+        /// <summary>
+        /// 递归开始条件返回字段-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetPriRecursionStartReturnFieldListVo> getPriRecursionStartReturnFieldList([FromQuery] PagerInfo page, [FromQuery] PriRecursionStartReturnField param)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<PriRecursionStartReturnField>();
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.fieldName), m => m.fieldName.Contains(param.fieldName));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.fieldEnName), m => m.fieldEnName.Contains(param.fieldEnName));
+            predicate = predicate.AndIF(param.objectTableId > 0, m => m.objectTableId == param.objectTableId);
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .ToPage<PriRecursionStartReturnField, GetPriRecursionStartReturnFieldListVo>(page);
+            return response;
+        }
+
+
+
+    }
+}

Util/PrizeDo.cs

@@ -556,9 +556,7 @@ namespace Util
                 var fieldQueryValue = condition.fieldQueryValue; //匹配值
                 var fieldQueryValueType = condition.fieldQueryValueType; //匹配值类型
 
-                var returnField = returnFieldService.GetFirst(m => m.id == returnFieldId);
-                var queryTable = queryTableService.GetFirst(m => m.id == returnField.queryTableId);
-                var checkObj = condiDic.ContainsKey(queryTable.tableEnName + "_" + returnField.fieldEnName) ? condiDic[queryTable.tableEnName + "_" + returnField.fieldEnName] : "0";
+                var checkObj = condiDic.ContainsKey(returnFieldId) ? condiDic[returnFieldId] : "0";
                 var checkVal = fieldQueryValue;
 
                 if(fieldQueryKind == "1") //模糊匹配