xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目用户添加是否教育人字段

This commit is contained in:
geh 2026-01-20 16:34:07 +08:00
parent 9555acd424
commit 96ca57977d
11 changed files with 131 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataBase/版本日志/SGGLDB_2026-01-20-geh.sql Normal file
View File

@ -0,0 +1,8 @@
alter table Project_ProjectUser add IsEducator bit NULL;
go
EXEC sp_addextendedproperty
'MS_Description', N'是否教育人',
'SCHEMA', N'dbo',
'TABLE', N'Project_ProjectUser',
'COLUMN', N'IsEducator'
GO

2
SUBQHSE/BLL/ProjectData/ProjectUserService.cs
View File

@ -64,6 +64,7 @@
ViceCNProfessionalId = projectUser.ViceCNProfessionalId
};
//newProjectUser.RoleName = projectUser.RoleName;
newProjectUser.IsEducator = projectUser.IsEducator;
db.Project_ProjectUser.InsertOnSubmit(newProjectUser);
db.SubmitChanges();
}
@ -89,6 +90,7 @@
newProjectUser.MainCNProfessionalId = projectUser.MainCNProfessionalId;
newProjectUser.ViceCNProfessionalId = projectUser.ViceCNProfessionalId;
//newProjectUser.RoleName = projectUser.RoleName;
newProjectUser.IsEducator = projectUser.IsEducator;
db.SubmitChanges();
}
}

2
SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs
View File

@ -210,7 +210,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
strSql += " AND TrainRecord.UnitIds LIKE @UnitId1";
listStr.Add(new SqlParameter("@UnitId1", "%" + this.CurrUser.UnitId + "%"));
}
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
if (this.drpUnitId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitId.SelectedValue))
{
strSql += " AND TrainRecord.UnitIds LIKE @UnitIds";
listStr.Add(new SqlParameter("@UnitIds", "%" + this.drpUnitId.SelectedValue.Trim() + "%"));

10
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
View File

@ -850,7 +850,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
var person = Funs.DB.View_SitePerson_Person.FirstOrDefault(x => x.PersonId == Grid1.SelectedRowID);
var personData = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == Grid1.SelectedRowID);
// var personData = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == Grid1.SelectedRowID);
if (person != null)
{
@ -1023,6 +1023,12 @@ namespace FineUIPro.Web.HSSE.SitePerson
List<Training_TestRecordItem> getSingleItem = new List<Training_TestRecordItem>();
List<Training_TestRecordItem> getMultipleItem = new List<Training_TestRecordItem>();
List<Training_TestRecordItem> getIsTrueItem = new List<Training_TestRecordItem>();
Project_ProjectUser newProjectUser = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IsEducator == true);
if (newProjectUser != null)
{
sign = UserService.GetUserNameByUserId(newProjectUser.UserId);
}
if (gTrainingTestRecord != null)
{
testName = person.PersonName;
@ -1030,7 +1036,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
Signature = gTrainingTestRecord.Signature;
TestScores = gTrainingTestRecord.TestScores;
TestStartTime = gTrainingTestRecord.TestStartTime;
sign = gTrainingTestRecord.PlanManName;
// sign = gTrainingTestRecord.PlanManName;
dateTime1 = gTrainingTestRecord.TestStartTime.Value;

9
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUserSave.aspx
View File

@ -81,6 +81,15 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:RadioButtonList runat="server" ID="rblIsEducator" Label="是否教育人" >
<f:RadioItem Text="否" Value="False" Selected="True"/>
<f:RadioItem Text="是" Value="True"/>
</f:RadioButtonList>
<f:Label ID="Temp1" runat="server" Hidden="True"></f:Label>
</Items>
</f:FormRow>
</rows>
<toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

5
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
View File

@ -69,6 +69,10 @@ namespace FineUIPro.Web.ProjectData
{
this.drpIsPost.SelectedValue = Convert.ToString(projectUser.IsPost);
}
if (projectUser.IsEducator.HasValue)
{
this.rblIsEducator.SelectedValue = Convert.ToString(projectUser.IsEducator);
}
if (!string.IsNullOrEmpty(projectUser.RoleId))
{
this.drpRole.SelectedValue = projectUser.RoleId;
@ -159,6 +163,7 @@ namespace FineUIPro.Web.ProjectData
}
newProjectUser.ViceCNProfessionalId = viceCNProfessionalId;
newProjectUser.IsPost = Convert.ToBoolean(this.drpIsPost.SelectedValue);
newProjectUser.IsEducator = Convert.ToBoolean(this.rblIsEducator.SelectedValue);
BLL.ProjectUserService.UpdateProjectUser(newProjectUser);
Model.Sys_RoleItem roleItem = BLL.RoleItemService.GeRoleItemByUserIdAndProjectId(newProjectUser.UserId, newProjectUser.ProjectId);
if (roleItem != null)

24
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ProjectData {
namespace FineUIPro.Web.ProjectData
{
public partial class ProjectUserSave {
public partial class ProjectUserSave
{
/// <summary>
/// form1 控件。
@ -147,6 +149,24 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.DropDownList drpViceCNProfessional;
/// <summary>
/// rblIsEducator 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsEducator;
/// <summary>
/// Temp1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Temp1;
/// <summary>
/// Toolbar1 控件。
/// </summary>

7
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUserView.aspx
View File

@ -36,6 +36,13 @@
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="drpIsEducator" runat="server" Label="是否教育人" Readonly="true">
</f:TextBox>
<f:Label ID="Temp1" runat="server" Hidden="True"></f:Label>
</Items>
</f:FormRow>
</rows>
<toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

5
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUserView.aspx.cs
View File

@ -70,6 +70,11 @@ namespace FineUIPro.Web.ProjectData
{
this.drpRole.Text = role.RoleName;
}
var isEducator = BLL.ConstValue.drpConstItemList(ConstValue.Group_0001).FirstOrDefault(x => x.ConstValue == Convert.ToString(projectUser.IsEducator));
if (isEducator != null)
{
this.drpIsEducator.Text = isEducator.ConstText;
}
}
}
}

18
SUBQHSE/FineUIPro.Web/ProjectData/ProjectUserView.aspx.designer.cs generated
View File

@ -95,6 +95,24 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.TextBox drpIsPost;
/// <summary>
/// drpIsEducator 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox drpIsEducator;
/// <summary>
/// Temp1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Temp1;
/// <summary>
/// Toolbar1 控件。
/// </summary>

24
SUBQHSE/Model/Model.cs
View File

@ -325199,6 +325199,8 @@ namespace Model
private string _System;
private System.Nullable<bool> _IsEducator;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -325231,6 +325233,8 @@ namespace Model
partial void OnViceCNProfessionalIdChanged();
partial void OnSystemChanging(string value);
partial void OnSystemChanged();
partial void OnIsEducatorChanging(System.Nullable<bool> value);
partial void OnIsEducatorChanged();
#endregion
public Project_ProjectUser()
@ -325473,6 +325477,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEducator", DbType="Bit")]
public System.Nullable<bool> IsEducator
{
get
{
return this._IsEducator;
}
set
{
if ((this._IsEducator != value))
{
this.OnIsEducatorChanging(value);
this.SendPropertyChanging();
this._IsEducator = value;
this.SendPropertyChanged("IsEducator");
this.OnIsEducatorChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_ProjectUser_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{