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

自主管理加分项

Browse Source
This commit is contained in:
夏菊
2025-03-04 18:12:07 +08:00
parent 6b48da4eff
commit 5d3273f119
92 changed files with 3646 additions and 4595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/ProjectLeaderCheckEdit.aspx
+10 -2
View File
@@ -31,6 +31,14 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="责任人" ID="drpResponsibleMan" Required="True" ShowRedStar="true" AutoSelectFirstItem="false" AutoPostBack="true" OnSelectedIndexChanged="drpResponsibleMan_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="重修教材" ID="drpTrainingItem" EnableEdit="true" ForceSelection="false" Required="True" ShowRedStar="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpLeaderIds" runat="server" Label="带班领导" EnableEdit="true" MaxLength="500"
@@ -39,12 +47,12 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<%-- <f:FormRow>
<Items>
<f:TextBox ID="txtLeaderName" runat="server" MaxLength="2000" Label=" ">
</f:TextBox>
</Items>
</f:FormRow>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:CheckBox ID="ckIsHoldMeet" runat="server" Label="召开专题讲评会" >
SGGL/FineUIPro.Web/HSSE/Check/ProjectLeaderCheckEdit.aspx.cs
+120 -39
View File
@@ -5,6 +5,8 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using Microsoft.Office.Interop.Excel;
using static BLL.TrainingPlanService;
namespace FineUIPro.Web.HSSE.Check
{
@@ -66,47 +68,42 @@ namespace FineUIPro.Web.HSSE.Check
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
List<Model.SpSysUserItem> list = new List<Model.SpSysUserItem>();
List<Model.SpSysUserItem> newList = new List<Model.SpSysUserItem>();
list.AddRange(BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, null));
list.AddRange(BLL.UserService.GetProjectRoleUserListByProjectId(null, null));
foreach (var item in list)
{
var user = newList.FirstOrDefault(x => x.UserId == item.UserId);
if (user == null)
{
newList.Add(item);
}
}
drpLeaderIds.DataValueField = "UserId";
drpLeaderIds.DataTextField = "UserName";
drpLeaderIds.DataSource = newList;
drpLeaderIds.DataBind();
Funs.FineUIPleaseSelect(drpLeaderIds);
//UserService.InitFlowOperateControlUserDropDownList(this.drpLeaderIds, this.CurrUser.LoginProjectId, null, true);
UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnits, this.CurrUser.LoginProjectId, null, true);
this.InitDropDownList();
this.ProjectLeaderCheckId = Request.Params["ProjectLeaderCheckId"];
this.UnitId = Request.Params["UnitId"];
this.MenuId = Const.ProjectLeaderCheckMenuId;
if (!string.IsNullOrEmpty(this.ProjectLeaderCheckId))
{
var getProjectLeaderCheck = BLL.Check_ProjectLeaderCheckService.GetProjectLeaderCheckById(this.ProjectLeaderCheckId);
if (getProjectLeaderCheck != null)
var model = BLL.Check_ProjectLeaderCheckService.GetProjectLeaderCheckById(this.ProjectLeaderCheckId);
if (model != null)
{
if (!string.IsNullOrEmpty(getProjectLeaderCheck.UnitIds))
if (!string.IsNullOrEmpty(model.UnitIds))
{
this.drpUnits.SelectedValueArray = getProjectLeaderCheck.UnitIds.Split(',');
this.drpUnits.SelectedValueArray = model.UnitIds.Split(',');
PersonService.InitPersonByMultiProjectUnitDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, model.UnitIds, false);
}
if (!string.IsNullOrEmpty(getProjectLeaderCheck.LeaderIds))
if (!string.IsNullOrEmpty(model.LeaderIds))
{
this.drpLeaderIds.SelectedValueArray = getProjectLeaderCheck.LeaderIds.Split(',');
this.drpLeaderIds.SelectedValueArray = model.LeaderIds.Split(',');
}
this.txtCheckCode.Text = getProjectLeaderCheck.CheckCode;
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", getProjectLeaderCheck.CheckDate);
this.ckIsHoldMeet.Checked = getProjectLeaderCheck.IsHoldMeet.Value;
this.txtQuestionDef.Text = getProjectLeaderCheck.QuestionDef;
this.txtRequirement.Text = getProjectLeaderCheck.Requirement;
this.txtLeaderName.Text = getProjectLeaderCheck.LeaderNames;
if (!string.IsNullOrEmpty(model.ResponsibleMan))
{
this.drpResponsibleMan.SelectedValue = model.ResponsibleMan;
//根据人员Id获取职务Id
var user = PersonService.GetPersonById(model.ResponsibleMan);
CompanyTrainingItemService.InitCompanyTrainingItemDownList(this.drpTrainingItem, user.WorkPostId, false);
}
if (!string.IsNullOrEmpty(model.CompanyTrainingItemId))
{
this.drpTrainingItem.SelectedValue = model.CompanyTrainingItemId;
}
this.txtCheckCode.Text = model.CheckCode;
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", model.CheckDate);
this.ckIsHoldMeet.Checked = model.IsHoldMeet.Value;
this.txtQuestionDef.Text = model.QuestionDef;
this.txtRequirement.Text = model.Requirement;
//this.txtLeaderName.Text = model.LeaderNames;
}
}
else
@@ -117,6 +114,55 @@ namespace FineUIPro.Web.HSSE.Check
}
}
}
/// <summary>
/// 下拉框加载
/// </summary>
private void InitDropDownList()
{
List<Model.SpSysUserItem> list = new List<Model.SpSysUserItem>();
List<Model.SpSysUserItem> newList = new List<Model.SpSysUserItem>();
list.AddRange(BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, null));
list.AddRange(BLL.UserService.GetProjectRoleUserListByProjectId(null, null));
foreach (var item in list)
{
var user = newList.FirstOrDefault(x => x.UserId == item.UserId);
if (user == null)
{
newList.Add(item);
}
}
drpLeaderIds.DataValueField = "UserId";
drpLeaderIds.DataTextField = "UserName";
drpLeaderIds.DataSource = newList;
drpLeaderIds.DataBind();
Funs.FineUIPleaseSelect(drpLeaderIds);
//UserService.InitFlowOperateControlUserDropDownList(this.drpLeaderIds, this.CurrUser.LoginProjectId, null, true);
UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnits, this.CurrUser.LoginProjectId, null, true);
PersonService.InitPersonByProjectUnitDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, string.Empty, false);
}
/// <summary>
/// 责任人下拉加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpResponsibleMan_SelectedIndexChanged(object sender, EventArgs e)
{
//责任人Id
var responsibleManId = this.drpResponsibleMan.SelectedValue;
if (!string.IsNullOrWhiteSpace(responsibleManId))
{
//根据人员Id获取职务Id
var user = PersonService.GetPersonById(responsibleManId);
if (user != null && !string.IsNullOrWhiteSpace(user.WorkPostId))
{
CompanyTrainingItemService.InitCompanyTrainingItemDownList(this.drpTrainingItem, user.WorkPostId, false);
}
}
}
#endregion
#region 保存
@@ -145,7 +191,7 @@ namespace FineUIPro.Web.HSSE.Check
return;
}
Model.Check_ProjectLeaderCheck newProjectLeaderCheck = new Model.Check_ProjectLeaderCheck
Model.Check_ProjectLeaderCheck model = new Model.Check_ProjectLeaderCheck
{
ProjectId = this.CurrUser.LoginProjectId,
CheckCode = this.txtCheckCode.Text.Trim(),
@@ -155,23 +201,53 @@ namespace FineUIPro.Web.HSSE.Check
IsHoldMeet = this.ckIsHoldMeet.Checked,
QuestionDef = this.txtQuestionDef.Text.Trim(),
Requirement = this.txtRequirement.Text.Trim(),
LeaderNames = this.txtLeaderName.Text.Trim(),
//LeaderNames = this.txtLeaderName.Text.Trim(),
CompileDate = DateTime.Now,
CompileMan = this.CurrUser.UserId
};
if (this.drpResponsibleMan.SelectedValue != BLL.Const._Null)
{
model.ResponsibleMan = this.drpResponsibleMan.SelectedValue;
}
model.CompanyTrainingItemId = drpTrainingItem.SelectedValue;
if (!string.IsNullOrEmpty(this.ProjectLeaderCheckId))
{
newProjectLeaderCheck.ProjectLeaderCheckId = this.ProjectLeaderCheckId;
BLL.Check_ProjectLeaderCheckService.UpdateProjectLeaderCheck(newProjectLeaderCheck);
BLL.LogService.AddSys_Log(this.CurrUser, newProjectLeaderCheck.CheckCode, newProjectLeaderCheck.ProjectLeaderCheckId, this.MenuId, BLL.Const.BtnModify);
model.ProjectLeaderCheckId = this.ProjectLeaderCheckId;
BLL.Check_ProjectLeaderCheckService.UpdateProjectLeaderCheck(model);
BLL.LogService.AddSys_Log(this.CurrUser, model.CheckCode, model.ProjectLeaderCheckId, this.MenuId, BLL.Const.BtnModify);
}
else
{
this.ProjectLeaderCheckId = SQLHelper.GetNewID();
newProjectLeaderCheck.ProjectLeaderCheckId = this.ProjectLeaderCheckId;
BLL.Check_ProjectLeaderCheckService.AddProjectLeaderCheck(newProjectLeaderCheck);
BLL.LogService.AddSys_Log(this.CurrUser, newProjectLeaderCheck.CheckCode, newProjectLeaderCheck.ProjectLeaderCheckId, this.MenuId, BLL.Const.BtnAdd);
model.ProjectLeaderCheckId = this.ProjectLeaderCheckId;
BLL.Check_ProjectLeaderCheckService.AddProjectLeaderCheck(model);
BLL.LogService.AddSys_Log(this.CurrUser, model.CheckCode, model.ProjectLeaderCheckId, this.MenuId, BLL.Const.BtnAdd);
}
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
#region 责任人和重修教材非空，生成培训计划
if (!string.IsNullOrWhiteSpace(model.ResponsibleMan) && !string.IsNullOrWhiteSpace(model.CompanyTrainingItemId))
{//责任人和重修教材非空，生成培训计划
var CheckTypeName = Enums.RetakeCourseType.领导带班检查.ToString();
Model.RetakeCourseProducePlanInfo info = new Model.RetakeCourseProducePlanInfo
{
CurrProjectId = this.CurrUser.LoginProjectId,
CurrUserId = this.CurrUser.UserId,
CheckId = this.ProjectLeaderCheckId,
CheckType = (int)Enums.RetakeCourseType.领导带班检查,
CheckTypeName = "领导带班检查",
PersonId = model.ResponsibleMan,
CompanyTrainingItemId = model.CompanyTrainingItemId,
//TrainEndDate = model.RectificationPeriod
};
TrainingPlanService.RetakeCourseProducePlan(info);
}
#endregion
}
#endregion
@@ -193,6 +269,11 @@ namespace FineUIPro.Web.HSSE.Check
protected void drpUnits_SelectedIndexChanged(object sender, EventArgs e)
{
string unitIds = Funs.GetStringByArray(this.drpUnits.SelectedValueArray);
if (!string.IsNullOrWhiteSpace(unitIds))
{
PersonService.InitPersonByMultiProjectUnitDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, unitIds, false);
}
this.drpUnits.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpUnits.SelectedValueArray);
}
SGGL/FineUIPro.Web/HSSE/Check/ProjectLeaderCheckEdit.aspx.designer.cs
Generated
+39 -28
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Check {
public partial class ProjectLeaderCheckEdit {
namespace FineUIPro.Web.HSSE.Check
{
public partial class ProjectLeaderCheckEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtCheckCode 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckCode;
/// <summary>
/// txtCheckDate 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckDate;
/// <summary>
/// drpUnits 控件。
/// </summary>
@@ -65,7 +67,25 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnits;
/// <summary>
/// drpResponsibleMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpResponsibleMan;
/// <summary>
/// drpTrainingItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTrainingItem;
/// <summary>
/// drpLeaderIds 控件。
/// </summary>
@@ -74,16 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpLeaderIds;
/// <summary>
/// txtLeaderName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtLeaderName;
/// <summary>
/// ckIsHoldMeet 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsHoldMeet;
/// <summary>
/// txtQuestionDef 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtQuestionDef;
/// <summary>
/// txtRequirement 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRequirement;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>