From 5bdb88a4748f20a4396d0e4598b994b37df3310a Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Mon, 3 Nov 2025 15:51:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) 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 From 0caff4662850e43ed00164238c5a28e9eb44a343 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Mon, 3 Nov 2025 15:52:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ServiceControllers/DroneSsnyController.cs | 7 ++++--- .../Properties/PublishProfiles/FolderProfile1.pubxml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs index a9b9432..50167ea 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 From fb00f42dbe6480c4bb4e018f4c0594f30d8ffdf0 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Tue, 4 Nov 2025 11:14:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=B3=E4=B8=9C?= =?UTF-8?q?=E5=8C=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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))