Merge branch 'featrue/考勤下发' into develop

performance/Performance.Api/Controllers/AccountController.cs

@@ -49,7 +49,7 @@ public class AccountController : Controller
         ///     {
         ///       "logintype": 2,
         ///       "account": "admin",
-        ///       "password": "e10adc3949ba59abbe56e057f20f883e",
+        ///       "password": "b59c67bf196a4758191e42f76670ceba",
         ///       "appname": "string",
         ///       "device": "web"
         ///     }

performance/Performance.Api/Controllers/ReportController.cs

@@ -368,13 +368,10 @@ public IActionResult WholeHospitalGrantSummaryDownload([FromBody] HospitalGrantS
                 string.IsNullOrEmpty(request.EndTime) || !DateTime.TryParse(request.EndTime, out edate))
                 throw new PerformanceException("请输入正确的时间");
 
-            var resetGroupBy = request.GroupBy.Copy();
             var list = _computeService.GetAllComputeViewByDateAndTotal("view_allot_sign_emp", request);
             if (null == list)
                 throw new PerformanceException("当前绩效记录不存在");
 
-
-            request.GroupBy = resetGroupBy;
             List<string> headlist = new List<string>();
 
             foreach (var item in request.GroupBy.Union(request.SumBy).ToList())
@@ -496,12 +493,11 @@ public IActionResult WholeHospitalAccountingGrantSummaryDownload([FromBody] Hosp
                 string.IsNullOrEmpty(request.EndTime) || !DateTime.TryParse(request.EndTime, out edate))
                 throw new PerformanceException("请输入正确的时间");
 
-
             var list = _computeService.GetAllComputeViewByDateAndTotal("view_allot_sign_dept", request);
             if (null == list)
                 throw new PerformanceException("当前绩效记录不存在");
 
-            List<string> headlist = new List<string>();
+            List<string> headlist = new List<string>() { };
 
             foreach (var item in request.GroupBy.Union(request.SumBy).ToList())
             {
@@ -619,7 +615,6 @@ public IActionResult WholeHospitalFinanceGrantSummaryDownload([FromBody] Hospita
                 string.IsNullOrEmpty(request.EndTime) || !DateTime.TryParse(request.EndTime, out edate))
                 throw new PerformanceException("请输入正确的时间");
 
-
             var list = _computeService.GetAllComputeViewByDateAndTotal("view_allot_sign_emp_finance", request);
             if (null == list)
                 throw new PerformanceException("当前绩效记录不存在");

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -199,7 +199,7 @@ public ApiResponse OtherAutoComplete([FromBody] SecondEmpRequest request)
         public ApiResponse<List<SecondTempResponse>> Temp([FromBody] AllotDeptRequest request)
         {
             var userId = claimService.GetUserId();
-            var result = secondAllotService.GetTemp(request.HospitalId, request.Department, userId);
+            var result = secondAllotService.GetTemp(request.HospitalId, request.UnitType, request.Department, userId);
             return new ApiResponse<List<SecondTempResponse>>(ResponseType.OK, result);
         }
 

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

@@ -15,7 +15,7 @@
                  {
                    "logintype": 2,
                    "account": "admin",
-                   "password": "e10adc3949ba59abbe56e057f20f883e",
+                   "password": "b59c67bf196a4758191e42f76670ceba",
                    "appname": "string",
                    "device": "web"
                  }
@@ -302,13 +302,6 @@
             记录创建、下发、归档、上传绩效
             </summary>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendance(System.Int32)">
-            <summary>
-            查询绩效考勤记录
-            </summary>
-            <param name="allotId"></param>
-            <returns></returns>
-        </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.GetCallIn(System.Int32)">
             <summary>
             查询绩效调动记录
@@ -385,13 +378,6 @@
             <param name="allotId"></param> 
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.DownloadAttendance(System.Int32)">
-            <summary>
-            初始考勤记录下载
-            </summary>
-            <param name="allotId"></param>
-            <returns></returns>
-        </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.DownloadVacation(System.Int32)">
             <summary>
             考勤记录下载
@@ -413,6 +399,58 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.DownloadAuditDetail(System.Int32,System.String,System.String,System.String)">
+            <summary>
+            科室确认详情(已下发结果展示列表)下载
+            </summary>
+            <param name="allotId"></param>
+            <param name="unitType">人员类别</param>
+            <param name="accountingUnit">核算单元</param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.AuditList(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.State)">
+            <summary>
+            科室确认列表
+            </summary>
+            <param name="allotId">绩效Id</param>
+            <param name="unitType">人员类别</param>
+            <param name="accountingUnit">核算单元</param>
+            <param name="state"> 操作类型  全部=0，未确认 = 1,确认 = 2,驳回 = 3,</param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.AuditDetail(System.Int32,System.String,System.String,System.String)">
+            <summary>
+            科室确认详情(已下发结果展示列表)
+            </summary>
+            <param name="allotId">绩效Id</param>
+            <param name="unitType"> 人员类别</param>
+            <param name="accountingUnit">核算单元</param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.PreConfirmationDisplay(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.OperationType)">
+            <summary>
+            最终考勤结果下发(预确认显示)
+            </summary>
+            <param name="allotId">绩效Id</param>
+            <param name="unitType">人员类别</param>
+            <param name="accountingUnit">核算单元</param>
+            <param name="state"> 操作类型 新增 = 1, 修改 = 2, 删除 = 3,</param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.IssueStatistics(System.Int32)">
+            <summary>
+            最终考勤结果下发
+            </summary>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.ChooseStatistics(Performance.DtoModels.Response.AttendanceIssueChoose)">
+            <summary>
+            最终考勤结果驳回或确认无误((批量操作)
+            </summary>
+            <param name="attendanceIssueChoose"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">
             <summary>
             预算管理查询（包含金额、占比）

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

@@ -6118,6 +6118,101 @@
             修改时间
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.HospitalId">
+            <summary>
+            医院Id
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.AllotId">
+            <summary>
+            绩效Id
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.Code">
+            <summary>
+            核算单元编码
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.UnitType">
+            <summary>
+            人员类别
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.PersonnelNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.PersonnelName">
+            <summary>
+            姓名
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.BeginDate">
+            <summary>
+            在科开始时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.EndDate">
+            <summary>
+            在科结束时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.WorkFullDays">
+            <summary>
+            全勤天数
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.AttendanceDays">
+            <summary>
+            出勤天数
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.DeductionDays">
+            <summary>
+            核减天数
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.NoDeductionDays">
+            <summary>
+            不核减天数
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.State">
+            <summary>
+            状态 未确认 = 1,确认 = 2,驳回 = 3
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateUser">
+            <summary>
+            创建用户
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.ConfirmUser">
+            <summary>
+            确定用户
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.ConfirmTime">
+            <summary>
+            确定时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.Remarks">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.Entity.per_attendance_type.IsDeduction">
             <summary>
             是否核减出勤 1 核减 2 不核减

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

 using AutoMapper;
 using Performance.DtoModels.Request;
 using Performance.EntityModels;
+using Performance.EntityModels.Entity;
 using Performance.Infrastructure;
 using System.Linq;
 
@@ -275,7 +276,7 @@ public AutoMapperConfigs()
             CreateMap<cof_workitem, WorkItemRequest>()
                 .ReverseMap();
 
-            CreateMap<cof_again,CofAgainRequest>().ReverseMap();
+            CreateMap<cof_again, CofAgainRequest>().ReverseMap();
         }
     }
 }

performance/Performance.DtoModels/Enum.cs

@@ -117,6 +117,20 @@ public enum Deduction
             核减 = 1,
             不核减 = 2,
         }
+        public enum State
+        {
+            全部 = 0,
+            未确认 = 1,
+            确认 = 2,
+            驳回 = 3,
+        }
+        public enum OperationType
+        {
+            全部 = 0,
+            新增 = 1,
+            修改 = 2,
+            删除 = 3,
+        }
     }
 
     public class SecondAllot

performance/Performance.DtoModels/PerAttendanceIssueDto.cs

+using Performance.EntityModels.Entity;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Performance.DtoModels
+{
+    public class PerAttendanceIssueDto
+    {
+        public PerAttendanceIssueDto()
+        { }
+        public PerAttendanceIssueDto(AttendanceStatistics item)
+        {
+            Code = item.Code;
+            UnitType = item.UnitType;
+            AccountingUnit = item.AccountingUnit;
+            PersonnelNumber = item.PersonnelNumber;
+            PersonnelName = item.PersonnelName;
+            BeginDate = item.BeginDate;
+            EndDate = item.EndDate;
+            DeductionDays = item.Detial.Where(w => !w.Remark.Contains("不核减")).Sum(w => w.Value);
+            NoDeductionDays = item.Detial.Sum(w => w.Value) - item.Detial.Where(w => !w.Remark.Contains("不核减")).Sum(w => w.Value);
+            AttendanceDays = item.AttendanceDays;
+            WorkFullDays = item.AttendanceDays + item.Detial.Where(w => !w.Remark.Contains("不核减")).Sum(w => w.Value);
+            OperationType = (int)Attendance.OperationType.新增;
+            Remarks = "";
+        }
+
+        public PerAttendanceIssueDto(per_attendance_issue item)
+        {
+            Code = item.Code;
+            UnitType = item.UnitType;
+            AccountingUnit = item.AccountingUnit;
+            PersonnelNumber = item.PersonnelNumber;
+            PersonnelName = item.PersonnelName;
+            BeginDate = item.BeginDate;
+            EndDate = item.EndDate;
+            DeductionDays = item.DeductionDays;
+            NoDeductionDays = item.NoDeductionDays;
+            AttendanceDays = item.AttendanceDays;
+            WorkFullDays = item.WorkFullDays;
+            OperationType = (int)Attendance.OperationType.删除;
+            Remarks = "删除数据";
+        }
+
+        //public int HospitalId { get; set; } //医院Id
+        //public int AllotId { get; set; } //绩效Id
+        public string Code { get; set; } //核算单元编码
+        /// <summary>
+        /// 人员类别
+        /// </summary>
+        public string UnitType { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { 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; }
+        /// <summary>
+        /// 全勤天数
+        /// </summary>
+        public int WorkFullDays { get; set; }
+        /// <summary>
+        /// 出勤天数
+        /// </summary>
+        public int AttendanceDays { get; set; }
+        /// <summary>
+        /// 核减天数
+        /// </summary>
+        public int DeductionDays { get; set; }
+        /// <summary>
+        /// 不核减天数
+        /// </summary>
+        public int NoDeductionDays { get; set; }
+        /// <summary>
+        /// 操作类型 新增 = 1, 修改 = 2, 删除 = 3,
+        /// </summary>
+        public int OperationType { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+    }
+}

performance/Performance.DtoModels/Request/AllotDeptRequest.cs

@@ -10,6 +10,8 @@ public class AllotDeptRequest
 
         public int HospitalId { get; set; }
 
+        public string? UnitType { get; set; }
+
         public string Department { get; set; }
     }
 }

performance/Performance.DtoModels/Response/AttendanceAuditDetail.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Performance.DtoModels.Response
+{
+    public class AttendanceAuditDetail
+    {
+
+        /// <summary>
+        /// 考勤结果id(确认or驳回调用)
+        /// </summary>
+        public int AttendanceIsueId { get; set; }
+        /// <summary>
+        /// 绩效Id
+        /// </summary>
+        public int AllotId { get; set; }
+        /// <summary>
+        /// 核算单元编码
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 人员类别
+        /// </summary>
+        public string UnitType { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { 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; }
+        /// <summary>
+        /// 全勤天数
+        /// </summary>
+        public int WorkFullDays { get; set; }
+        /// <summary>
+        /// 出勤天数
+        /// </summary>
+        public int AttendanceDays { get; set; }
+        /// <summary>
+        /// 核减天数
+        /// </summary>
+        public int DeductionDays { get; set; }
+        /// <summary>
+        /// 不核减天数
+        /// </summary>
+        public int NoDeductionDays { get; set; }
+        /// <summary>
+        /// 状态 未确认 = 1,确认 = 2,驳回 = 3
+        /// </summary>
+        public int State { get; set; }
+        /// <summary>
+        /// 确定用户
+        /// </summary>
+        public string ConfirmUser { get; set; }
+        /// <summary>
+        /// 确定时间
+        /// </summary>
+        public DateTime? ConfirmTime { get; set; }
+
+        public List<AttendanceAuditDetails> Detial { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+    }
+    public class AttendanceAuditDetails
+    {
+        /// <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/AttendanceAuditList.cs

+using System;
+
+namespace Performance.DtoModels.Response
+{
+    public class AttendanceAuditList
+    {
+        /// <summary>
+        /// 考勤结果id
+        /// </summary>
+        public int AttendanceIsueId { get; set; }
+        /// <summary>
+        /// 编码
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 核算组别
+        /// </summary>
+        public string UnitType { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+        /// <summary>
+        /// 总下发数
+        /// </summary>
+        public int Count { get; set; }
+        /// <summary>
+        /// 确认数
+        /// </summary>
+        public int ConfirmCount { get; set; }
+        /// <summary>
+        /// 驳回数
+        /// </summary>
+        public int RejectCount { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? OperationTime { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string OperationUser { get; set; }
+        /// <summary>
+        /// 状态 未确认 = 1,确认 = 2,驳回 = 3
+        /// </summary>
+        public int State { get; set; }
+        /// <summary>
+        /// 状态描述
+        /// </summary>
+        public string Remarks { get; set; }
+    }
+}

performance/Performance.DtoModels/Response/AttendanceIssueChoose.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Performance.DtoModels.Response
+{
+    public class AttendanceIssueChoose
+    {
+
+        /// <summary>
+        /// 绩效Id
+        /// </summary>
+        public int AllotId { get; set; }
+
+        /// <summary>
+        /// 删除id
+        /// </summary>
+        public int[] Issueid { get; set; }
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        public Attendance.State state { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+
+    }
+}

performance/Performance.DtoModels/Response/AttendanceStatistics.cs

@@ -5,6 +5,13 @@ namespace Performance.DtoModels
 {
     public class AttendanceStatistics
     {
+        /// <summary>
+        /// 核算单元编码
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
         public int AllotID { get; set; }
         /// <summary>
         /// 核算组别
@@ -36,6 +43,9 @@ public class AttendanceStatistics
         public DateTime EndDate { get; set; }
 
         public List<AttendanceStatisticsDetial> Detial { get; set; }
+        /// <summary>
+        /// 出勤天数
+        /// </summary>
         public int AttendanceDays { get; set; }
 
     }

performance/Performance.DtoModels/Response/UserIdentity.cs

@@ -23,6 +23,10 @@ public class UserIdentity
         /// 用户科室
         /// </summary>
         public string Department { get; set; }
+        /// <summary>
+        /// 核算组别
+        /// </summary>
+        public string UnitType { get; set; }
         public List<HospitalResponse> Hospital { get; set; }
         public List<RoleResponse> Role { get; set; }
         /// <summary>

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -254,6 +254,7 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<sys_user_role> sys_user_role { get; set; }
         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_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

+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
+{
+    [Table("per_attendance_issue")]
+    public class per_attendance_issue
+    {
+        [Key]
+        public int Id { get; set; }
+        /// <summary>
+        /// 医院Id
+        /// </summary>
+        public int HospitalId { get; set; }
+        /// <summary>
+        /// 绩效Id
+        /// </summary>
+        public int AllotId { get; set; }
+        /// <summary>
+        /// 核算单元编码
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 人员类别
+        /// </summary>
+        public string UnitType { get; set; }
+        ///// <summary>
+        ///// 科室名称
+        ///// </summary>
+        //public string Department { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { 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; }
+        /// <summary>
+        /// 全勤天数
+        /// </summary>
+        public int WorkFullDays { get; set; }
+        /// <summary>
+        /// 出勤天数
+        /// </summary>
+        public int AttendanceDays { get; set; }
+        /// <summary>
+        /// 核减天数
+        /// </summary>
+        public int DeductionDays { get; set; }
+        /// <summary>
+        /// 不核减天数
+        /// </summary>
+        public int NoDeductionDays { get; set; }
+        /// <summary>
+        /// 状态 未确认 = 1,确认 = 2,驳回 = 3
+        /// </summary>
+        public int State { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 确定用户
+        /// </summary>
+        public string ConfirmUser { get; set; }
+        /// <summary>
+        /// 确定时间
+        /// </summary>
+        public DateTime? ConfirmTime { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+    }
+}

performance/Performance.Repository/BaseRepository.cs

@@ -68,7 +68,7 @@ public bool Add(TEntity entity)
 
         public bool AddRange(params TEntity[] entities)
         {
-            context.Set<TEntity>().AddRange(entities);
+             context.Set<TEntity>().AddRange(entities);
             return context.SaveChanges() > 0;
         }
 

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/PerforReportRepository .cs

@@ -435,18 +435,18 @@ public List<dynamic> QueryComputeByDateAndTotal(string viewName, HospitalGrantSu
 
             Dictionary<string, List<string>> dict = new Dictionary<string, List<string>>
             {
-                { "view_allot_sign_emp_group", new List<string>{ "hospitalid", "code", "unittype", "accountingunit", "source", "jobnumber", "employeename", "jobtitle", "bankcard", "batch", "jobcategory", "duty", "titleposition" } },
+                { "view_allot_sign_emp_group", new List<string>{ "code",  "hospitalid",  "unittype", "accountingunit", "source", "jobnumber", "employeename", "jobtitle", "bankcard", "batch", "jobcategory", "duty", "titleposition" } },
                 { "view_allot_sign_emp_sum", new List<string>{ "perforsumfee", "performanagementfee", "nightworkperfor", "adjustlaterotherfee", "otherperfor", "hideotherperfor", "shouldgivefee", "reservedratiofee", "realgivefee" } },
 
-                { "view_allot_sign_dept_group", new List<string>{ "hospitalid", "code", "unittype", "accountingunit" } },
+                { "view_allot_sign_dept_group", new List<string>{ "code",  "hospitalid","unittype", "accountingunit" } },
                 { "view_allot_sign_dept_sum", new List<string>{ "perforfee", "workloadfee", "assessbeforeotherfee", "perfortotal", "scoringaverage", "extra", "medicineextra", "materialsextra", "assesslaterotherfee", "assesslaterperfortotal", "adjustfactor", "adjustlaterotherfee", "aprperforamount", "hideaprotherperforamount", "assesslatermanagementfee", "realgivefee" } },
 
-                { "view_allot_sign_emp_finance_group", new List<string>{ "hospitalid", "code", "unittype", "accountingunit","jobnumber", "employeename", } },
+                { "view_allot_sign_emp_finance_group", new List<string>{ "code", "hospitalid", "unittype", "accountingunit","jobnumber", "employeename", } },
                 { "view_allot_sign_emp_finance_sum", new List<string>{ "perforsumfee", "performanagementfee", "nightworkperfor", "adjustlaterotherfee", "otherperfor", "hideotherperfor", "shouldgivefee", "reservedratiofee", "realgivefee" } },
             };
 
-            request.GroupBy.Remove("");
             if (request.SumBy == null || !request.SumBy.Any(t => !string.IsNullOrEmpty(t))) request.SumBy = dict[viewName + "_sum"];
+            if (request.GroupBy == null || !request.GroupBy.Any(t => !string.IsNullOrEmpty(t))) request.GroupBy = dict[viewName + "_group"];
 
             if (request.Search != null && request.Search.Any(w => !string.IsNullOrEmpty(w.Title) && !string.IsNullOrEmpty(w.Value)))
             {

performance/Performance.Repository/Repository/PerforPerAttendanceIssueRepository.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 PerforPerAttendanceIssueRepository : PerforRepository<per_attendance_issue>
+    {
+        /// <summary>
+        /// per_attendance_issue Repository
+        /// </summary>
+        public PerforPerAttendanceIssueRepository(PerformanceDbContext context) : base(context)
+        {
+        }
+    }
+}

performance/Performance.Services/ComputeConfig.cs

@@ -31,8 +31,8 @@ public static List<cof_alias> PerformanceTotal(string route, string[] heads)
         public static List<cof_alias> AllComputeView { get; } = new List<cof_alias>
         {
             new cof_alias{ Alias = "来源", Name = nameof(view_allot_sign_emp.Source), States = 1, SumStatus = 0, Sort = 1 },
+            new cof_alias{ Alias = "核算单元编码", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 1 },
             new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0, Sort = 2 },
-            new cof_alias{ Alias = "核算单元编码", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1, SumStatus = 0, Sort = 3 },
 
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1, SumStatus = 0, Sort = 4 },
@@ -75,8 +75,8 @@ public static List<cof_alias> AllComputeViewByDate
 
         public static List<cof_alias> AllComputePersonView { get; } = new List<cof_alias>
         {
+            new cof_alias{ Alias = "核算单元编码", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 0 },
             new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1, SumStatus = 0, Sort = 1 },
-            new cof_alias{ Alias = "核算单元编码", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1, SumStatus = 0, Sort = 3 },
             new cof_alias{ Alias = "人员姓名", Name = nameof(view_allot_sign_emp.EmployeeName), States = 1, SumStatus = 0, Sort = 4 },
@@ -128,8 +128,8 @@ public static List<cof_alias> AllComputePersonViewByDate
 
         public static List<cof_alias> AllComputeDepartmentView { get; } = new List<cof_alias>
         {
+            new cof_alias{ Alias = "核算单元编码", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 0 },
             new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_dept.UnitType), States = 1, SumStatus = 0, Sort = 1 },
-            new cof_alias{ Alias = "核算单元编码", Name = nameof(view_allot_sign_emp.Code), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_dept.AccountingUnit), States = 1, SumStatus = 0, Sort = 2 },
             new cof_alias{ Alias = "业绩绩效", Name = nameof(view_allot_sign_dept.PerforFee), States = 1, SumStatus = 1, Sort = 3 },
             new cof_alias{ Alias = "工作量绩效", Name = nameof(view_allot_sign_dept.WorkloadFee), States = 1, SumStatus = 1, Sort = 4 },

performance/Performance.Services/SecondAllotService.cs

@@ -892,19 +892,28 @@ public bool DelValue(int secondId, List<ag_fixatitem> oldFixatItems, List<ag_fix
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public List<SecondTempResponse> GetTemp(int hospitalid, string department, int userId)
+        public List<SecondTempResponse> GetTemp(int hospitalid, string unitType, string department, int userId)
         {
             var temps = agtempRepository.GetEntities(t => t.IsEnable == 1);
             if (temps != null && temps.Any())
             {
-                var userCenter = userRepository.GetUser(userId);
-                var unitType = UnitTypeUtil.GetMaps(userCenter?.URole.Type ?? 0);
-                Expression<Func<ag_usetemp, bool>> exp = t => t.HospitalId == hospitalid && t.Department == department;
+                ag_usetemp useTemp = null;
+                if (string.IsNullOrEmpty(unitType))
+                {
+                    var userCenter = userRepository.GetUser(userId);
+                    var unitTypes = UnitTypeUtil.GetMaps(userCenter?.URole.Type ?? 0);
+                    Expression<Func<ag_usetemp, bool>> exp = t => t.HospitalId == hospitalid && t.Department == department;
+
+                    if (userCenter?.URole != null && userCenter.URole.Type.HasValue)
+                        exp = exp.And(t => unitTypes.Contains(t.UnitType));
 
-                if (userCenter?.URole != null && userCenter.URole.Type.HasValue)
-                    exp = exp.And(t => unitType.Contains(t.UnitType));
+                    useTemp = agusetempRepository.GetEntity(exp);
+                }
+                else
+                {
+                    useTemp = agusetempRepository.GetEntity(t => t.HospitalId == hospitalid && t.UnitType == unitType && t.Department == department);
+                }
 
-                var useTemp = agusetempRepository.GetEntity(exp);
                 var secondTemps = _mapper.Map<List<SecondTempResponse>>(temps);
                 if (useTemp != null)
                     secondTemps.ForEach(t => t.IsSelected = t.Id == useTemp.UseTempId);

performance/Performance.Services/UserService.cs

@@ -69,7 +69,7 @@ public UserIdentity Login(LoginRequest request)
             {
                 var user = _userRepository.GetEntity(t => t.Login == request.Account && t.IsDelete == 1);
                 if (user == null)
-                    throw new PerformanceException($"用户不存在 UserId:{request.Account}");
+                    throw new PerformanceException($"“{request.Account}”用户不存在");
                 //MD5小写加密
                 request.Password = PwdHelper.MD5AndSalt(request.Password);