修改初始考勤页面返回值，统计考勤未完成

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -179,12 +179,13 @@ public ApiResponse AttendanceBatch(int allotId,int hospitalId, SaveCollectData r
         /// 考勤结果统计
         /// </summary>
         /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
         /// <returns></returns>
         [HttpGet("statistics/{allotId}")]
-        public ApiResponse GetAttendanceStatistics(int allotId)
+        public ApiResponse GetAttendanceStatistics(int allotId,int hospitalId)
         {
             // 返回结果参考接口 employee/apr/getdeptdetail
-            return new ApiResponse(ResponseType.Fail);
+            return _attendanceService.GetAttendanceStatistics(allotId, hospitalId);
         }
     }
 }

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

@@ -388,11 +388,12 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceStatistics(System.Int32)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceStatistics(System.Int32,System.Int32)">
             <summary>
             考勤结果统计
             </summary>
             <param name="allotId"></param>
+            <param name="hospitalId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">

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 DateTime? CallInDate { get; set; } //调入时间
+        public Nullable<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 DateTime? BegDate { get; set; } //开始时间
-        public DateTime? EndDate { get; set; } //结束时间
+        public Nullable<DateTime> BegDate { get; set; } //开始时间
+        public Nullable<DateTime> EndDate { get; set; } //结束时间
 
     }
 }

performance/Performance.EntityModels/Other/view_attendance.cs

@@ -16,7 +16,7 @@ public class view_attendance
         public string AccountingUnit { get; set; } //核算单元
         public string PersonnelNumber { get; set; } //工号
         public string PersonnelName { get; set; } //姓名
-        public DateTime? AttendanceDate { get; set; }
+        public Nullable<DateTime> AttendanceDate { get; set; }
         public string Source { get; set; }
         public string Department { get; set; } //科室名称
     }
@@ -27,10 +27,17 @@ public class InitialAttendance
         public string AccountingUnit { get; set; } //核算单元
         public string PersonnelNumber { get; set; } //工号
         public string PersonnelName { get; set; } //姓名
-        public DateTime? StartDate { get; set; } //入科开始时间
-        public DateTime? EndDate { get; set; } //入科结束时间
+        public Nullable<DateTime> StartDate { get; set; } //入科开始时间
+        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
     {