考勤代码调整，考勤记录增加考勤时间冲突判断，考勤统计增加出勤天数

performance/Performance.Api/Configurations/SwaggerConfig.cs

@@ -19,20 +19,20 @@ public static void AddSwaggerConfiguration(this IServiceCollection services)
             {
                 c.SwaggerDoc("v1", new OpenApiInfo { Version = "v1.0", Title = "绩效API接口" });
 
-                //var xmlPath = new string[]
-                //{
-                //    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.Api.xml"),
-                //    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.DtoModels.xml"),
-                //    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.EntityModels.xml"),
-                //};
+                var xmlPath = new string[]
+                {
+                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.Api.xml"),
+                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.DtoModels.xml"),
+                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.EntityModels.xml"),
+                };
 
-                //foreach (var item in xmlPath)
-                //{
-                //    c.IncludeXmlComments(item, true);
-                //}
+                foreach (var item in xmlPath)
+                {
+                    c.IncludeXmlComments(item, true);
+                }
 
-                var xmlPathsss = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.Api.xml");
-                c.IncludeXmlComments(xmlPathsss, true);
+                //var xmlPathsss = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "Performance.Api.xml");
+                //c.IncludeXmlComments(xmlPathsss, true);
 
                 // Token绑定到ConfigureServices
                 var security = new OpenApiSecurityRequirement

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -2,6 +2,7 @@
 using Performance.DtoModels;
 using Performance.EntityModels.Other;
 using Performance.Services;
+using System.Collections.Generic;
 
 namespace Performance.Api.Controllers
 {
@@ -181,7 +182,7 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData
         /// <param name="allotId"></param> 
         /// <returns></returns>
         [HttpGet("statistics/{allotId}")]
-        public ApiResponse GetAttendanceStatistics(int allotId)
+        public ApiResponse<List<AttendanceStatistics>> GetAttendanceStatistics(int allotId)
         {
             // 返回结果参考接口 employee/apr/getdeptdetail
             return _attendanceService.GetAttendanceStatistics(allotId);

performance/Performance.Api/Performance.Api.csproj

@@ -48,6 +48,9 @@
 		<Content Update="wwwroot\Performance.Api.xml">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+		<Content Update="wwwroot\Performance.DtoModels.xml">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
 		<Content Update="wwwroot\Performance.EntityModels.xml">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
@@ -86,6 +89,10 @@
 		</None>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="wwwroot\" />
+	</ItemGroup>
+
 	<ProjectExtensions>
 		<VisualStudio>
 			<UserProperties appsettings_1json__JSONSchema="" />

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

@@ -388,12 +388,11 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceStatistics(System.Int32,System.Int32)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceStatistics(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.Api/wwwroot/Performance.DtoModels.xml

@@ -2703,6 +2703,56 @@
             科室
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.UnitType">
+            <summary>
+            核算组别
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.Department">
+            <summary>
+            科室名称
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.PersonnelNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.PersonnelName">
+            <summary>
+            姓名
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.BeginDate">
+            <summary>
+            在科开始时间
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.EndDate">
+            <summary>
+            在科结束时间
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatisticsDetial.Value">
+            <summary>
+            请假天数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatisticsDetial.Title">
+            <summary>
+            考勤类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatisticsDetial.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.BudgetRatioResponse.HospitalId">
             <summary>
             医院Id

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

@@ -8850,56 +8850,6 @@
             
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatistics.UnitType">
-            <summary>
-            核算组别
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatistics.AccountingUnit">
-            <summary>
-            核算单元
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatistics.Department">
-            <summary>
-            科室名称
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatistics.PersonnelNumber">
-            <summary>
-            工号
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatistics.PersonnelName">
-            <summary>
-            姓名
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatistics.BeginDate">
-            <summary>
-            在科开始时间
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatistics.EndDate">
-            <summary>
-            在科结束时间
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatisticsDetial.Value">
-            <summary>
-            请假天数
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatisticsDetial.Title">
-            <summary>
-            考勤类型
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Other.AttendanceStatisticsDetial.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.HisData.HisDepartment">
             <summary>
             His科室

performance/Performance.DtoModels/Response/AttendanceStatistics.cs

+using System;
+using System.Collections.Generic;
+
+namespace Performance.DtoModels
+{
+    public class AttendanceStatistics
+    {
+        public int AllotID { get; set; }
+        /// <summary>
+        /// 核算组别
+        /// </summary>
+        public string UnitType { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+        /// <summary>
+        /// 科室名称
+        /// </summary>
+        public string Department { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string PersonnelNumber { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string PersonnelName { get; set; }
+        /// <summary>
+        /// 在科开始时间
+        /// </summary>
+        public DateTime BeginDate { get; set; }
+        /// <summary>
+        /// 在科结束时间
+        /// </summary>
+        public DateTime EndDate { get; set; }
+
+        public List<AttendanceStatisticsDetial> Detial { get; set; }
+        public int AttendanceDays { get; set; }
+
+    }
+
+    public class AttendanceStatisticsDetial
+    {
+        /// <summary>
+        /// 请假天数
+        /// </summary>
+        public int Value { get; set; }
+        /// <summary>
+        /// 考勤类型
+        /// </summary>
+        public string Title { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+}

performance/Performance.DtoModels/Response/ComputeResponse.cs

 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace Performance.DtoModels

performance/Performance.EntityModels/Other/view_attendance.cs

@@ -60,84 +60,6 @@ public class AttendanceType
     }
 
 
-    public class AttendanceResponse<T>
-    {
-        public List<AttendaceHeads> Heads { get; set; }
-        public T Datas { get; set; }
-    }
-
-    public class AttendancesJoinVacatione
-    {
-        public string AccountingUnit { get; set; }
-        public string Department { get; set; }
-        public string PersonnelName { get; set; }
-        public string PersonnelNumber { get; set; }
-        public string UnitType { get; set; }
-        public DateTime? StartDate { get; set; }
-        public DateTime? EndDate { get; set; }
-        public List<Detail> Detail { get; set; }
-        public int AttendanceDays { get; set; }
-
-    }
-    public class Detail
-    {
-        public string Title { get; set; }
-        public DateTime? BegDate { get; set; }
-        public DateTime EndDate { get; set; }
-        public int IsDeduction { get; set; }
-        public int VacationDays { get; set; }
-
-    }
-
-    public class AttendanceStatistics
-    {
-        public int AllotID { get; set; }
-        /// <summary>
-        /// 核算组别
-        /// </summary>
-        public string UnitType { get; set; }
-        /// <summary>
-        /// 核算单元
-        /// </summary>
-        public string AccountingUnit { get; set; }
-        /// <summary>
-        /// 科室名称
-        /// </summary>
-        public string Department { get; set; }
-        /// <summary>
-        /// 工号
-        /// </summary>
-        public string PersonnelNumber { get; set; }
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string PersonnelName { get; set; }
-        /// <summary>
-        /// 在科开始时间
-        /// </summary>
-        public DateTime BeginDate { get; set; }
-        /// <summary>
-        /// 在科结束时间
-        /// </summary>
-        public DateTime EndDate { get; set; }
-        public List<AttendanceStatisticsDetial> Detial { get; set; }
-    }
-
-    public class AttendanceStatisticsDetial
-    {
-        /// <summary>
-        /// 请假天数
-        /// </summary>
-        public int Value { get; set; }
-        /// <summary>
-        /// 考勤类型
-        /// </summary>
-        public string Title { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; }
-    }
 
 
 }