‘考勤管理’考勤记录增 删 改 全删\调动记录增 删 改 全删

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -98,7 +98,7 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
             return _attendanceService.BatchCallIn(allotId, hospitalId, request);
         }
         /// <summary>
-        /// 考勤-调动记录表（单条添加）
+        /// 考勤-调动记录表（添加）
         /// </summary>
         /// <param name="allotId"></param>
         /// <param name="hospitalId"></param>
@@ -107,9 +107,45 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
         [HttpPost("CallIn/Add")]
         public ApiResponse AttendanceAdd(int allotId, int hospitalId, AttendanceData request)
         {
-
             return _attendanceService.AttendanceAdd(allotId, hospitalId, request);
         }
+        /// <summary>
+        /// /考勤-调动记录表（修改）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("CallIn/Update")]
+        public ApiResponse AttendanceUpdate(int allotId, int hospitalId, AttendanceUpdateData request)
+        {
+            return _attendanceService.AttendanceUpdate(allotId, hospitalId, request);
+        }
+        /// <summary>
+        /// 考勤-调动记录表（删除）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
+        /// <param name="attendanceId"></param>
+        /// <returns></returns>
+        [HttpPost("CallIn/Delete")]
+        public ApiResponse AttendanceDelete(int allotId, int hospitalId, int attendanceId)
+        {
+            return _attendanceService.AttendanceDelete(allotId, hospitalId, attendanceId);
+        }
+
+
+        /// <summary>
+        /// 考勤-调动记录表（全部删除）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
+        /// <returns></returns>
+        [HttpPost("CallIn/ClearAll")]
+        public ApiResponse AttendanceClearAll(int allotId, int hospitalId)
+        {
+            return _attendanceService.AttendanceClearAll(allotId, hospitalId);
+        }
         #endregion
 
         #region 考勤类型
@@ -200,6 +236,55 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData
         //    return _attendanceService.AttendanceAdd(allotId, hospitalId, request);
         //}
 
+        /// <summary>
+        /// 考勤-调动记录表（添加）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("Vacation/Add")]
+        public ApiResponse AttendanceVacationAdd(int allotId, int hospitalId, AttendanceData request)
+        {
+            return _attendanceService.AttendanceVacationAdd(allotId, hospitalId, request);
+        }
+        /// <summary>
+        /// /考勤-调动记录表（修改）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("Vacation/Update")]
+        public ApiResponse AttendanceVacationUpdate(int allotId, int hospitalId, AttendanceUpdateData request)
+        {
+            return _attendanceService.AttendanceVacationUpdate(allotId, hospitalId, request);
+        }
+        /// <summary>
+        /// 考勤-调动记录表（删除）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
+        /// <param name="attendanceId"></param>
+        /// <returns></returns>
+        [HttpPost("Vacation/Delete")]
+        public ApiResponse AttendanceVacationDelete(int allotId, int hospitalId, int attendanceId)
+        {
+            return _attendanceService.AttendanceVacationDelete(allotId, hospitalId, attendanceId);
+        }
+
+
+        /// <summary>
+        /// 考勤-调动记录表（全部删除）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="hospitalId"></param>
+        /// <returns></returns>
+        [HttpPost("Vacation/ClearAll")]
+        public ApiResponse AttendanceVacationClearAll(int allotId, int hospitalId)
+        {
+            return _attendanceService.AttendanceVacationClearAll(allotId, hospitalId);
+        }
         #endregion
 
         /// <summary>

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

@@ -324,6 +324,41 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceAdd(System.Int32,System.Int32,Performance.DtoModels.Response.AttendanceData)">
+            <summary>
+            考勤-调动记录表（添加）
+            </summary>
+            <param name="allotId"></param>
+            <param name="hospitalId"></param>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceUpdate(System.Int32,System.Int32,Performance.DtoModels.Response.AttendanceUpdateData)">
+            <summary>
+            /考勤-调动记录表（修改）
+            </summary>
+            <param name="allotId"></param>
+            <param name="hospitalId"></param>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceDelete(System.Int32,System.Int32,System.Int32)">
+            <summary>
+            考勤-调动记录表（删除）
+            </summary>
+            <param name="allotId"></param>
+            <param name="hospitalId"></param>
+            <param name="attendanceId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceClearAll(System.Int32,System.Int32)">
+            <summary>
+            考勤-调动记录表（全部删除）
+            </summary>
+            <param name="allotId"></param>
+            <param name="hospitalId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceType(System.Int32,System.Int32)">
             <summary>
             查询绩效考勤类型

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

@@ -3058,11 +3058,36 @@
             工号
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.Response.AttendanceData.PremanentStaff">
+        <member name="P:Performance.DtoModels.Response.AttendanceData.PersonnelName">
+            <summary>
+            姓名
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceUpdateData.AttendanceId">
+            <summary>
+            拿来修改的id
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceUpdateData.PermanentStaff">
             <summary>
             人员系数
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceUpdateData.CallInUnitType">
+            <summary>
+            人员类别
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceUpdateData.CallInAccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Response.AttendanceUpdateData.CallInDate">
+            <summary>
+            调入时间
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Response.AttendanceIssueChoose.AllotId">
             <summary>
             绩效Id

performance/Performance.DtoModels/Response/AttendanceData.cs

@@ -6,19 +6,40 @@
 
 namespace Performance.DtoModels.Response
 {
-    public class AttendanceData
+    public class AttendanceData : AttendanceUpdateData
     {
         /// <summary>
         /// 工号
         /// </summary>
         public string PersonnelNumber { get; set; }
-        public string PersonnelName { get; set; } //姓名
-        public string CallInUnitType { get; set; } //人员类别
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string PersonnelName { get; set; }
+
+    }
+
+    public class AttendanceUpdateData
+    {
+        /// <summary>
+        /// 拿来修改的id
+        /// </summary>
+        public int AttendanceId { get; set; }
         /// <summary>
         /// 人员系数
         /// </summary>
-        public string PremanentStaff { get; set; }
-        public string CallInAccountingUnit { get; set; } //核算单元
-        public DateTime? CallInDate { get; set; } //调入时间
+        public decimal? PermanentStaff { get; set; }
+        /// <summary>
+        /// 人员类别
+        /// </summary>
+        public string CallInUnitType { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string CallInAccountingUnit { get; set; }
+        /// <summary>
+        /// 调入时间
+        /// </summary>
+        public DateTime? CallInDate { get; set; }
     }
 }

performance/Performance.DtoModels/Response/AttendanceVacationData.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Performance.DtoModels.Response
+{
+    public class AttendanceVacationData : AttendanceVacationUpdateData
+    {
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string PersonnelNumber { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string PersonnelName { get; set; }
+
+    }
+
+    public class AttendanceVacationUpdateData
+    {
+        /// <summary>
+        /// 拿来修改的id
+        /// </summary>
+        public int AttendanceVacationId { get; set; }
+        /// <summary>
+        /// per_attendance_type表中ID
+        /// </summary>
+        public int TypeId { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? BegDate { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime? EndDate { get; set; } 
+    }
+}

performance/Performance.EntityModels/Entity/per_attendance.cs

@@ -20,7 +20,7 @@ public class per_attendance
         /// <summary>
         /// 人员系数
         /// </summary>
-        public string PermanentStaff { get; set; } 
+        public decimal? PermanentStaff { get; set; } 
         public string CallInUnitType { get; set; } //人员类别
         public string CallInAccountingUnit { get; set; } //核算单元
         public DateTime? CallInDate { get; set; } //调入时间

performance/Performance.EntityModels/Other/view_attendance.cs

@@ -12,6 +12,7 @@ public class view_attendance
         public int ALLOTID { get; set; }
         public int YEAR { get; set; }
         public int MONTH { get; set; }
+        public int Id { get; set; } = 0;
         /// <summary>
         /// 人员类别
         /// </summary>

performance/Performance.Services/AttendanceService.cs

@@ -341,11 +341,38 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
         public ApiResponse AttendanceAdd(int allotId, int hospitalId, AttendanceData request)
         {
             var data = mapper.Map<per_attendance>(request);
-            data.AllotId=allotId;
+            data.AllotId = allotId;
             data.HospitalId = hospitalId;
             perforPerAttendanceRepository.Add(data);
             return new ApiResponse(ResponseType.OK);
         }
+
+        public ApiResponse AttendanceUpdate(int allotId, int hospitalId, AttendanceUpdateData request)
+        {
+            var data = perforPerAttendanceRepository.GetEntity(w => w.Id == request.AttendanceId && w.AllotId == allotId && w.HospitalId == hospitalId);
+            if (data==null) throw new PerformanceException("当前调动记录不存在");
+            data.PermanentStaff = request.PermanentStaff;
+            data.CallInUnitType = request.CallInUnitType;
+            data.CallInAccountingUnit=request.CallInAccountingUnit;
+            data.CallInDate = request.CallInDate;
+
+            perforPerAttendanceRepository.Update(data);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        public ApiResponse AttendanceDelete(int allotId, int hospitalId, int attendanceId)
+        {
+            var data = perforPerAttendanceRepository.GetEntity(w => w.Id == attendanceId && w.AllotId == allotId && w.HospitalId == hospitalId);
+            perforPerAttendanceRepository.Remove(data);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        public ApiResponse AttendanceClearAll(int allotId, int hospitalId)
+        {
+            var data = perforPerAttendanceRepository.GetEntities(w => w.AllotId == allotId && w.HospitalId == hospitalId);
+            perforPerAttendanceRepository.RemoveRange(data.ToArray());
+            return new ApiResponse(ResponseType.OK);
+        }
         #endregion
 
         #region 考勤类型
@@ -674,6 +701,42 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData
             return new ApiResponse(ResponseType.OK, "");
 
         }
+
+
+        public ApiResponse AttendanceVacationAdd(int allotId, int hospitalId, AttendanceVacationData request)
+        {
+            var data = mapper.Map<per_attendance_vacation>(request);
+            data.AllotId = allotId;
+            data.HospitalId = hospitalId;
+            perfoPperAttendanceVacationeRepository.Add(data);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        public ApiResponse AttendanceVacationUpdate(int allotId, int hospitalId, AttendanceVacationUpdateData request)
+        {
+            var data = perfoPperAttendanceVacationeRepository.GetEntity(w => w.Id == request.AttendanceVacationId && w.AllotId == allotId && w.HospitalId == hospitalId);
+            if (data == null) throw new PerformanceException("当前调动记录不存在");
+            data.TypeId = request.TypeId;
+            data.BegDate=request.BegDate;
+            data.EndDate=request.EndDate;
+
+            perfoPperAttendanceVacationeRepository.Update(data);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        public ApiResponse AttendanceVacationDelete(int allotId, int hospitalId, int AttendanceVacationId)
+        {
+            var data = perfoPperAttendanceVacationeRepository.GetEntity(w => w.Id == AttendanceVacationId && w.AllotId == allotId && w.HospitalId == hospitalId);
+            perfoPperAttendanceVacationeRepository.Remove(data);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        public ApiResponse AttendanceVacationClearAll(int allotId, int hospitalId)
+        {
+            var data = perfoPperAttendanceVacationeRepository.GetEntities(w => w.AllotId == allotId && w.HospitalId == hospitalId);
+            perfoPperAttendanceVacationeRepository.RemoveRange(data.ToArray());
+            return new ApiResponse(ResponseType.OK);
+        }
         #endregion
 
         public ApiResponse<List<AttendanceStatistics>> GetAttendanceStatistics(int allotId, int userid)