lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口修改

This commit is contained in:
李鹏飞 2024-09-05 14:09:24 +08:00
parent 18e0e3f05b
commit ecd1689d52
8 changed files with 231 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo
View File

Binary file not shown.

24
SGGL/BLL/API/APIBaseInfoService.cs
View File

@ -71,6 +71,30 @@ namespace BLL
}
#endregion
#region 根据项目名称获取项目信息
/// <summary>
/// 根据项目名称获取项目信息
/// </summary>
/// <param name="projectName"></param>
/// <returns></returns>
public static Model.BaseInfoItem getProjectByName(string projectName)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getDataLists = (from x in db.Base_Project
where x.ProjectName == projectName
select new Model.BaseInfoItem
{
BaseInfoId = x.ProjectId,
BaseInfoCode = x.ProjectCode,
BaseInfoName = x.ProjectName
}
).FirstOrDefault();
return getDataLists;
}
}
#endregion
#region 根据项目id获取区域表
/// <summary>
/// 根据项目id获取区域表

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19232,7 +19232,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

44
SGGL/WebAPI/Controllers/AnBangToolController.cs
View File

@ -35,6 +35,17 @@ namespace WebAPI.Controllers
responeData.message = "ProjectId 不能为空";
return responeData;
}
else
{
var project =APIProjectService.getProjectByProjectId(personInput.ProjectId);
if (project == null)
{
responeData.code = 0;
responeData.message = "ProjectId 不存在";
return responeData;
}
}
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getPerson = db.Bo_Sheng_Person.FirstOrDefault(x => x.ID == personInput.ID);
@ -169,6 +180,17 @@ namespace WebAPI.Controllers
responeData.message = "ProjectId 不能为空";
return responeData;
}
else
{
var project = APIProjectService.getProjectByProjectId(trainInput.ProjectId);
if (project == null)
{
responeData.code = 0;
responeData.message = "ProjectId 不存在";
return responeData;
}
}
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getTrain = db.Bo_Sheng_Train.FirstOrDefault(x => x.ID == trainInput.ID);
@ -295,6 +317,17 @@ namespace WebAPI.Controllers
responeData.message = "ProjectId 不能为空";
return responeData;
}
else
{
var project = APIProjectService.getProjectByProjectId(trainPersonInput.ProjectId);
if (project == null)
{
responeData.code = 0;
responeData.message = "ProjectId 不存在";
return responeData;
}
}
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getTrainPerson = db.Bo_Sheng_TrainPerson.FirstOrDefault(x => x.ID == trainPersonInput.ID);
@ -417,6 +450,17 @@ namespace WebAPI.Controllers
responeData.message = "ProjectId 不能为空";
return responeData;
}
else
{
var project = APIProjectService.getProjectByProjectId(personTrainRecordInput.ProjectId);
if (project == null)
{
responeData.code = 0;
responeData.message = "ProjectId 不存在";
return responeData;
}
}
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getPersonTrainRecord = db.Bo_Sheng_PersonTrainRecord.FirstOrDefault(x => x.ID == personTrainRecordInput.ID);

23
SGGL/WebAPI/Controllers/BaseInfoController.cs
View File

@ -78,6 +78,29 @@ namespace WebAPI.Controllers
}
#endregion
#region 根据项目名称获取项目信息
/// <summary>
/// 根据项目名称获取项目信息
/// </summary>
/// <param name="projectName"></param>
/// <returns></returns>
public Model.ResponeData getProjectByName(string projectName)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = BLL.APIBaseInfoService.getProjectByName(projectName);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据projectId获取单位工程
/// <summary>
/// 根据projectId获取单位工程

169
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,8 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>E:\Package\中国五环工程有限公司\SGGLAPI</_PublishTargetUrl>
<History>True|2024-07-17T02:29:15.9472548Z;</History>
<History>True|2024-09-03T08:26:17.4985546Z||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@ -85,55 +86,55 @@
<publishTime>09/23/2018 23:07:04</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>08/12/2024 09:53:00</publishTime>
<publishTime>09/03/2024 16:26:16</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>08/12/2024 09:53:00</publishTime>
<publishTime>09/03/2024 16:26:15</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>08/12/2024 09:52:20</publishTime>
<publishTime>09/03/2024 16:26:10</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>05/15/2024 09:04:09</publishTime>
<publishTime>06/25/2024 16:56:51</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>08/12/2024 09:52:20</publishTime>
<publishTime>09/03/2024 16:26:10</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime>
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/EmitMapper.dll">
<publishTime>05/10/2011 13:28:12</publishTime>
<publishTime>05/10/2011 21:28:12</publishTime>
</File>
<File Include="bin/FineUIPro.dll">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:54</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
<publishTime>05/08/2021 17:08:30</publishTime>
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.pdb">
<publishTime>05/08/2021 17:08:30</publishTime>
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
<publishTime>05/24/2018 13:38:22</publishTime>
</File>
<File Include="bin/Microsoft.Extensions.Logging.Abstractions.dll">
<publishTime>06/07/2018 00:26:54</publishTime>
<publishTime>06/07/2018 08:26:54</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>08/12/2024 09:52:17</publishTime>
<publishTime>09/03/2024 16:26:07</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>08/12/2024 09:52:17</publishTime>
<publishTime>09/03/2024 16:26:07</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>07/07/2022 09:01:04</publishTime>
<publishTime>08/13/2024 14:17:23</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>11/27/2018 18:07:34</publishTime>
@ -142,34 +143,34 @@
<publishTime>11/27/2018 17:59:08</publishTime>
</File>
<File Include="bin/NPOI.dll">
<publishTime>10/23/2021 01:07:54</publishTime>
<publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OOXML.dll">
<publishTime>10/23/2021 01:07:56</publishTime>
</File>
<File Include="bin/NPOI.OOXML.pdb">
<publishTime>10/23/2021 09:07:56</publishTime>
</File>
<File Include="bin/NPOI.OOXML.pdb">
<publishTime>10/23/2021 17:07:56</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.dll">
<publishTime>10/23/2021 01:07:54</publishTime>
<publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.pdb">
<publishTime>10/23/2021 09:07:54</publishTime>
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXmlFormats.dll">
<publishTime>10/23/2021 01:07:54</publishTime>
<publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXmlFormats.pdb">
<publishTime>10/23/2021 09:07:54</publishTime>
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/NPOI.pdb">
<publishTime>10/23/2021 09:07:54</publishTime>
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Quartz.dll">
<publishTime>09/18/2022 09:38:18</publishTime>
<publishTime>09/18/2022 17:38:18</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>12/08/2021 14:02:42</publishTime>
<publishTime>12/08/2021 22:02:42</publishTime>
</File>
<File Include="bin/roslyn/csc.exe">
<publishTime>05/24/2018 13:38:22</publishTime>
@ -310,34 +311,37 @@
<publishTime>05/24/2018 13:38:24</publishTime>
</File>
<File Include="bin/SgManager.AI.dll">
<publishTime>08/12/2024 09:52:15</publishTime>
<publishTime>09/03/2024 16:26:04</publishTime>
</File>
<File Include="bin/SgManager.AI.dll.config">
<publishTime>05/15/2024 09:04:33</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="bin/SgManager.AI.pdb">
<publishTime>08/12/2024 09:52:15</publishTime>
<publishTime>09/03/2024 16:26:04</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>07/08/2017 09:30:56</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>02/19/2020 10:05:18</publishTime>
<publishTime>02/19/2020 18:05:18</publishTime>
</File>
<File Include="bin/System.Configuration.ConfigurationManager.dll">
<publishTime>08/19/2022 19:55:18</publishTime>
</File>
<File Include="bin/System.Diagnostics.DiagnosticSource.dll">
<publishTime>04/14/2020 22:49:20</publishTime>
<publishTime>04/15/2020 06:49:20</publishTime>
</File>
<File Include="bin/System.Memory.dll">
<publishTime>02/19/2020 10:05:18</publishTime>
<publishTime>02/19/2020 18:05:18</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>11/28/2018 13:00:36</publishTime>
</File>
<File Include="bin/System.Numerics.Vectors.dll">
<publishTime>05/15/2018 13:29:44</publishTime>
<publishTime>05/15/2018 21:29:44</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
<publishTime>02/19/2020 10:05:16</publishTime>
<publishTime>02/19/2020 18:05:16</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
<publishTime>11/28/2018 12:58:44</publishTime>
@ -373,145 +377,148 @@
<publishTime>02/01/2018 12:20:56</publishTime>
</File>
<File Include="bin/ThoughtWorks.QRCode.dll">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>08/12/2024 09:52:21</publishTime>
<publishTime>09/03/2024 16:26:11</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>08/12/2024 09:52:21</publishTime>
<publishTime>09/03/2024 16:26:11</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>08/12/2024 09:52:21</publishTime>
<publishTime>09/03/2024 16:26:11</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
<publishTime>11/29/2018 13:26:02</publishTime>
<publishTime>11/29/2018 21:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Helpers.resources.dll">
<publishTime>02/01/2018 12:21:00</publishTime>
<publishTime>02/01/2018 20:21:00</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
<publishTime>11/29/2018 13:26:30</publishTime>
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
<publishTime>02/01/2018 12:19:30</publishTime>
<publishTime>02/01/2018 20:19:30</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Mvc.resources.dll">
<publishTime>02/01/2018 12:16:38</publishTime>
<publishTime>02/01/2018 20:16:38</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Optimization.resources.dll">
<publishTime>02/11/2014 15:28:40</publishTime>
<publishTime>02/11/2014 23:28:40</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Razor.resources.dll">
<publishTime>02/01/2018 12:17:00</publishTime>
<publishTime>02/01/2018 20:17:00</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.WebPages.Deployment.resources.dll">
<publishTime>02/01/2018 12:21:00</publishTime>
<publishTime>02/01/2018 20:21:00</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.WebPages.Razor.resources.dll">
<publishTime>02/01/2018 12:21:00</publishTime>
<publishTime>02/01/2018 20:21:00</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.WebPages.resources.dll">
<publishTime>02/01/2018 12:21:00</publishTime>
<publishTime>02/01/2018 20:21:00</publishTime>
</File>
<File Include="Content/bootstrap-theme.css">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/bootstrap-theme.css.map">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/bootstrap-theme.min.css">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/bootstrap-theme.min.css.map">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/bootstrap.css">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/bootstrap.css.map">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/bootstrap.min.css.map">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Content/Site.css">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="ErrLog.txt">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="favicon.ico">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff2">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>08/12/2024 09:52:38</publishTime>
<publishTime>09/03/2024 16:26:12</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/bootstrap.min.js">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.js">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.min.js">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.min.map">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.slim.js">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.slim.min.js">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/jquery-3.3.1.slim.min.map">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Scripts/modernizr-2.8.3.js">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>06/25/2024 16:56:55</publishTime>
</File>
<File Include="Views/Home/Index.cshtml">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>01/25/2024 16:49:07</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>01/25/2024 16:49:07</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>01/25/2024 16:49:07</publishTime>
</File>
<File Include="Views/Web.config">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>01/25/2024 16:49:07</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
<publishTime>01/25/2024 16:12:57</publishTime>
<publishTime>01/25/2024 16:49:07</publishTime>
</File>
<File Include="Web.config">
<publishTime>08/08/2024 09:20:35</publishTime>
<publishTime>09/03/2024 16:23:55</publishTime>
</File>
</ItemGroup>
</Project>

4
SGGL/WebAPI/Web.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!--
有关如何配置 ASP.NET 应用程序的详细信息，请访问
https://go.microsoft.com/fwlink/?LinkId=301879
@ -46,7 +46,7 @@
</system.Web>
-->
<system.web>
<compilation debug="false" targetFramework="4.6.1"/>
<compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime/>
<pages controlRenderingCompatibilityVersion="4.0"/>
</system.web>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>