考勤

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -334,7 +334,7 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetBatchCallInHandsonTable">
+        <member name="M:Performance.Api.Controllers.AttendanceController.GetBatchCallInHandsonTable(System.Int32)">
             <summary>
             返回HandsonTable格式调动记录
             </summary>
@@ -373,13 +373,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceVacationHandsonTable">
+        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceVacationHandsonTable(System.Int32)">
             <summary>
             返回HandsonTable格式考勤记录
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceVacation(System.Int32,System.Int32)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceVacation(System.Int32)">
             <summary>
             查询考勤记录
             </summary>
@@ -426,7 +426,7 @@
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.DownloadStatistics(System.Int32)">
             <summary>
-            生成最总考勤结果下载
+            生成最终考勤结果下载
             </summary>
             <param name="allotId"></param>
             <returns></returns>

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -8880,6 +8880,21 @@
             科室名称
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.Other.AttendanceType.Id">
+            <summary>
+            Id
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Other.AttendanceType.AttendanceName">
+            <summary>
+            考勤类型名称
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Other.AttendanceType.IsDeduction">
+            <summary>
+            是否核减出勤 1 核减 2 不核减
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.HisData.HisDepartment">
             <summary>
             His科室

performance/Performance.DtoModels/ExcelDownloadHeads.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Performance.DtoModels
+{
+    public class ExcelDownloadHeads
+    {
+        public string Alias { get; set; }
+        public string Name { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/per_attendance.cs

@@ -19,6 +19,6 @@ public class per_attendance
         public string PersonnelName { get; set; } //姓名
         public string CallInUnitType { get; set; } //人员类别
         public string CallInAccountingUnit { get; set; } //核算单元
-        public Nullable<DateTime> CallInDate { get; set; } //调入时间
+        public DateTime? CallInDate { get; set; } //调入时间
     }
 }

performance/Performance.EntityModels/Entity/per_attendance_vacation.cs

@@ -18,8 +18,8 @@ public class per_attendance_vacation
         public string PersonnelNumber { get; set; } //工号
         public string PersonnelName { get; set; } //姓名
         public int TypeId { get; set; } //per_attendance_type表中ID
-        public Nullable<DateTime> BegDate { get; set; } //开始时间
-        public Nullable<DateTime> EndDate { get; set; } //结束时间
+        public DateTime BegDate { get; set; } //开始时间
+        public DateTime EndDate { get; set; } //结束时间
 
     }
 }

performance/Performance.EntityModels/Other/view_attendance.cs

@@ -31,7 +31,7 @@ public class view_attendance
         /// <summary>
         /// 考勤时间
         /// </summary>
-        public Nullable<DateTime> AttendanceDate { get; set; }
+        public DateTime AttendanceDate { get; set; }
         /// <summary>
         /// 来源
         /// </summary>
@@ -52,14 +52,6 @@ public class InitialAttendance
         public Nullable<DateTime> EndDate { get; set; } //入科结束时间
         public string Department { get; set; } //科室名称
     }
-    public class InitialAttendanceJoin : InitialAttendance
-    {
-        public string AttendanceName { get; set; } //考勤类型名称
-        public int IsDeduction { get; set; } //是否核减出勤 1 核减 2 不核减
-        public Nullable<DateTime> BegDate { get; set; } //开始时间
-        public Nullable<DateTime> bEndDate { get; set; } //结束时间
-    }
-
     public class RecordAttendcance : per_attendance_vacation
     {
         public int Days { get; set; }
@@ -76,8 +68,18 @@ public class AttendaceHeads
 
     public class AttendanceType
     {
-        public string AttendanceName { get; set; } //考勤类型名称
-        public string IsDeduction { get; set; } //是否核减出勤 1 核减 2 不核减
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; } //考勤类型名称
+        /// <summary>
+        /// 考勤类型名称
+        /// </summary>
+        public string AttendanceName { get; set; }
+        /// <summary>
+        /// 是否核减出勤 1 核减 2 不核减
+        /// </summary>
+        public string IsDeduction { get; set; } 
     }
 
 

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -280,20 +280,20 @@ public IEnumerable<string> GetSecondWorkloadMaps(int hospitalId)
 
 
 
+
         public IEnumerable<view_attendance> GetAttendance(int allotId)
         {
-            using (var connection = context.Database.GetDbConnection())
+            var connection = context.Database.GetDbConnection();
+
+            if (connection.State != ConnectionState.Open) connection.Open();
+            try
             {
-                if (connection.State != ConnectionState.Open) connection.Open();
-                try
-                {
-                    string query = $@"SELECT * FROM view_attendance where allotId = @allotId";
-                    return connection.Query<view_attendance>(query, new { allotId }, commandTimeout: 60 * 60);
-                }
-                catch (Exception)
-                {
-                    throw;
-                }
+                string query = $@"SELECT * FROM view_attendance where allotId = @allotId";
+                return connection.Query<view_attendance>(query, new { allotId }, commandTimeout: 60 * 60);
+            }
+            catch (Exception)
+            {
+                throw;
             }
         }
         /// <summary>