Procházet zdrojové kódy

筛选ConfProcessGroupNames返回特定类型团组名称

ConfProcessGroupNames接口增加了TeamDid类型筛选,仅返回成都/四川会务活动和赛事项目收入相关团组。ConferenceAffairsCostChildView中的isCheck字段注释被注释,字段本身仍未启用。
Lyyyi před 2 dny
rodič
revize
07eb63f5d7

+ 8 - 2
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -32895,7 +32895,6 @@ WHERE
         public async Task<IActionResult> GroupProcessInitTest(int groupId, int currUserId)
         {
             return Ok(await _processOverviewRep.ProcessInitAsync(groupId, currUserId));
-
         }
 
         /// <summary>
@@ -33021,8 +33020,15 @@ WHERE
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> ConfProcessGroupNames()
         {
+            var groupTypes = new List<int>() {
+                302,   // 成都-会务活动
+                691,   // 四川-会务活动
+                762,   // 四川-赛事项目收入
+                1047   // 成都-赛事项目收入
+            };
+
             var groupNames = await _sqlSugar.Queryable<Grp_DelegationInfo>()
-                .Where(x => x.IsDel == 0)
+                .Where(x => x.IsDel == 0 && groupTypes.Contains(x.TeamDid))
                 .OrderByDescending(x => x.VisitDate)
                 .Select(x => new
                 {

+ 3 - 3
OASystem/OASystem.Domain/ViewModels/Groups/ConferenceAffairsCostView.cs

@@ -62,9 +62,9 @@
 
     public class ConferenceAffairsCostChildView
     {
-        /// <summary>
-        /// 是否选中
-        /// </summary>
+        ///// <summary>
+        ///// 是否选中
+        ///// </summary>
         //public bool isCheck { get; set; }
 
         /// <summary>