chenwei
/
lanlingxian_ziranziyuanheguihua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://123.132.248.154:10000/chenwei/lanlingxian_ziranziyuanheguihua into dev

dev
洁 任 2025-12-17 15:51:58 +08:00
parent a8321bdb9a fb00f42dbe
commit 97b0328c08
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -412,3 +412,4 @@ FodyWeavers.xsd
# Built Visual Studio Code Extensions # Built Visual Studio Code Extensions
*.vsix *.vsix
*.xml

2
OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs
View File

@ -41,7 +41,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
//org = UnitWork.Db.Queryable<SysOrg>().Where(a => a.Level == 2 && a.ParentId == 371324).ToList(); //org = UnitWork.Db.Queryable<SysOrg>().Where(a => a.Level == 2 && a.ParentId == 371324).ToList();
if (orgIds.Any(r => r.Level == 1) || user.Id == -1) // 查询全部 if (orgIds.Any(r => r.Level == 1) || user.Id == -1) // 查询全部
{ {
org = Repository.ChangeRepository<SugarRepositiry<SysOrg>>().AsQueryable().Where(r => r.Level == 2 && r.ParentId == 371325).ToList(); org = Repository.ChangeRepository<SugarRepositiry<SysOrg>>().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(); caseList = Repository.AsQueryable().WhereIF(!string.IsNullOrEmpty(xiangmu_yt), (a) => a.xiangmu_yt == xiangmu_yt).ToList();
} }
else if (orgIds.Any(r => r.Level == 2)) else if (orgIds.Any(r => r.Level == 2))

7
OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs
View File

@ -363,8 +363,9 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
List<string> headers = null; List<string> headers = null;
headers = new List<string> headers = new List<string>
{ {
"项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地", //"项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地",
"辅助设施用地", "下发时间", "项目状态" //"辅助设施用地", "下发时间", "项目状态"
"项目编号", "项目名称", "乡镇", "村庄", "权利人", "联系方式","行政区划", "备案编号","备案日期","项目状态", "项目开始时间", "项目结束时间", "设施农业类型","建筑结构", "设施农业申请用地面积(公顷)", "生产设施用地(公顷)", "辅助设施用地(公顷)"
}; };
var response = droneSsnyApp.TimeoutWarningExport(import.xiangmumc, import.countyid, import.streetid, var response = droneSsnyApp.TimeoutWarningExport(import.xiangmumc, import.countyid, import.streetid,
import.xiangmuno, import.xiangmuyt); import.xiangmuno, import.xiangmuyt);
@ -380,7 +381,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
else else
{ {
data.Code = excelRes.Code; data.Code = excelRes.Code;
data.Message = "导出失败"; data.Message = excelRes.Message;
} }
} }
else else

2
OpenAuth.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml
View File

@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>E:\02 FileSystem\9020_临沂天空地\9027_临沂_IIS</PublishUrl> <PublishUrl>D:\release\批后监管</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId> <_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />