调动记录批量粘贴默认人员系数

performance/Performance.Services/AttendanceService.cs

@@ -214,7 +214,8 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
                 CallInAccountingUnit = w["CallInAccountingUnit"],
                 CallInUnitType = w["CallInUnitType"],
                 CallInDate = ConvertHelper.To<DateTime>(w["CallInDate"]),
-            });
+                PermanentStaff = ConvertHelper.To<decimal?>(w["PermanentStaff"]),
+            }).ToList();
 
             var jsons = JsonHelper.Serialize(convertDicData);
             var newAttendanceVacatione = JsonHelper.Deserialize<List<per_attendance>>(jsons);
@@ -226,13 +227,11 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
 
             var cofaccounting = cofaccountingRepository.GetEntities(ca => ca.AllotId == allotId);
 
-            var per_employee = perforPeremployeeRepository.GetEntities(t => t.AllotId == allotId && t.HospitalId == hospitalId);
-
+            var employees = perforPeremployeeRepository.GetEntities(t => t.AllotId == allotId && t.HospitalId == hospitalId);
             List<Dictionary<string, string>> error = new List<Dictionary<string, string>>();
 
             for (int i = 0; i < newAttendanceVacatione.Count; i++)
             {
-
                 if (string.IsNullOrEmpty(newAttendanceVacatione[i].PersonnelName?.Trim())
                     || string.IsNullOrEmpty(newAttendanceVacatione[i].PersonnelNumber?.Trim())
                     || string.IsNullOrEmpty(newAttendanceVacatione[i].CallInAccountingUnit?.Trim())
@@ -247,6 +246,7 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
                         { "调入核算单元", newAttendanceVacatione[i].CallInAccountingUnit??"" },
                         { "调入组别", newAttendanceVacatione[i].CallInUnitType??"" },
                         { "调入时间", newAttendanceVacatione[i].CallInDate?.ToString("d")??"" },
+                        { "人员系数", newAttendanceVacatione[i].PermanentStaff?.ToString()??"" },
                         { "来源", "粘贴数据" },
                         { "错误原因", "“关键信息缺失”请补全或删除" },
                     });
@@ -264,6 +264,7 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
                             { "调入核算单元", newAttendanceVacatione[i].CallInAccountingUnit??"" },
                             { "调入组别", newAttendanceVacatione[i].CallInUnitType??"" },
                             { "调入时间", newAttendanceVacatione[i].CallInDate?.ToString("d")??"" },
+                            { "人员系数", newAttendanceVacatione[i].PermanentStaff?.ToString()??"" },
                             { "来源", "粘贴数据" },
                             { "错误原因", $"调入时间不在当前绩效月份范围内,已超出{SplitEveryDay(dt.AddDays(-1),newAttendanceVacatione[i].CallInDate.Value).Count-1}天"},
                         });
@@ -280,12 +281,13 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
                         { "调入核算单元", newAttendanceVacatione[i].CallInAccountingUnit??"" },
                         { "调入组别", newAttendanceVacatione[i].CallInUnitType??"" },
                         { "调入时间", newAttendanceVacatione[i].CallInDate?.ToString("d")??"" },
+                        { "人员系数", newAttendanceVacatione[i].PermanentStaff?.ToString()??"" },
                         { "来源", "粘贴数据" },
                         { "错误原因", "该核算单元的调入组别不一致或不存在" },
                     });
                 }
 
-                if (newAttendanceVacatione[i].PersonnelName != per_employee.FirstOrDefault(t => t.PersonnelNumber == newAttendanceVacatione[i].PersonnelNumber && t.AllotId == allotId && t.HospitalId == hospitalId)?.DoctorName)
+                if (newAttendanceVacatione[i].PersonnelName != employees.FirstOrDefault(t => t.PersonnelNumber == newAttendanceVacatione[i].PersonnelNumber && t.AllotId == allotId && t.HospitalId == hospitalId)?.DoctorName)
                 {
                     error.Add(new Dictionary<string, string>
                     {
@@ -295,6 +297,7 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
                         { "调入核算单元", newAttendanceVacatione[i].CallInAccountingUnit??"" },
                         { "调入组别", newAttendanceVacatione[i].CallInUnitType??"" },
                         { "调入时间", newAttendanceVacatione[i].CallInDate?.ToString("d")??"" },
+                        { "人员系数", newAttendanceVacatione[i].PermanentStaff?.ToString()??"" },
                         { "来源", "粘贴数据" },
                         { "错误原因", "该人员与人员字典不一致或不存在" },
                     });
@@ -310,6 +313,7 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
                         { "调入核算单元", newAttendanceVacatione[i].CallInAccountingUnit??"" },
                         { "调入组别", newAttendanceVacatione[i].CallInUnitType??"" },
                         { "调入时间", newAttendanceVacatione[i].CallInDate?.ToString("d")??"" },
+                        { "人员系数", newAttendanceVacatione[i].PermanentStaff?.ToString()??"" },
                         { "来源", "“粘贴数据”与“历史数据”比对" },
                         { "错误原因", $"原名“{oldEmp.PersonnelName}”,工号相同但姓名不同,请删除“历史数据”中该员工" },
                     });
@@ -324,6 +328,9 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
             {
                 data.AllotId = allotId;
                 data.HospitalId = hospitalId;
+                data.PermanentStaff = data.PermanentStaff.HasValue
+                    ? data.PermanentStaff
+                    : employees.FirstOrDefault(w => w.PersonnelNumber == data.PersonnelNumber)?.PermanentStaff;
                 addPer_Attendances.Add(data);
                 var any = oldCallinAttendance.FirstOrDefault(w => w.AllotId == allotId && w.HospitalId == hospitalId && w.CallInDate == data.CallInDate && w.CallInAccountingUnit?.Trim() == data.CallInAccountingUnit?.Trim() && w.CallInUnitType?.Trim() == data.CallInUnitType?.Trim() && w.PersonnelName?.Trim() == data.PersonnelName?.Trim() && w.PersonnelNumber?.Trim() == data.PersonnelNumber?.Trim());
             }