Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -5318,6 +5318,29 @@ Group by PriceType ", dto.diId);
 
             return Ok(jw);
         }
+
+        /// <summary>
+        /// 提成确认
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+
+        public IActionResult SaveRoyaltyDetaile(SaveRoyaltyDetaileDto dto)
+        {
+            var jw = JsonView(false);
+            if (dto.ComputeRoyaltiesList.Count != 0)
+            {
+                
+
+
+            }
+            else
+            {
+                jw = JsonView(false,"保存失败!");
+            }
+
+            return Ok(jw);
+        }
         #endregion
     }
 }

OASystem/OASystem.Domain/Dtos/Financial/ComputeRoyaltiesDto.cs

@@ -21,6 +21,33 @@ namespace OASystem.Domain.Dtos.Financial
 
     }
 
+    /// <summary>
+    /// 提成信息保存
+    /// </summary>
+    public class SaveRoyaltyDetaileDto
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime StartDataTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime EndDataTime { get; set; }
+
+        /// <summary>
+        /// 提成人员
+        /// </summary>
+        public int UserId { get; set;}
+
+
+        /// <summary>
+        /// 提成信息集合
+        /// </summary>
+        public List<ComputeRoyaltiesView> ComputeRoyaltiesList {  get; set; }
+    }
+
     public class ComputeRoyaltiesView
     {
         public decimal price { get; set; }

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -30,7 +30,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
         /// <returns></returns>
         public async Task<JsonView> QueryOfficialActivitiesByDiId(OfficialActivitiesByDiIdDto dto)
         {
-            JsonView result = new JsonView() { Code = StatusCodes.Status204NoContent, Msg = "未知错误" };
+            JsonView result = new JsonView() { Code = StatusCodes.Status200OK, Msg = "暂无数据" };
 
             string sqlWhere = string.Empty;
             sqlWhere += string.Format(@"AND o.Isdel={0} AND o.DiId={1} ", 0, dto.DiId);
@@ -57,7 +57,6 @@ ORDER BY
 
             if (OfficialActivities.Count != 0)
             {
-
                 if (dto.PageSize == 0 && dto.PageIndex == 0)
                 {
                     foreach (var temp in OfficialActivities)
@@ -115,10 +114,10 @@ ORDER BY
                     result = new JsonView() { Code = 200, Msg = "查询成功！", Data = rst };
                 }
             }
-            else
-            {
-                result = new JsonView() { Code = StatusCodes.Status204NoContent, Msg = "暂无数据！", Data = OfficialActivities };
-            }
+            //else
+            //{
+            //    result = new JsonView() { Code = StatusCodes.Status204NoContent, Msg = "暂无数据！", Data = OfficialActivities };
+            //}
 
             return result;
         }