admin科室数据带出、数据录入4.1显示、二次绩效按照工号排序

performance/Performance.DtoModels/HandsonTable.cs

@@ -40,6 +40,8 @@ public void SetRowData(IEnumerable<HandsonRowData> datas, bool isTypein)
                         dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
                     else if (dic.ContainsKey(item.Name.ToLower()) && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower() && w.AttachLast > 0))
                         dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
+                    else if (dic.ContainsKey(item.Name.ToLower()) && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower()))
+                        dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
                 }
                 _data.Add(dic);
             }

performance/Performance.Services/CollectService.cs

@@ -220,7 +220,7 @@ private IEnumerable<collect_permission> GetCollectSheetByAllot(int hospitalId, i
             var types = new[] { (int)SheetType.Employee, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload,
                 (int)SheetType.ClinicEmployee, (int)SheetType.AccountExtra, (int)SheetType.PersonExtra, (int)SheetType.LogisticsEmployee,
                 (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess, (int)SheetType.AccountScoreAverage,
-                (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee };
+                (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee,(int)SheetType.AccountBasic };
 
             var sheets = perforPersheetRepository.GetEntities(w => w.AllotID == allot.ID && types.Contains((w.SheetType ?? 0)));
             var headers = perforImheaderRepository.GetEntities(w => w.AllotID == allot.ID);
@@ -295,7 +295,7 @@ public HandsonTable GetCollectData(int userId, int allotId, string sheetName)
             var types = new[] { (int)SheetType.Employee, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload,
                 (int)SheetType.ClinicEmployee, (int)SheetType.AccountExtra, (int)SheetType.PersonExtra, (int)SheetType.LogisticsEmployee,
                 (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess, (int)SheetType.AccountScoreAverage,
-                (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee };
+                (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee,(int)SheetType.AccountBasic};
 
             var sheet = perforPersheetRepository
                 .GetEntity(w => w.AllotID == allot.ID && w.SheetName == sheetName && types.Contains((w.SheetType ?? 0)));

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -598,14 +598,15 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                 // 如果已经保存>>走保存加载逻辑
                 if (employeeSource == (int)EmployeeSource.Initial)
                 {
-                    result = savedDataList.OrderBy(t => t.Id).ToList();
+                    result = savedDataList.OrderBy(t => t.WorkNumber).ToList();
                 }
                 // 如果没保存>>走加载im_employee_logistics人员名单逻辑
                 else
                 {
                     var types = new string[] { "行政后勤", "行政工勤" };
                     var logistics = _imemployeelogisticsRepository.GetEntities(w => w.AllotID == secondAllot.AllotId && types.Contains(w.AccountType) && w.AccountingUnit == secondAllot.Department);
-                    result = (logistics ?? new List<im_employee_logistics>()).Select(w => new ag_othersource
+                    result = (logistics ?? new List<im_employee_logistics>())
+                        .OrderBy(t=>t.PersonnelNumber).Select(w => new ag_othersource
                     {
                         SecondId = secondId,
                         WorkNumber = w.PersonnelNumber,
@@ -621,12 +622,12 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                 switch (employeeSource)
                 {
                     case (int)EmployeeSource.Initial:
-                        result = savedDataList.OrderBy(t => t.Id).ToList();
+                        result = savedDataList.OrderBy(t => t.WorkNumber).ToList();
                         break;
 
                     case (int)EmployeeSource.EmployeeDict:
                         if (employees == null || !employees.Any()) return new List<ag_othersource>();
-                        result = employees.Select(t => new ag_othersource
+                        result = employees.OrderBy(t=>t.PersonnelNumber).Select(t => new ag_othersource
                         {
                             SecondId = secondId,
                             WorkNumber = t.PersonnelNumber,
@@ -641,7 +642,7 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                         isSupplementTitlePerformance = prevSavedDataList == null || !prevSavedDataList.Any();
                         if (prevSavedDataList != null && prevSavedDataList.Any())
                         {
-                            result = prevSavedDataList.OrderBy(t => t.Id)
+                            result = prevSavedDataList.OrderBy(t => t.WorkNumber)
                                 .Select(t => new ag_othersource
                                 {
                                     SecondId = secondId,