新增团组表Op提成等级、等级说明字段

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -151,7 +151,7 @@ namespace OASystem.API.Controllers
                 {
                     return Ok(JsonView(false, "请传类型Id！"));
                 }
-                var setData = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => s.STid == dto.DataType).ToList();
+                var setData = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => s.STid == dto.DataType && s.IsDel==0).ToList();
                 if (setData.Count == 0)
                 {
                     return Ok(JsonView(false, "暂无数据！"));

OASystem/OASystem.Domain/Dtos/Groups/GroupListDto.cs

@@ -190,6 +190,15 @@ namespace OASystem.Domain.Dtos.Groups
         /// 备注
         /// </summary>
         public string Remark { get; set; }
+
+        /// <summary>
+        /// OP提成等级
+        /// </summary>
+        public int OpRoyaltyLv { get; set; }
+        /// <summary>
+        /// 等级说明
+        /// </summary>
+        public string opRoyaltyRemark { get; set; }
     }
 
     /// <summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_DelegationInfo.cs

@@ -214,5 +214,17 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string ZZSCSPWH { get; set; }
+        #region 新增团组op提成等级
+        /// <summary>
+        /// Op提成等级
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int OpRoyaltyLv { get; set; }
+        /// <summary>
+        /// 等级说明
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string OpRoyaltyRemark { get; set; }
+        #endregion
     }
 }

OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -189,6 +189,16 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 手机号
         /// </summary>
         public string? TellPhone { get; set; }
+        /// <summary>
+        /// op提成等级
+        /// </summary>
+        public int OpRoyaltyLv { get; set; }
+        /// <summary>
+        /// 提成等级说明
+        /// </summary>
+        public string?  OpRoyaltyRemark { get; set; }
+
+
     }
 
     /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -230,7 +230,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 string sql = string.Format(@"Select Id,SalesQuoteNo,TourCode,JietuanOperator,TeamLevSId,TeamDid,TeamName,ClientName,
 	                                                ClientUnit,VisitCountry,VisitDate,VisitDays,VisitPNumber,TontractTime,
 	                                                PayDay,PaymentMoney,VisitPurpose,SpecialNeeds,OtherNeeds,CGRWSPBMMC,CGRWSPWH,
-	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone
+	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone,OpRoyaltyLv,OpRoyaltyRemark
                                              From Grp_DelegationInfo Where Id = {0} And IsDel = 0", dto.Id);
 
                 var _DelegationInfo = await _sqlSugar.SqlQueryable<DelegationInfoWebView>(sql).FirstAsync();
@@ -383,7 +383,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         CreateUserId = dto.UserId,
                         CreateTime = DateTime.Now,
                         DeleteUserId = null,
-                        DeleteTime = new DateTime(1990, 1, 1).ToString("yyyy-MM-dd HH:mm:ss")
+                        DeleteTime = new DateTime(1990, 1, 1).ToString("yyyy-MM-dd HH:mm:ss"),
+                        OpRoyaltyLv = dto.OpRoyaltyLv,
+                        OpRoyaltyRemark=dto.opRoyaltyRemark
                     };
 
                     Log.Information("添加："+ JsonConvert.SerializeObject(delegationInfo));
@@ -426,7 +428,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         ZZSCSPWH = dto.ZZSCSPWH,
                         TontractTime = Convert.ToDateTime(dto.TontractTime),
                         PaymentMoney = dto.PaymentMoney,
-                        PayDay = dto.PayDay
+                        PayDay = dto.PayDay,
+                        OpRoyaltyLv = dto.OpRoyaltyLv,
+                        OpRoyaltyRemark = dto.opRoyaltyRemark
                     });
 
                     if (updateStatus)