引用升级

lixiaojun

2024-01-22 55b866eab47211e11ad8801a42484af81ed0afab

 Yw.Application.Repair.Core/2-task-form/1-mgr/RepairTaskForm_Controller.cs

@@ -377,7 +377,18 @@
            int total = 0;
            var list = new Service.RepairTaskForm().GetProgressPageList
                (null, UserManager.UserID, null, null, input.StartTime, input.EndTime, input.PageIndex, input.PageSize, ref total);
            var vmList = list?.Select(x => new MyRepairTaskFormProgressDto(x.Item1)).ToList();
            var vmList = new List<MyRepairTaskFormProgressDto>();
            if (list != null && list.Count > 0)
            {
                var service_equipment = new Yw.Service.Equipment();
                foreach (var item in list)
                {
                    var equipment = service_equipment.GetByID(item.Item1.EquipmentID);
                    var vm = new MyRepairTaskFormProgressDto(item.Item1, equipment);
                    vmList.Add(vm);
                }
            }

            return new PageListOutput<MyRepairTaskFormProgressDto>() { Total = total, List = vmList };
        }

@@ -391,7 +402,17 @@
            int total = 0;
            var list = new Service.RepairTaskForm().GetHasFinishedPageList
                (null, UserManager.UserID, null, null, input.StartTime, input.EndTime, input.PageIndex, input.PageSize, ref total);
            var vmList = list?.Select(x => new MyRepairTaskFormHasFinishedDto(x.Item1)).ToList();
            var vmList = new List<MyRepairTaskFormHasFinishedDto>();
            if (list != null && list.Count > 0)
            {
                var service_equipment = new Yw.Service.Equipment();
                foreach (var item in list)
                {
                    var equipment = service_equipment.GetByID(item.Item1.EquipmentID);
                    var vm = new MyRepairTaskFormHasFinishedDto(item.Item1, equipment);
                    vmList.Add(vm);
                }
            }
            return new PageListOutput<MyRepairTaskFormHasFinishedDto>() { Total = total, List = vmList };
        }