‘考勤下发’ 添加已下发结果展示列表，补充科室确认

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -377,6 +377,7 @@ public IActionResult DownloadStatistics(int allotId)
         [Route("issue/audit/list")]
         public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
         {
+
             return _attendanceService.AuditList(allotId);
         }
 
@@ -389,7 +390,7 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
         /// <returns></returns>
         [HttpPost]
         [Route("issue/audit/detail")]
-        public ApiResponse<List<per_attendance_issue>> AuditDetail(int allotId, string unitType, string accountingUnit)
+        public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit)
         {
             return _attendanceService.AuditDetail(allotId, unitType, accountingUnit);
         }
@@ -400,9 +401,10 @@ public ApiResponse<List<per_attendance_issue>> AuditDetail(int allotId, string u
         /// <param name="allotId"></param> 
         /// <returns></returns>
         [HttpGet("issue/result/list")]
-        public ApiResponse<List<AttendanceStatistics>> IssAttendanceResult(int allotId)
+        public ApiResponse<List<AttendanceAuditDetail>> IssAttendanceResult(int allotId)
         {
-            throw new NotImplementedException();
+            var userid = claim.GetUserId();
+            return _attendanceService.IssAttendanceResult(allotId, userid);
         }
 
         /// <summary>
@@ -428,7 +430,8 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot
         public ApiResponse IssueStatistics(int allotId)
         {
             var userid = claim.GetUserId();
-            return _attendanceService.IssueStatistics(allotId, userid);
+            var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
+            return _attendanceService.IssueStatistics(allotId, userid, realName);
         }
 
         /// <summary>
@@ -442,11 +445,9 @@ public ApiResponse IssueStatistics(int allotId)
         [Route("issue/choose")]
         public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state)
         {
-            var userid = claim.GetUserId();
-            return _attendanceService.ChooseStatistics(allotId, userid, issueid, state);
+            var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
+            return _attendanceService.ChooseStatistics(allotId, issueid, state, realName);
         }
-
-
         #endregion
 
 

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

@@ -425,6 +425,15 @@
             科室确认详情
             </summary>
             <param name="allotId"></param>
+            <param name="unitType"></param>
+            <param name="accountingUnit"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.IssAttendanceResult(System.Int32)">
+            <summary>
+            已下发结果展示列表
+            </summary>
+            <param name="allotId"></param> 
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.PreConfirmationDisplay(System.Int32)">

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

@@ -2898,6 +2898,96 @@
             科室
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.AllotId">
+            <summary>
+            绩效Id
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.Code">
+            <summary>
+            核算单元编码
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.UnitType">
+            <summary>
+            人员类别
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.PersonnelNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.PersonnelName">
+            <summary>
+            姓名
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.BeginDate">
+            <summary>
+            在科开始时间
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.EndDate">
+            <summary>
+            在科结束时间
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.WorkFullDays">
+            <summary>
+            全勤天数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.AttendanceDays">
+            <summary>
+            出勤天数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.DeductionDays">
+            <summary>
+            核减天数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.NoDeductionDays">
+            <summary>
+            不核减天数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.State">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.UpdateUser">
+            <summary>
+            更新人
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.UpdateTime">
+            <summary>
+            更新时间
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetails.Value">
+            <summary>
+            请假天数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetails.Title">
+            <summary>
+            考勤类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetails.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Response.AttendanceAuditList.Code">
             <summary>
             编码
@@ -3003,6 +3093,11 @@
             在科结束时间
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.AttendanceDays">
+            <summary>
+            出勤天数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.AttendanceStatisticsDetial.Value">
             <summary>
             请假天数

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

@@ -6188,99 +6188,24 @@
             状态
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.UpdateUser">
-            <summary>
-            更新人
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.UpdateTime">
-            <summary>
-            更新时间
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.HospitalId">
-            <summary>
-            医院Id
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.AllotId">
-            <summary>
-            绩效Id
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.Code">
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateUser">
             <summary>
-            核算单元编码
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.UnitType">
-            <summary>
-            人员类别
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.AccountingUnit">
-            <summary>
-            核算单元
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.PersonnelNumber">
-            <summary>
-            工号
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.PersonnelName">
-            <summary>
-            姓名
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.BeginDate">
-            <summary>
-            在科开始时间
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.EndDate">
-            <summary>
-            在科结束时间
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.WorkFullDays">
-            <summary>
-            全勤天数
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.AttendanceDays">
-            <summary>
-            出勤天数
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.DeductionDays">
-            <summary>
-            核减天数
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.NoDeductionDays">
-            <summary>
-            不核减天数
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.State">
-            <summary>
-            状态
+            创建人
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.OperationType">
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateTime">
             <summary>
-            操作类型
+            创建时间
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.CreateUser">
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.UpdateUser">
             <summary>
-            操作人
+            更新人
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue_record.CreationTime">
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.UpdateTime">
             <summary>
-            操作时间
+            更新时间
             </summary>
         </member>
         <member name="P:Performance.EntityModels.Entity.per_attendance_type.IsDeduction">

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -276,10 +276,7 @@ public AutoMapperConfigs()
             CreateMap<cof_workitem, WorkItemRequest>()
                 .ReverseMap();
 
-            CreateMap<cof_again,CofAgainRequest>().ReverseMap();
-            CreateMap<per_attendance_issue_record, per_attendance_issue>().ReverseMap();
-            CreateMap<PerAttendanceIssueDto, per_attendance_issue>().ReverseMap();
-            CreateMap<PerAttendanceIssueDto, AttendanceStatistics>().ReverseMap();
+            CreateMap<cof_again, CofAgainRequest>().ReverseMap();
         }
     }
 }

performance/Performance.EntityModels/Entity/per_attendance_issue_record.cs → performance/Performance.DtoModels/Response/AttendanceAuditDetail.cs

 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Performance.EntityModels.Entity
+namespace Performance.DtoModels.Response
 {
-    [Table("per_attendance_issue_record")]
-    public class per_attendance_issue_record
+    public class AttendanceAuditDetail
     {
-
-        [Key]
-        public int Id { get; set; }
-        /// <summary>
-        /// 医院Id
-        /// </summary>
-        public int HospitalId { get; set; }
         /// <summary>
         /// 绩效Id
         /// </summary>
@@ -71,18 +61,29 @@ public class per_attendance_issue_record
         /// </summary>
         public int State { get; set; }
         /// <summary>
-        /// 操作类型
+        /// 更新人
+        /// </summary>
+        public string UpdateUser { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? UpdateTime { get; set; }
+
+        public List<AttendanceAuditDetails> Detial { get; set; }
+    }
+    public class AttendanceAuditDetails
+    {
+        /// <summary>
+        /// 请假天数
         /// </summary>
-        public string OperationType { get; set; }
+        public int Value { get; set; }
         /// <summary>
-        /// 操作人
+        /// 考勤类型
         /// </summary>
-        public int CreateUser { get; set; }
+        public string Title { get; set; }
         /// <summary>
-        /// 操作时间
+        /// 备注
         /// </summary>
-        public DateTime? CreationTime { get; set; } 
-
-
+        public string Remark { get; set; }
     }
 }

performance/Performance.DtoModels/Response/AttendanceAuditList.cs

@@ -31,7 +31,7 @@ public class AttendanceAuditList
         /// <summary>
         /// 操作时间
         /// </summary>
-        public DateTime OperationTime { get; set; }
+        public DateTime? OperationTime { get; set; }
         /// <summary>
         /// 操作人
         /// </summary>

performance/Performance.DtoModels/Response/AttendanceStatistics.cs

@@ -36,6 +36,9 @@ public class AttendanceStatistics
         public DateTime EndDate { get; set; }
 
         public List<AttendanceStatisticsDetial> Detial { get; set; }
+        /// <summary>
+        /// 出勤天数
+        /// </summary>
         public int AttendanceDays { get; set; }
 
     }

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -255,7 +255,6 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<sys_version> sys_version { get; set; }
         public virtual DbSet<per_attendance> per_attendance { get; set; }
         public virtual DbSet<per_attendance_issue> per_attendance_issue { get; set; }
-        public virtual DbSet<per_attendance_issue_record> per_attendance_issue_record { get; set; }
         public virtual DbSet<per_attendance_type> per_attendance_type { get; set; }
         public virtual DbSet<per_attendance_vacation> per_attendance_vacation { get; set; }
         public virtual DbSet<per_allot_action> per_allot_action { get; set; }

performance/Performance.EntityModels/Entity/per_attendance_issue.cs

@@ -68,11 +68,19 @@ public class per_attendance_issue
         /// <summary>
         /// 状态
         /// </summary>
-        public int State { get; set; } 
+        public int State { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
         /// <summary>
         /// 更新人
         /// </summary>
-        public int UpdateUser { get; set; }
+        public string UpdateUser { get; set; }
         /// <summary>
         /// 更新时间
         /// </summary>

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -406,5 +406,27 @@ public void Batch(int[] ids, string batch, string batchDate, string bankName)
                 throw;
             }
         }
+
+
+
+        /// <summary>
+        /// 考勤-考勤结果备份
+        /// </summary>
+        /// <param name="allot"></param>
+        public void PerAttendanceIssueBackup(int allotId)
+        {
+            using (var connection = context.Database.GetDbConnection())
+            {
+                if (connection.State != ConnectionState.Open) connection.Open();
+                try
+                {
+                    connection.Execute("call proc_attendance_backup(@allotId);", new { allotId }, commandTimeout: 60 * 60);
+                }
+                catch (Exception)
+                {
+                    throw;
+                }
+            }
+        }
     }
 }
\ No newline at end of file

performance/Performance.Repository/Repository/PerforPerAttendanceIssueRecordRepository.cs

-using Performance.EntityModels;
-using Performance.EntityModels.Entity;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Performance.Repository.Repository
-{
-    public partial class PerforPerAttendanceIssueRecordRepository : PerforRepository<per_attendance_issue_record>
-    {
-        /// <summary>
-        /// per_attendance_issue_record Repository
-        /// </summary>
-        public PerforPerAttendanceIssueRecordRepository(PerformanceDbContext context) : base(context)
-        {
-        }
-    }
-}