diff --git a/.gitignore b/.gitignore index d5dca0c..e942dd6 100644 --- a/.gitignore +++ b/.gitignore @@ -412,3 +412,4 @@ FodyWeavers.xsd # Built Visual Studio Code Extensions *.vsix +*.xml diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs index ee3390c..d237e57 100644 --- a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs @@ -41,7 +41,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage //org = UnitWork.Db.Queryable().Where(a => a.Level == 2 && a.ParentId == 371324).ToList(); if (orgIds.Any(r => r.Level == 1) || user.Id == -1) // 查询全部 { - org = Repository.ChangeRepository>().AsQueryable().Where(r => r.Level == 2 && r.ParentId == 371325).ToList(); + org = Repository.ChangeRepository>().AsQueryable().Where(r => r.Level == 2 && r.ParentId == 371312).ToList(); caseList = Repository.AsQueryable().WhereIF(!string.IsNullOrEmpty(xiangmu_yt), (a) => a.xiangmu_yt == xiangmu_yt).ToList(); } else if (orgIds.Any(r => r.Level == 2)) diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs index 59441ff..cac897f 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs @@ -363,8 +363,9 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers List headers = null; headers = new List { - "项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地", - "辅助设施用地", "下发时间", "项目状态" + //"项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地", + //"辅助设施用地", "下发时间", "项目状态" + "项目编号", "项目名称", "乡镇", "村庄", "权利人", "联系方式","行政区划", "备案编号","备案日期","项目状态", "项目开始时间", "项目结束时间", "设施农业类型","建筑结构", "设施农业申请用地面积(公顷)", "生产设施用地(公顷)", "辅助设施用地(公顷)" }; var response = droneSsnyApp.TimeoutWarningExport(import.xiangmumc, import.countyid, import.streetid, import.xiangmuno, import.xiangmuyt); @@ -380,7 +381,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers else { data.Code = excelRes.Code; - data.Message = "导出失败"; + data.Message = excelRes.Message; } } else diff --git a/OpenAuth.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml b/OpenAuth.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml index 84af8d1..1e3b8bb 100644 --- a/OpenAuth.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml +++ b/OpenAuth.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml @@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU FileSystem - E:\02 FileSystem\9020_临沂天空地\9027_临沂_IIS + D:\release\批后监管 FileSystem <_TargetId>Folder