jiangjc 2 anni fa
parent
commit
69097971e3

+ 16 - 2
OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -30,18 +30,32 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostConferenceList()
         {
-            List<Grp_DelegationInfo> listSource = _busRep.Query<Grp_DelegationInfo>(s => s.TeamDid == 691).ToList();
+            List<Grp_DelegationInfo> listSource = _busRep.Query<Grp_DelegationInfo>(s => s.TeamDid == 691 && s.IsDel == 0).ToList();
             List<GroupNameView> viewList = new List<GroupNameView>();
             foreach (var group in listSource)
             {
                 GroupNameView _view = new GroupNameView();
-                _view.Id=group.Id;
+                _view.Id = group.Id;
                 _view.GroupName = group.TeamName;
             }
 
             return Ok(JsonView(viewList));
         }
 
+        /// <summary>
+        /// 获取会务的采购物品计划清单
+        /// </summary>
+        /// <param name="ConfId">会务活动Id</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostConfItemList(int ConfId)
+        {
+
+
+            return Ok(JsonView(false));
+        }
+
         #endregion
     }
 }

+ 5 - 6
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3,7 +3,6 @@ using Newtonsoft.Json.Serialization;
 using OASystem.API.OAMethodLibs;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Groups;
-using OASystem.Domain.ViewModels.Group;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Repositories.Groups;
 
@@ -36,14 +35,14 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> PostSearchGrpSchedule(string paras)
+        public async Task<IActionResult> PostSearchGrpSchedule(JsonDtoBase _jsonDto)
         {
-            if (string.IsNullOrEmpty(paras))
+            if (string.IsNullOrEmpty(_jsonDto.Paras))
             {
                 return Ok(JsonView(false, "参数为空"));
             }
 
-            Grp_ScheduleDto _ScheduleDto = JsonConvert.DeserializeObject<Grp_ScheduleDto>(paras);
+            Grp_ScheduleDto _ScheduleDto = JsonConvert.DeserializeObject<Grp_ScheduleDto>(_jsonDto.Paras);
             if (_ScheduleDto != null)
             {
                 if (_ScheduleDto.SearchType == 2)//获取列表
@@ -314,7 +313,7 @@ namespace OASystem.API.Controllers
             {
                 return Ok(JsonView(false, groupData.Msg));
             }
-            
+
             return Ok(JsonView(groupData.Data, groupData.Data.Count));
         }
 
@@ -359,7 +358,7 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(groupData.Data));
         }
 
-       
+
 
         #endregion
     }

+ 5 - 0
OASystem/OASystem.Domain/Dtos/DtoBase.cs

@@ -20,4 +20,9 @@ namespace OASystem.Domain.Dtos
         public int PageIndex { get; set; } = 1;
         public int PageSize { get; set; } = 10;
     }
+
+    public class JsonDtoBase
+    {
+        public string Paras { get; set; }
+    }
 }