‘考勤下发’ 添加字段、修改状态、模糊查询

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -371,14 +371,17 @@ public IActionResult DownloadStatistics(int allotId)
         /// <summary>
         /// 科室确认列表
         /// </summary>
-        /// <param name="allotId"></param>
+        /// <param name="allotId">绩效Id</param>
+        /// <param name="unitType">人员类别</param>
+        /// <param name="accountingUnit">核算单元</param>
+        /// <param name="state"> 操作类型  全部=0，未确认 = 1,确认 = 2,驳回 = 3,</param>
         /// <returns></returns>
         [HttpPost]
         [Route("issue/audit/list")]
-        public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
+        public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unitType, string accountingUnit, Attendance.State state)
         {
 
-            return _attendanceService.AuditList(allotId);
+            return _attendanceService.AuditList(allotId, unitType, accountingUnit, state);
         }
 
         /// <summary>
@@ -393,25 +396,23 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
         public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit)
         {
             var userid = claim.GetUserId();
-            unitType = !string.IsNullOrEmpty(unitType) ? unitType : "";
-            accountingUnit = !string.IsNullOrEmpty(accountingUnit) ? accountingUnit : "";
             return _attendanceService.AuditDetail(allotId, unitType, accountingUnit, userid);
         }
 
-         /// <summary>
-         /// 最终考勤结果下发(预确认显示)
-         /// </summary>
-         /// <param name="allotId">绩效Id</param>
-         /// <param name="unitType">人员类别</param>
-         /// <param name="accountingUnit">核算单元</param>
-         /// <param name="state"> 操作类型 新增 = 1, 修改 = 2, 删除 = 3,</param>
-         /// <returns></returns>
+        /// <summary>
+        /// 最终考勤结果下发(预确认显示)
+        /// </summary>
+        /// <param name="allotId">绩效Id</param>
+        /// <param name="unitType">人员类别</param>
+        /// <param name="accountingUnit">核算单元</param>
+        /// <param name="state"> 操作类型 新增 = 1, 修改 = 2, 删除 = 3,</param>
+        /// <returns></returns>
         [HttpPost]
         [Route("issue/check")]
         public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, string unitType, string accountingUnit, Attendance.OperationType state)
         {
             var userid = claim.GetUserId();
-            return _attendanceService.PreConfirmationDisplay(allotId, userid, unitType, accountingUnit,state);
+            return _attendanceService.PreConfirmationDisplay(allotId, userid, unitType, accountingUnit, state);
         }
 
         /// <summary>
@@ -437,14 +438,28 @@ public ApiResponse IssueStatistics(int allotId)
         /// <returns></returns>
         [HttpPost]
         [Route("issue/choose")]
-        public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state, string remarks)
+        public ApiResponse ChooseStatistics(AttendanceIssueChoose attendanceIssueChoose)
         {
             var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
-            return _attendanceService.ChooseStatistics(allotId, issueid, state, realName, remarks);
+            return _attendanceService.ChooseStatistics(attendanceIssueChoose, realName);
         }
-        #endregion
 
 
 
+        ///// <summary>
+        ///// 最终考勤结果驳回或确认无误((批量操作)
+        ///// </summary>
+        ///// <param name="allotId"></param>
+        ///// <param name="issueid">选择id</param>
+        ///// <param name="state">操作类型 确认 = 2,驳回 = 3,</param>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[Route("issue/choose")]
+        //public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state, string remarks)
+        //{
+        //    var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
+        //    return _attendanceService.ChooseStatistics(allotId, issueid, state, realName, remarks);
+        //}
+        #endregion
     }
 }
\ No newline at end of file

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

@@ -413,11 +413,14 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.AuditList(System.Int32)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.AuditList(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.State)">
             <summary>
             科室确认列表
             </summary>
-            <param name="allotId"></param>
+            <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)">
@@ -446,7 +449,7 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.ChooseStatistics(System.Int32,System.Int32[],Performance.DtoModels.Attendance.State,System.String)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.ChooseStatistics(Performance.DtoModels.Response.AttendanceIssueChoose)">
             <summary>
             最终考勤结果驳回或确认无误((批量操作)
             </summary>

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

@@ -262,6 +262,11 @@
             核算单元
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerAttendanceIssueDto.Department">
+            <summary>
+            科室名称
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerAttendanceIssueDto.PersonnelNumber">
             <summary>
             工号
@@ -2898,6 +2903,11 @@
             科室
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.AttendanceIsueId">
+            <summary>
+            考勤结果id(确认or驳回调用)
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.AllotId">
             <summary>
             绩效Id
@@ -2918,6 +2928,11 @@
             核算单元
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.Department">
+            <summary>
+            科室名称
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.PersonnelNumber">
             <summary>
             工号
@@ -2993,6 +3008,11 @@
             备注
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditList.AttendanceIsueId">
+            <summary>
+            考勤结果id
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Response.AttendanceAuditList.Code">
             <summary>
             编码
@@ -3033,11 +3053,36 @@
             操作人
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.Response.AttendanceAuditList.StateRemark">
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditList.State">
+            <summary>
+            状态 未确认 = 1,确认 = 2,驳回 = 3
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceAuditList.Remarks">
             <summary>
             状态描述
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceIssueChoose.AllotId">
+            <summary>
+            绩效Id
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceIssueChoose.Issueid">
+            <summary>
+            删除id
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceIssueChoose.state">
+            <summary>
+            操作类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceIssueChoose.Remarks">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Response.CollectPermission.HeadName">
             <summary>
             列头名称

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

@@ -6138,6 +6138,11 @@
             人员类别
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.Department">
+            <summary>
+            科室名称
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.Entity.per_attendance_issue.AccountingUnit">
             <summary>
             核算单元

performance/Performance.DtoModels/Enum.cs

@@ -119,6 +119,7 @@ public enum Deduction
         }
         public enum State
         {
+            全部 = 0,
             未确认 = 1,
             确认 = 2,
             驳回 = 3,

performance/Performance.DtoModels/PerAttendanceIssueDto.cs

@@ -16,6 +16,7 @@ public PerAttendanceIssueDto(AttendanceStatistics item)
         {
             UnitType = item.UnitType;
             AccountingUnit = item.AccountingUnit;
+            Department = item.Department;
             PersonnelNumber = item.PersonnelNumber;
             PersonnelName = item.PersonnelName;
             BeginDate = item.BeginDate;
@@ -32,6 +33,7 @@ public PerAttendanceIssueDto(per_attendance_issue item)
         {
             UnitType = item.UnitType;
             AccountingUnit = item.AccountingUnit;
+            Department = item.Department;
             PersonnelNumber = item.PersonnelNumber;
             PersonnelName = item.PersonnelName;
             BeginDate = item.BeginDate;
@@ -56,6 +58,10 @@ public PerAttendanceIssueDto(per_attendance_issue item)
         /// </summary>
         public string AccountingUnit { get; set; }
         /// <summary>
+        /// 科室名称
+        /// </summary>
+        public string Department { get; set; }
+        /// <summary>
         /// 工号
         /// </summary>
         public string PersonnelNumber { get; set; }

performance/Performance.DtoModels/Response/AttendanceAuditDetail.cs

@@ -8,6 +8,11 @@ namespace Performance.DtoModels.Response
 {
     public class AttendanceAuditDetail
     {
+
+        /// <summary>
+        /// 考勤结果id(确认or驳回调用)
+        /// </summary>
+        public int AttendanceIsueId { get; set; }
         /// <summary>
         /// 绩效Id
         /// </summary>
@@ -25,6 +30,10 @@ public class AttendanceAuditDetail
         /// </summary>
         public string AccountingUnit { get; set; }
         /// <summary>
+        /// 科室名称
+        /// </summary>
+        public string Department { get; set; }
+        /// <summary>
         /// 工号
         /// </summary>
         public string PersonnelNumber { get; set; }

performance/Performance.DtoModels/Response/AttendanceAuditList.cs

@@ -5,6 +5,10 @@ namespace Performance.DtoModels.Response
     public class AttendanceAuditList
     {
         /// <summary>
+        /// 考勤结果id
+        /// </summary>
+        public int AttendanceIsueId { get; set; }
+        /// <summary>
         /// 编码
         /// </summary>
         public string Code { get; set; }
@@ -37,8 +41,12 @@ public class AttendanceAuditList
         /// </summary>
         public string OperationUser { get; set; }
         /// <summary>
+        /// 状态 未确认 = 1,确认 = 2,驳回 = 3
+        /// </summary>
+        public int State { get; set; }
+        /// <summary>
         /// 状态描述
         /// </summary>
-        public string StateRemark { get; set; }
+        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.EntityModels/Entity/per_attendance_issue.cs

@@ -30,6 +30,10 @@ public class per_attendance_issue
         /// </summary>
         public string UnitType { get; set; }
         /// <summary>
+        /// 科室名称
+        /// </summary>
+        public string Department { get; set; }
+        /// <summary>
         /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }

performance/Performance.Services/AttendanceService.cs

@@ -764,9 +764,15 @@ public ApiResponse<List<AttendanceStatistics>> GetAttendanceStatistics(int allot
         }
         #region 考勤下发
 
-        public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
+        public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unitType, string accountingUnit, Attendance.State state)
         {
             var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId);
+            if (!string.IsNullOrEmpty(unitType))
+                issues = issues.Where(w => w.UnitType.Contains(unitType)).ToList();
+            if (!string.IsNullOrEmpty(accountingUnit))
+                issues = issues.Where(w => w.AccountingUnit.Contains(accountingUnit)).ToList();
+            if ((int)state == (int)Attendance.State.确认 || (int)state == (int)Attendance.State.未确认 || (int)state == (int)Attendance.State.驳回)
+                issues = issues.Where(w => w.State == (int)state).ToList();
             var items = issues.GroupBy(w => new { w.Code, w.UnitType, w.AccountingUnit })
                 .Select(w => new AttendanceAuditList
                 {
@@ -778,36 +784,39 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
                     RejectCount = w.Count(p => p.State == (int)Attendance.State.驳回),
                     OperationUser = w.OrderByDescending(o => o.UpdateTime).Select(s => s.UpdateUser).FirstOrDefault(),
                     OperationTime = w.OrderByDescending(o => o.UpdateTime).Select(s => s.UpdateTime).FirstOrDefault(),
+                    Remarks = string.Join('；', w.Select(p => p.Remarks).Distinct()),
                 }).ToList();
 
 
             foreach (var item in items)
             {
-                item.StateRemark = "未确认";
+                item.State = (int)Attendance.State.未确认;
                 if (item.RejectCount > 0)
-                    item.StateRemark = "驳回";
+                    item.State = (int)Attendance.State.驳回;
                 else if (item.ConfirmCount == item.Count)
-                    item.StateRemark = "已确认";
+                    item.State = (int)Attendance.State.确认;
             }
 
             return new ApiResponse<List<AttendanceAuditList>>(ResponseType.OK, items);
         }
 
-        public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit, int userid,string aaa = "")
+        public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit, int userid)
         {
             var types = perfoPperAttendanceTypeRepository.GetEntities(t => t.AllotId == allotId) ?? new List<per_attendance_type>();
             var vacationeData = perfoPperAttendanceVacationeRepository.GetEntities(t => t.AllotId == allotId) ?? new List<per_attendance_vacation>();
             var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId).ToList();
             if (!string.IsNullOrEmpty(unitType))
-                issues = issues.Where(w => w.UnitType == unitType).ToList();
+                issues = issues.Where(w => w.UnitType.Contains(unitType)).ToList();
             if (!string.IsNullOrEmpty(accountingUnit))
-                issues = issues.Where(w => w.AccountingUnit == accountingUnit).ToList();
+                issues = issues.Where(w => w.AccountingUnit.Contains(accountingUnit)).ToList();
             var items = issues.Select(w => new AttendanceAuditDetail
             {
+                AttendanceIsueId=w.Id,
                 AllotId = w.AllotId,
                 Code = w.Code,
                 UnitType = w.UnitType,
                 AccountingUnit = w.AccountingUnit,
+                Department = w.Department,
                 PersonnelName = w.PersonnelName,
                 PersonnelNumber = w.PersonnelNumber,
                 BeginDate = w.BeginDate,
@@ -883,6 +892,7 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot
                     result =
                     issue.UnitType == statistic.UnitType &&
                     issue.AccountingUnit == statistic.AccountingUnit &&
+                    issue.Department == statistic.Department &&
                     issue.BeginDate == statistic.BeginDate &&
                     issue.EndDate == statistic.EndDate &&
                     issue.AttendanceDays == statistic.AttendanceDays &&
@@ -911,23 +921,25 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot
             }
 
             if (!string.IsNullOrEmpty(unitType))
-                issuedates = issuedates.Where(w => w.UnitType == unitType).ToList();
+                issuedates = issuedates.Where(w => w.UnitType.Contains(unitType)).ToList();
             if (!string.IsNullOrEmpty(accountingUnit))
-                issuedates = issuedates.Where(w => w.AccountingUnit == accountingUnit).ToList();
-            if ((int)state==(int)Attendance.OperationType.新增|| (int)state == (int)Attendance.OperationType.修改|| (int)state == (int)Attendance.OperationType.删除)
+                issuedates = issuedates.Where(w => w.AccountingUnit.Contains(accountingUnit)).ToList();
+            if ((int)state == (int)Attendance.OperationType.新增 || (int)state == (int)Attendance.OperationType.修改 || (int)state == (int)Attendance.OperationType.删除)
                 issuedates = issuedates.Where(w => w.OperationType == (int)state).ToList();
             return new ApiResponse<List<PerAttendanceIssueDto>>(ResponseType.OK, issuedates);
         }
 
 
         //下发
-        public ApiResponse IssueStatistics(int allotId, int userid, string realName, string unitType="", string accountingUnit="", Attendance.OperationType state = 0)
+        public ApiResponse IssueStatistics(int allotId, int userid, string realName, string unitType = "", string accountingUnit = "", Attendance.OperationType state = 0)
         {
             var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId);
             if (allot == null)
                 throw new PerformanceException("当前绩效记录不存在");
 
             var preConfirmationDisplay = PreConfirmationDisplay(allotId, userid, unitType, accountingUnit, state).Data;
+            if (preConfirmationDisplay == null)
+                return new ApiResponse(ResponseType.NotFound, "暂无下发数据");
             var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId);
             var cofaccounting = cofaccountingRepository.GetEntities(g => g.AllotId == allotId);
             var insertIssues = preConfirmationDisplay.Where(w => w.OperationType == (int)Attendance.OperationType.新增).ToList();
@@ -945,6 +957,7 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str
                         Code = code == null ? "" : code.Code,
                         UnitType = item.UnitType,
                         AccountingUnit = item.AccountingUnit,
+                        Department = item.Department,
                         PersonnelNumber = item.PersonnelNumber,
                         PersonnelName = item.PersonnelName,
                         BeginDate = item.BeginDate,
@@ -971,6 +984,7 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str
                     var issuePersonnel = issues.FirstOrDefault(w => w.PersonnelNumber == item.PersonnelNumber);
                     issuePersonnel.UnitType = item.UnitType;
                     issuePersonnel.AccountingUnit = item.AccountingUnit;
+                    issuePersonnel.Department = item.Department;
                     issuePersonnel.Code = code == null ? "" : code.Code;
                     issuePersonnel.BeginDate = item.BeginDate;
                     issuePersonnel.EndDate = item.EndDate;
@@ -996,15 +1010,15 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str
             return new ApiResponse(ResponseType.OK, "下发成功");
         }
 
-        public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state, string realName, string remarks)
+        public ApiResponse ChooseStatistics(AttendanceIssueChoose attendanceIssueChoose,string realName)
         {
-            var issuedates = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId && issueid.Contains(w.Id)).ToList();
+            var issuedates = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == attendanceIssueChoose.AllotId && attendanceIssueChoose.Issueid.Contains(w.Id)).ToList();
             foreach (var item in issuedates)
             {
-                item.State = (int)state;
+                item.State = (int)attendanceIssueChoose.state;
                 item.UpdateUser = realName;
                 item.UpdateTime = DateTime.Now;
-                item.Remarks = remarks;
+                item.Remarks = attendanceIssueChoose.Remarks;
             }
             perforPerAttendanceIssueRepository.UpdateRange(issuedates.ToArray());
             return new ApiResponse(ResponseType.OK);