计算工资 餐补修改

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -489,7 +489,6 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(true, "操作成功! 耗时：" + (sw.ElapsedMilliseconds/1000) + "s"));
         }
 
-
         /// <summary>
         /// 计算工资 By YearMonth And UserId
         /// </summary>

OASystem/OASystem.Domain/ViewModels/PersonnelModule/WageSheetView.cs

@@ -423,6 +423,54 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
 
     #region 假勤 和 打卡 统计
 
+    /// <summary>
+    /// 假期详情
+    /// </summary>
+    public class LeaveDetails
+    {
+        /// <summary>
+        /// 假期类型Id
+        /// </summary>
+        public int TypeId { get; set; }
+
+        /// <summary>
+        /// 假期名称
+        /// </summary>
+        public string TypeName { get; set; }
+
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public DateTime StartDt { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public DateTime EndDt { get; set; }
+
+        /// <summary>
+        /// 时间展示类型：halfday-日期；hour-日期+时间
+        /// </summary>
+        public string DtType { get; set; }
+
+        /// <summary>
+        /// 时长单位
+        /// 小时/天
+        /// </summary>
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// 请假时长
+        /// </summary>
+        public decimal New_Duration { get; set; }
+
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        public DateTime  ApplyDt { get; set; }
+    }
+
+
     public class Ex_Items
     {
         /// <summary>