修复维修模块文件url bug

lixiaojun

2022-08-08 98ea943381a640c9d90935cbe029cc7caf052691

修复维修模块文件url bug

 Application/IStation.Application4Repair/repair_request_form/_/RepairRequestForm_Controller.cs

@@ -30,7 +30,7 @@
        }

        /// <summary>
        /// æ’入一条 
        /// æ’入一条 (同时上传一个或多个文件)
        /// </summary>
        [Route("Insert@V1.0")]
        [HttpPost]
@@ -164,11 +164,11 @@
        }

        /// <summary>
        /// é€šè¿‡ ID èŽ·å–详细 
        /// é€šè¿‡ ID èŽ·å–详细 ï¼ˆæ–‡ä»¶url采用全路径 ä½¿ç”¨ip+port访问正常，用域名访问会有问题）
        /// </summary>
        [Route("GetDetailByID@V1.0")]
        [HttpGet]
        public RepairRequestFormDetailDto GetDetailByID([FromQuery][Required] IDUnderCorpInput input)
        public RepairRequestFormDetailDto GetDetailByID_V1_0([FromQuery][Required] IDUnderCorpInput input)
        {
            var model = new Service.RepairRequestForm().GetByID(input.CorpID, input.ID);
            if (model == null)
@@ -191,7 +191,32 @@
            return vm;
        }

        
        /// <summary>
        /// é€šè¿‡ ID èŽ·å–详细 ï¼ˆæ–‡ä»¶url去除前缀）
        /// </summary>
        [Route("GetDetailByID@V1.1")]
        [HttpGet]
        public RepairRequestFormDetailDto GetDetailByID_V1_1([FromQuery][Required] IDUnderCorpInput input)
        {
            var model = new Service.RepairRequestForm().GetByID(input.CorpID, input.ID);
            if (model == null)
                return default;
            var product = new Service.Product().GetByID(input.CorpID, model.ProductID);
            var vm = new RepairRequestFormDetailDto(model, product);
            var fileList = new Service.RepairRequestFile().GetByFormID(input.CorpID, model.ID);
            if (fileList != null && fileList.Count > 0)
            {
                var vmFileList = new List<RepairRequestFileDetailDto>();
                foreach (var file in fileList)
                {
                    var vmFile = new RepairRequestFileDetailDto(file);
                    vmFileList.Add(vmFile);
                }
                vm.FileList = vmFileList;
            }

            return vm;
        }




 Application/IStation.Application4Repair/repair_request_form/_/dto/detail/RepairRequestFileDetailDto.cs

ÎļþÃû´Ó Application/IStation.Application4Repair/repair_request_form/_/dto/RepairRequestFileDetailDto.cs ÐÞ¸Ä
@@ -20,7 +20,7 @@
        /// <summary>
        /// 
        /// </summary>
        public RepairRequestFileDetailDto(Model.RepairRequestFile rhs, string storageUrl = null)
        public RepairRequestFileDetailDto(Model.RepairRequestFile rhs)
        {
            this.ID = rhs.ID;
            this.CorpID = rhs.CorpID;
@@ -32,6 +32,14 @@
            this.StorageCode = rhs.StorageCode;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse,rhs.StorageCode);
        }

        /// <summary>
        /// 
        /// </summary>
        public RepairRequestFileDetailDto(Model.RepairRequestFile rhs, string storageUrl = null):this(rhs)
        {
            this.StorageUrl = storageUrl;
        }


 Application/IStation.Application4Repair/repair_request_form/_/dto/detail/RepairRequestFormDetailDto.cs

 Application/IStation.Application4Repair/repair_request_form/_/dto/insert/AddRepairRequestFormInput.cs

 Application/IStation.Application4Repair/repair_request_form/_/dto/just_accepted/GetRepairRequestFormJustAcceptedPageListInput.cs

 Application/IStation.Application4Repair/repair_request_form/_/dto/just_accepted/RepairRequestFormJustAcceptedDto.cs

 Application/IStation.Application4Repair/repair_request_form/_/dto/page/GetRepairRequestFormPageListInput.cs

 Application/IStation.Application4Repair/repair_request_form/_/dto/page/RepairRequestFormDto.cs

 Application/IStation.Application4Repair/repair_request_form/_/dto/pending/GetRepairRequestFormPendingPageListInput.cs

 Application/IStation.Application4Repair/repair_request_form/_/dto/reject/RepairRequestRejectInput.cs

 Application/IStation.Application4Repair/repair_request_form/mobile/RepairRequestForm_MobileController.cs

@@ -99,6 +99,7 @@
            var bol= service.Inserts(fileList);
            return bol;
        } 

        #endregion

        /// <summary>
@@ -284,7 +285,6 @@
            var vm = new MyRepairRequestFormAcceptedDetailMobileDto(model,product,logList,fileList,taskForm,taskLogList,taskLogFileList);
            return vm;
        }


        #endregion


 Application/IStation.Application4Repair/repair_request_form/mobile/dto/accepted/MyRepairRequestFileAcceptedMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_request_form/mobile/dto/accepted/MyRepairRequestTaskLogFileAcceptedMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/_/dto/detail/RepairTaskLogFileDetailDto.cs

@@ -34,7 +34,7 @@
            this.SortCode= rhs.SortCode;
            this.Description= rhs.Description;

            this.StorageUrl=$"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl= FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/_/dto/detail/RepairTaskRequestFileDetailDto.cs

@@ -32,7 +32,7 @@
            this.StorageCode = rhs.StorageCode;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/mobile/dto/assigned/MyRepairTaskLogFileAssignedMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/mobile/dto/assigned/MyRepairTaskRequestFileAssignedMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/mobile/dto/has_finished/MyRepairTaskLogFileHasFinishedMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/mobile/dto/has_finished/MyRepairTaskRequestFileHasFinishedMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/mobile/dto/progress/MyRepairTaskLogFileProgressMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>

 Application/IStation.Application4Repair/repair_task_form/mobile/dto/progress/MyRepairTaskRequestFileProgressMobileDto.cs

@@ -26,7 +26,7 @@
            this.FileFormat = rhs.FileFormat;
            this.FileName = rhs.FileName;
            this.FileSuffix = rhs.FileSuffix;
            this.StorageUrl = $"{FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode)}";
            this.StorageUrl = FileHelper.GetRelatedFilePath(rhs.StorageHouse, rhs.StorageCode);
        }

        /// <summary>