二次绩效录入带出人员信息

performance/Performance.Services/SecondAllotService.cs

@@ -401,12 +401,12 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, int allotId, i
             if (!string.IsNullOrEmpty(empName))
                 employees = employees?.Where(w => w.DoctorName?.Trim() == empName?.Trim()).ToList();
             if (!string.IsNullOrEmpty(jobNumber))
-                employees = employees?.Where(w => !string.IsNullOrEmpty(w.PersonnelNumber) && w.PersonnelNumber == jobNumber.Trim()).ToList();
+                employees = employees?.Where(w => !string.IsNullOrEmpty(w.JobNumber) && w.JobNumber.Trim() == jobNumber.Trim()).ToList();
 
             var second = perforAgsecondallotRepository.GetEntity(t => t.AllotId == allotId);
             var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == allotId && t.Status == 3);
             Func<per_employee, decimal?> getAprAmount = (t) => perapramounts
-                ?.Where(w => w.AccountingUnit?.Trim() == second.Department?.Trim() && w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
+                ?.Where(w => w.AccountingUnit?.Trim() == second.Department?.Trim() && w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.JobNumber?.Trim())
                 ?.Sum(w => w.Amount);
 
             Dictionary<(string, string), Func<per_employee, object>> dict = new Dictionary<(string, string), Func<per_employee, object>>
@@ -1562,7 +1562,7 @@ public List<ag_othersource> OtherAutoComplete(SecondEmpRequest request, int user
             if (!string.IsNullOrEmpty(request.EmployeeName))
                 employees = employees?.Where(w => w.DoctorName?.Trim() == request.EmployeeName?.Trim()).ToList();
             if (!string.IsNullOrEmpty(request.JobNumber))
-                employees = employees?.Where(w => !string.IsNullOrEmpty(w.PersonnelNumber) && w.PersonnelNumber == request.JobNumber.Trim()).ToList();
+                employees = employees?.Where(w => !string.IsNullOrEmpty(w.JobNumber) && w.JobNumber.Trim() == request.JobNumber.Trim()).ToList();
 
             List<ag_othersource> result = employees
                 .Select(t => new ag_othersource
@@ -1846,4 +1846,4 @@ public List<SecondPerforResponse> AddAprAmount(int allotId, List<SecondPerforRes
             return computes;
         }
     }
-}
\ No newline at end of file
+}