bug修复

lixiaojun

2023-12-25 7512fbdf9381039daee307299782c2505e5f9335

bug修复

 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 };
        }


 Yw.Application.Repair.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2023-12-11T01:27:38.5966472Z;True|2023-12-04T18:25:37.5121850+08:00;True|2023-12-04T18:25:32.0321208+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <History>True|2023-12-25T02:02:24.8948808Z;True|2023-12-11T09:27:38.5966472+08:00;True|2023-12-04T18:25:37.5121850+08:00;True|2023-12-04T18:25:32.0321208+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
  </PropertyGroup>
</Project>

 Yw.Application.Repair.Core/Yw.Application.Repair.Core.csproj

@@ -7,7 +7,7 @@
    <RootNamespace>Yw.Application</RootNamespace>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
    <Version>1.0.1</Version>
    <Version>1.0.2</Version>
  </PropertyGroup>

  <ItemGroup>

 Yw.Service.Repair.Core/0-core/Kind.cs

对比新文件
@@ -0,0 +1,29 @@
锘縩amespace Yw.Repair
{
    /// <summary>
    /// 鍦板浘绉嶇被
    /// </summary>
    public class Kind
    {
        /// <summary>
        /// 楂樺痉
        /// </summary>
        public const string Gaodei = "gao-dei";

        /// <summary>
        /// 鐧惧害
        /// </summary>
        public const string Baidu = "bai-du";

        /// <summary>
        /// GIS
        /// </summary>
        public const string GIS = "gis";

        /// <summary>
        /// GPS
        /// </summary>
        public const string GPS = "gps";

    }
}