gaofei
/
SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

班前会添加装置单元

This commit is contained in:
杨家亮 2025-09-03 16:40:38 +08:00
parent 47c8a5d415
commit f6b2bdfb81
19 changed files with 409 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,26 @@ namespace BLL
}
#endregion
#region 获取项目装置列表
public static List<Model.BaseInfoItem> getProjectInstallations(string projectId)
{
using(Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var list = (from x in db.Project_Installation
where x.ProjectId == projectId
select new Model.BaseInfoItem
{
BaseInfoId = x.InstallationId,
BaseInfoCode = x.InstallationCode,
BaseInfoName = x.InstallationName
}
).ToList();
return list;
}
}
#endregion
#region 根据项目号获取项目信息
/// <summary>
/// 根据项目号获取项目信息

11
SGGL/BLL/API/HSSE/APIMeetingService.cs
View File

@ -47,6 +47,8 @@ namespace BLL
MeetingHostManName = db.SitePerson_Person.First(y => y.PersonId == x.MeetingHostMan).PersonName,
AttentPerson = x.AttentPerson,
AttentPersonNum = x.AttentPersonNum ?? 0,
InstallationId = x.InstallationId,
InstallationName = x.InstallationName,
CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate),
CompileManId = x.CompileMan,
MeetingHostManOther = x.MeetingHostManOther,
@ -228,6 +230,8 @@ namespace BLL
MeetingType = meetingType,
MeetingHours = x.MeetingHours ?? 0,
MeetingHostMan = x.MeetingHostMan,
InstallationId = x.InstallationId,
InstallationName = x.InstallationName,
AttentPerson = x.AttentPerson,
CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate),
MeetingHostManOther=x.MeetingHostManOther,
@ -400,8 +404,11 @@ namespace BLL
AttentPersonNum=meeting.AttentPersonNum,
MeetingHostManOther=meeting.MeetingHostManOther,
States = Const.State_2,
ManagePersonNum = m_personum
};
ManagePersonNum = m_personum,
InstallationId = meeting.InstallationId,
InstallationName = meeting.InstallationName,
}
;
if (meeting.States != "1")
{

2
SGGL/BLL/BLL.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BLL</RootNamespace>
<AssemblyName>BLL</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

4
SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs
View File

@ -45,7 +45,9 @@ namespace BLL
AttentPerson = classMeeting.AttentPerson,
AttentPersonNum=classMeeting.AttentPersonNum,
MeetingHostManOther=classMeeting.MeetingHostManOther,
ManagePersonNum = classMeeting.ManagePersonNum
ManagePersonNum = classMeeting.ManagePersonNum,
InstallationId = classMeeting.InstallationId,
InstallationName = classMeeting.InstallationName
};
db.Meeting_ClassMeeting.InsertOnSubmit(newClassMeeting);
db.SubmitChanges();

12
SGGL/BLL/ProjectData/TeamGroupService.cs
View File

@ -82,7 +82,10 @@ namespace BLL
/// <param name="teamGroupId"></param>
public static void DeleteTeamGroupById(string teamGroupId)
{
Model.SGGLDB db = Funs.DB;
try
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.ProjectData_TeamGroup teamGroup = db.ProjectData_TeamGroup.FirstOrDefault(e => e.TeamGroupId == teamGroupId);
if (teamGroup != null)
{
@ -90,6 +93,13 @@ namespace BLL
db.SubmitChanges();
}
}
}catch(System.Exception ex)
{
}
}
/// <summary>
/// 获取班组人数

12
SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs generated
View File

@ -13,13 +13,13 @@ namespace Resources {
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Lan {
@ -33,7 +33,7 @@ namespace Resources {
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@ -47,8 +47,8 @@ namespace Resources {
}
/// <summary>
/// 覆盖当前线程的 CurrentUICulture 属性
/// 使用此强类型的资源类的资源查找。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {

122
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -7423,3 +7423,125 @@ IP地址:::1
出错时间:06/05/2025 14:16:02
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.common.mainProject.get_VideoUserName() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\common\mainProject.aspx.cs:行号 800
在 ASP.common_mainproject_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer) 位置 e:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\common\mainProject.aspx:行号 1023
在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
在 System.Web.UI.Page.Render(HtmlTextWriter writer)
在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:08/12/2025 14:50:09
出错文件:http://localhost:4528/common/mainProject.aspx
IP地址:::1
操作人员:JT
出错时间:08/12/2025 14:50:09
错误信息开始=====>
错误类型:SqlException
错误信息:DELETE 语句与 REFERENCE 约束"FK_Meeting_ClassMeeting_ProjectData_TeamGroup"冲突。该冲突发生于数据库"SGGLDB_HBAZ"，表"dbo.Meeting_ClassMeeting", column 'TeamGroupId'。
语句已终止。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(TaskCompletionSource`1 completion, String methodName, Boolean sendToPipe, Int32 timeout, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.ExecuteNonQuery()
在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
在 System.Data.Linq.ChangeDirector.StandardChangeDirector.DynamicDelete(TrackedObject item)
在 System.Data.Linq.ChangeDirector.StandardChangeDirector.Delete(TrackedObject item)
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 BLL.TeamGroupService.DeleteTeamGroupById(String teamGroupId) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\TeamGroupService.cs:行号 90
在 FineUIPro.Web.ProjectData.TeamGroup.btnMenuDelete_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\TeamGroup.aspx.cs:行号 197
在 FineUIPro.MenuButton.OnClick(EventArgs e)
在 (MenuButton , EventArgs )
在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:08/27/2025 15:49:42
出错文件:http://localhost:4528/ProjectData/TeamGroup.aspx
IP地址:::1
操作人员:徐月
出错时间:08/27/2025 15:49:42
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:找不到行或行已更改。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 BLL.TeamGroupService.DeleteTeamGroupById(String teamGroupId) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\TeamGroupService.cs:行号 90
在 FineUIPro.Web.ProjectData.TeamGroup.btnMenuDelete_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\TeamGroup.aspx.cs:行号 197
在 FineUIPro.MenuButton.OnClick(EventArgs e)
在 (MenuButton , EventArgs )
在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:08/27/2025 15:50:16
出错文件:http://localhost:4528/ProjectData/TeamGroup.aspx
IP地址:::1
操作人员:徐月
出错时间:08/27/2025 15:50:16
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:找不到行或行已更改。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 BLL.TeamGroupService.DeleteTeamGroupById(String teamGroupId) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\TeamGroupService.cs:行号 90
在 FineUIPro.Web.ProjectData.TeamGroup.btnMenuDelete_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\TeamGroup.aspx.cs:行号 197
在 FineUIPro.MenuButton.OnClick(EventArgs e)
在 (MenuButton , EventArgs )
在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:08/27/2025 15:53:16
出错文件:http://localhost:4528/ProjectData/TeamGroup.aspx
IP地址:::1
操作人员:徐月
出错时间:08/27/2025 15:53:16
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Meeting.ClassMeetingView.Page_Load(Object sender, EventArgs e)
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/03/2025 16:30:19
出错文件:http://localhost:4528/HSSE/Meeting/ClassMeetingView.aspx?ClassMeetingId=506fa08f-8e66-4db5-a4d8-090c83214816
IP地址:::1
操作人员:徐月
出错时间:09/03/2025 16:30:19

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

@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FineUIPro.Web</RootNamespace>
<AssemblyName>FineUIPro.Web</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<SccProjectName>
</SccProjectName>
@ -19738,7 +19738,6 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.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">

4
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx
View File

@ -59,6 +59,10 @@
SortField="TeamGroupName" FieldType="String" HeaderText="班组" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField ColumnID="InstallationName" DataField="InstallationName"
SortField="InstallationName" FieldType="String" HeaderText="装置/单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField ColumnID="AttentPersonNum" DataField="AttentPersonNum"
SortField="AttentPersonNum" FieldType="String" HeaderText="人数" HeaderTextAlign="Center"
TextAlign="Left">

2
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
View File

@ -67,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Meeting
/// </summary>
private void BindGrid()
{
string strSql = "SELECT ClassMeeting.AttentPersonNum, ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS ClassMeetingCode,Unit.UnitId,Unit.UnitName, g.TeamGroupId as TeamGroupId, g.TeamGroupName as TeamGroupName, ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
string strSql = "SELECT ClassMeeting.AttentPersonNum,ClassMeeting.InstallationId,ClassMeeting.InstallationName, ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS ClassMeetingCode,Unit.UnitId,Unit.UnitName, g.TeamGroupId as TeamGroupId, g.TeamGroupName as TeamGroupName, ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
+ @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
+ @" FROM Meeting_ClassMeeting AS ClassMeeting "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "

3
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx
View File

@ -45,6 +45,9 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="textInstallationName" Label="装置/单位" LabelAlign="Right" Readonly="true"></f:TextBox>
<f:Label runat="server" ID="Label1"></f:Label>
<f:TextBox runat="server" ID="txtAttentPersonNum" Label="人数" LabelAlign="Right" Readonly="true"></f:TextBox>
<f:Label runat="server" ID="lb1"></f:Label>
</Items>

1
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs
View File

@ -59,6 +59,7 @@ namespace FineUIPro.Web.HSSE.Meeting
this.drpUnit.Text = UnitService.GetUnitNameByUnitId(classMeeting.UnitId);
this.drpTeamGroup.Text = TeamGroupService.GetTeamGroupNameByTeamGroupId(classMeeting.TeamGroupId);
this.txtAttentPersonNum.Text = classMeeting.AttentPersonNum.ToString();
this.textInstallationName.Text = classMeeting.InstallationName.ToString();
}
}

24
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Meeting {
namespace FineUIPro.Web.HSSE.Meeting
{
public partial class ClassMeetingView {
public partial class ClassMeetingView
{
/// <summary>
/// form1 控件。
@ -93,6 +95,24 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// </remarks>
protected global::FineUIPro.TextBox drpTeamGroup;
/// <summary>
/// textInstallationName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox textInstallationName;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtAttentPersonNum 控件。
/// </summary>

10
SGGL/Model/APIItem/HSSE/MeetingItem.cs
View File

@ -241,5 +241,15 @@ namespace Model
get;
set;
}
public string InstallationId
{
get; set;
}
public string InstallationName
{
get; set;
}
}
}

48
SGGL/Model/Model.cs
View File

@ -299228,6 +299228,10 @@ namespace Model
private System.Nullable<int> _ManagePersonNum;
private string _InstallationId;
private string _InstallationName;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -299276,6 +299280,10 @@ namespace Model
partial void OnMeetingHostManOtherChanged();
partial void OnManagePersonNumChanging(System.Nullable<int> value);
partial void OnManagePersonNumChanged();
partial void OnInstallationIdChanging(string value);
partial void OnInstallationIdChanged();
partial void OnInstallationNameChanging(string value);
partial void OnInstallationNameChanged();
#endregion
public Meeting_ClassMeeting()
@ -299663,6 +299671,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(255)")]
public string InstallationId
{
get
{
return this._InstallationId;
}
set
{
if ((this._InstallationId != value))
{
this.OnInstallationIdChanging(value);
this.SendPropertyChanging();
this._InstallationId = value;
this.SendPropertyChanged("InstallationId");
this.OnInstallationIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationName", DbType="NVarChar(255)")]
public string InstallationName
{
get
{
return this._InstallationName;
}
set
{
if ((this._InstallationName != value))
{
this.OnInstallationNameChanging(value);
this.SendPropertyChanging();
this._InstallationName = value;
this.SendPropertyChanged("InstallationName");
this.OnInstallationNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Meeting_ClassMeeting_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{

2
SGGL/Model/Model.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

2
SGGL/SgManager.AI/SgManager.AI.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SgManager.AI</RootNamespace>
<AssemblyName>SgManager.AI</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

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

@ -1250,6 +1250,22 @@ namespace WebAPI.Controllers
}
#endregion
#region 获取项目级装置
public Model.ResponeData getProjectInstallation(string projectId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APIBaseInfoService.getProjectInstallations(projectId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
/// <summary>
/// 获取安全人工时

2
SGGL/WebAPI/WebAPI.csproj
View File

@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebAPI</RootNamespace>
<AssemblyName>WebAPI</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />