shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20251009

This commit is contained in:
毕文静 2025-10-09 10:39:49 +08:00
parent 6b422a4781
commit aea0bf3079
8 changed files with 181 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FCL/BLL/BaseInfo/DepartService.cs
View File

@ -56,6 +56,7 @@ namespace BLL
newDepart.DepartName = depart.DepartName; newDepart.DepartName = depart.DepartName;
newDepart.Remark = depart.Remark; newDepart.Remark = depart.Remark;
newDepart.DepartLeader = depart.DepartLeader; newDepart.DepartLeader = depart.DepartLeader;
newDepart.DelegatedRepresentative = depart.DelegatedRepresentative;
Funs.DB.Base_Depart.InsertOnSubmit(newDepart); Funs.DB.Base_Depart.InsertOnSubmit(newDepart);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
@ -73,6 +74,7 @@ namespace BLL
newDepart.DepartName = depart.DepartName; newDepart.DepartName = depart.DepartName;
newDepart.Remark = depart.Remark; newDepart.Remark = depart.Remark;
newDepart.DepartLeader = depart.DepartLeader; newDepart.DepartLeader = depart.DepartLeader;
newDepart.DelegatedRepresentative = depart.DelegatedRepresentative;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

4
FCL/FineUIPro.Web/BaseInfo/Department.aspx
View File

@ -42,6 +42,9 @@
<f:RenderField Width="150px" ColumnID="UserName" DataField="UserName" <f:RenderField Width="150px" ColumnID="UserName" DataField="UserName"
FieldType="String" HeaderText="Department leader" HeaderTextAlign="Center" TextAlign="Left"> FieldType="String" HeaderText="Department leader" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="DelegatedRepresentativeName" DataField="DelegatedRepresentativeName"
FieldType="String" HeaderText="Delegated Representative" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="Remark" DataField="Remark" <f:RenderField Width="300px" ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="Remark" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> FieldType="String" HeaderText="Remark" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField> </f:RenderField>
@ -77,6 +80,7 @@
runat="server" LabelAlign="right" LabelWidth="140px"> runat="server" LabelAlign="right" LabelWidth="140px">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpDepartLeader" runat="server" Label="Department leader" LabelAlign="Right" EnableEdit="true" LabelWidth="140px"></f:DropDownList> <f:DropDownList ID="drpDepartLeader" runat="server" Label="Department leader" LabelAlign="Right" EnableEdit="true" LabelWidth="140px"></f:DropDownList>
<f:DropDownList ID="drpDelegatedRepresentative" runat="server" Label="Delegated Representative" LabelAlign="Right" EnableEdit="true" LabelWidth="140px"></f:DropDownList>
<f:TextArea ID="txtRemark" Label="Remark" runat="server" LabelAlign="Right" LabelWidth="140px"></f:TextArea> <f:TextArea ID="txtRemark" Label="Remark" runat="server" LabelAlign="Right" LabelWidth="140px"></f:TextArea>
</Items> </Items>
<Toolbars> <Toolbars>

33
FCL/FineUIPro.Web/BaseInfo/Department.aspx.cs
View File

@ -1,6 +1,7 @@
using BLL; using BLL;
using BLL.Common; using BLL.Common;
using Model; using Model;
using Org.BouncyCastle.Tls.Crypto;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@ -23,13 +24,20 @@ namespace FineUIPro.Web.BaseInfo
if (!IsPostBack) if (!IsPostBack)
{ {
GetButtonPower();//按钮权限 GetButtonPower();//按钮权限
//部门领导
drpDepartLeader.DataTextField = "UserName"; drpDepartLeader.DataTextField = "UserName";
drpDepartLeader.DataValueField = "UserId"; drpDepartLeader.DataValueField = "UserId";
this.drpDepartLeader.DataSource = BLL.Sys_UserService.GetUserList(); this.drpDepartLeader.DataSource = BLL.Sys_UserService.GetUserList();
this.drpDepartLeader.DataBind(); this.drpDepartLeader.DataBind();
Funs.FineUIPleaseSelect(this.drpDepartLeader); Funs.FineUIPleaseSelect(this.drpDepartLeader);
this.drpDepartLeader.SelectedIndex = 0; this.drpDepartLeader.SelectedIndex = 0;
//部门代理人
drpDelegatedRepresentative.DataTextField = "UserName";
drpDelegatedRepresentative.DataValueField = "UserId";
this.drpDelegatedRepresentative.DataSource = BLL.Sys_UserService.GetUserList();
this.drpDelegatedRepresentative.DataBind();
Funs.FineUIPleaseSelect(this.drpDelegatedRepresentative);
this.drpDelegatedRepresentative.SelectedIndex = 0;
ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格 // 绑定表格
@ -42,9 +50,10 @@ namespace FineUIPro.Web.BaseInfo
/// </summary> /// </summary>
private void BindGrid() private void BindGrid()
{ {
string strSql = @"SELECT dep.DepartId,dep.DepartCode,dep.DepartName,dep.DepartLeader,u.UserName string strSql = @"SELECT dep.DepartId,dep.DepartCode,dep.DepartName,dep.DepartLeader,u.UserName,dep.DelegatedRepresentative,r.UserName as DelegatedRepresentativeName
FROM dbo.Base_Depart AS dep FROM dbo.Base_Depart AS dep
LEFT JOIN dbo.Sys_User AS u ON u.UserId = dep.DepartLeader LEFT JOIN dbo.Sys_User AS u ON u.UserId = dep.DepartLeader
LEFT JOIN dbo.Sys_User AS r ON r.UserId = dep.DelegatedRepresentative
Where 1=1"; Where 1=1";
// 2.获取当前分页数据 // 2.获取当前分页数据
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
@ -99,13 +108,11 @@ namespace FineUIPro.Web.BaseInfo
/// <param name="e"></param> /// <param name="e"></param>
protected void btnDelete_Click(object sender, EventArgs e) protected void btnDelete_Click(object sender, EventArgs e)
{ {
BLL.DepartService.DeleteDepartById(hfFormID.Text); BLL.DepartService.DeleteDepartById(hfFormID.Text);
BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Delete department"); BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Delete department");
// 重新绑定表格，并模拟点击[新增按钮] // 重新绑定表格，并模拟点击[新增按钮]
BindGrid(); BindGrid();
//PageContext.RegisterStartupScript("onNewButtonClick();"); //PageContext.RegisterStartupScript("onNewButtonClick();");
} }
/// <summary> /// <summary>
/// 右键删除事件 /// 右键删除事件
@ -170,6 +177,18 @@ namespace FineUIPro.Web.BaseInfo
{ {
this.drpDepartLeader.SelectedValue = depart.DepartLeader; this.drpDepartLeader.SelectedValue = depart.DepartLeader;
} }
else
{
this.drpDepartLeader.SelectedIndex = 0;
}
if (!string.IsNullOrEmpty(depart.DelegatedRepresentative))
{
this.drpDelegatedRepresentative.SelectedValue = depart.DelegatedRepresentative;
}
else
{
this.drpDelegatedRepresentative.SelectedIndex = 0;
}
hfFormID.Text = Id; hfFormID.Text = Id;
this.btnDelete.Enabled = true; this.btnDelete.Enabled = true;
} }
@ -197,6 +216,10 @@ namespace FineUIPro.Web.BaseInfo
{ {
depart.DepartLeader = this.drpDepartLeader.SelectedValue; depart.DepartLeader = this.drpDepartLeader.SelectedValue;
} }
if (this.drpDelegatedRepresentative.SelectedValue!=BLL.Const._Null)
{
depart.DelegatedRepresentative = this.drpDelegatedRepresentative.SelectedValue;
}
if (string.IsNullOrEmpty(strRowID)) if (string.IsNullOrEmpty(strRowID))
{ {
depart.DepartId = SQLHelper.GetNewID(typeof(Model.Base_Depart)); depart.DepartId = SQLHelper.GetNewID(typeof(Model.Base_Depart));
@ -264,6 +287,7 @@ namespace FineUIPro.Web.BaseInfo
this.txtDepartCode.Text = string.Empty; this.txtDepartCode.Text = string.Empty;
this.txtDepartName.Text = string.Empty; this.txtDepartName.Text = string.Empty;
this.drpDepartLeader.SelectedValue = Const._Null; this.drpDepartLeader.SelectedValue = Const._Null;
this.drpDelegatedRepresentative.SelectedValue= Const._Null;
this.txtRemark.Text = string.Empty; this.txtRemark.Text = string.Empty;
this.btnDelete.Enabled = false; this.btnDelete.Enabled = false;
} }
@ -397,7 +421,6 @@ namespace FineUIPro.Web.BaseInfo
{ {
errorInfos += (i + 2) + "Line, [Manager] cannot be empty!</br>"; errorInfos += (i + 2) + "Line, [Manager] cannot be empty!</br>";
} }
depList.Add(d); depList.Add(d);
#endregion #endregion
} }

15
FCL/FineUIPro.Web/BaseInfo/Department.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo { namespace FineUIPro.Web.BaseInfo
{
public partial class Department { public partial class Department
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -183,6 +185,15 @@ namespace FineUIPro.Web.BaseInfo {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpDepartLeader; protected global::FineUIPro.DropDownList drpDepartLeader;
/// <summary>
/// drpDelegatedRepresentative 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelegatedRepresentative;
/// <summary> /// <summary>
/// txtRemark 控件。 /// txtRemark 控件。
/// </summary> /// </summary>

51
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs
View File

@ -1183,7 +1183,7 @@ namespace FineUIPro.Web.ContractorQuality
pun.UserDepStartDate = DateTime.Now;//用户部门审批到达时间 pun.UserDepStartDate = DateTime.Now;//用户部门审批到达时间
pun.Pause = false;//如果审核通过，取消暂停 pun.Pause = false;//如果审核通过，取消暂停
#region 主协调员审批通过邮件:发送给部门经理，抄送流程经办人 #region 主协调员审批通过邮件:如果部门有部门代理人，发送给部门代理人，抄送给部门经理及流程经办人；如果没有部门代理人，发送给部门经理，抄送给流程经办人
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId); Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null) if (pops == null)
{ {
@ -1196,31 +1196,56 @@ namespace FineUIPro.Web.ContractorQuality
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知")); var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知"));
if (emailTemplate.Count() > 0) if (emailTemplate.Count() > 0)
{ {
string departLeader = string.Empty; string delegatedRepresentative = string.Empty;//部门代理人
string departmentLeader = string.Empty;//部门经理
var depart = BLL.DepartService.GetDepartById(drpUserDep.SelectedValue); var depart = BLL.DepartService.GetDepartById(drpUserDep.SelectedValue);
if (depart != null) if (depart != null)
{ {
departLeader = depart.DepartLeader; delegatedRepresentative = depart.DelegatedRepresentative;
departmentLeader = depart.DepartLeader;
} }
if (!string.IsNullOrEmpty(departLeader)) if (!string.IsNullOrEmpty(delegatedRepresentative))
{ {
var userTo = from x in Funs.DB.Sys_User var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(departLeader) && x.Email != null && x.Email != "" where x.UserId.Contains(delegatedRepresentative) && x.Email != null && x.Email != ""
select x; select x;
if (userTo != null) if (userTo != null)
{ {
mailTo = userTo.Select(x => x.Email).ToArray(); mailTo = userTo.Select(x => x.Email).ToArray();
} }
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector) || x.UserId.Contains(departmentLeader))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
}
else
{
if(!string.IsNullOrEmpty(departmentLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(departmentLeader) && x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
} }
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
if (mailTo.Length > 0) if (mailTo.Length > 0)
{ {
NameValueCollection myPram = new NameValueCollection(); NameValueCollection myPram = new NameValueCollection();

4
FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
View File

@ -834,7 +834,7 @@ namespace FineUIPro.Web.Evaluation
if (punish != null) if (punish != null)
{ {
punish.IsUserEvaluated = true; punish.IsUserEvaluated = true;
punish.IsUserEvaluatedTime = DateTime.Now; //punish.IsUserEvaluatedTime = DateTime.Now;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
@ -966,7 +966,7 @@ namespace FineUIPro.Web.Evaluation
if (punish != null) if (punish != null)
{ {
punish.IsDepEvaluated = true; punish.IsDepEvaluated = true;
punish.IsDepEvaluatedTime = DateTime.Now; //punish.IsDepEvaluatedTime = DateTime.Now;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

51
FCL/FineUIPro.Web/Global.asax.cs
View File

@ -47,7 +47,7 @@
} }
//每月（2，5，8，10）邮件自动发送给SSR提交人员和主协调人及合同员，用户代表等评价 //每月（2，5，8，10）邮件自动发送给SSR提交人员和主协调人及合同员，用户代表等评价
if ((DateTime.Now.Day == 2 || DateTime.Now.Day == 5 || DateTime.Now.Day == 8 || DateTime.Now.Day == 10) && DateTime.Now.Hour == 9) if ((DateTime.Now.Day == 2 || DateTime.Now.Day == 5 || DateTime.Now.Day == 8 || DateTime.Now.Day == 10) && DateTime.Now.Hour == 8)
{ {
System.Timers.Timer aTimer = new System.Timers.Timer(); System.Timers.Timer aTimer = new System.Timers.Timer();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_Elapsed); aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_Elapsed);
@ -1754,9 +1754,9 @@
} }
#endregion #endregion
# region 承包商报告主协调员提交后通知承包商联系人，若无异议或3天未操作，发送邮件给用户部门经理 # region 承包商报告主协调员提交后通知承包商联系人，若无异议或3天未操作，发送邮件给用户部门（有部门代理人发送给部门代理人抄送给部门经理，无部门代理人发送则发送给部门经理）
/// <summary> /// <summary>
/// 承包商报告主协调员提交后通知承包商联系人，若无异议或3天未操作，发送邮件给用户部门经理 /// 承包商报告主协调员提交后通知承包商联系人，若无异议或3天未操作，发送邮件给用户部门（有部门代理人发送给部门代理人抄送给部门经理，无部门代理人发送则发送给部门经理）
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
@ -1791,6 +1791,7 @@
string[] mailCC = null; string[] mailCC = null;
string resultMessage = ""; string resultMessage = "";
string departLeader = string.Empty; string departLeader = string.Empty;
string delegatedRepresentative = string.Empty;
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知")); var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知"));
if (emailTemplate.Count() > 0) if (emailTemplate.Count() > 0)
@ -1799,26 +1800,50 @@
if (depart != null) if (depart != null)
{ {
departLeader = depart.DepartLeader; departLeader = depart.DepartLeader;
delegatedRepresentative = depart.DelegatedRepresentative;
} }
if (!string.IsNullOrEmpty(departLeader)) if (!string.IsNullOrEmpty(delegatedRepresentative))
{ {
var userTo = from x in Funs.DB.Sys_User var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(departLeader) && x.Email != null && x.Email != "" where x.UserId.Contains(delegatedRepresentative) && x.Email != null && x.Email != ""
select x; select x;
if (userTo != null) if (userTo != null)
{ {
mailTo = userTo.Select(x => x.Email).ToArray(); mailTo = userTo.Select(x => x.Email).ToArray();
} }
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == pun.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector) || x.UserId.Contains(departLeader))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
}
else
{
if (!string.IsNullOrEmpty(departLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(departLeader) && x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == pun.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
} }
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == pun.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
if (mailTo.Length > 0) if (mailTo.Length > 0)
{ {
NameValueCollection myPram = new NameValueCollection(); NameValueCollection myPram = new NameValueCollection();

24
FCL/Model/Model.cs
View File

@ -1739,6 +1739,8 @@ namespace Model
private string _DepartLeader; private string _DepartLeader;
private string _DelegatedRepresentative;
private EntitySet<EMC_CTSalesContracts> _EMC_CTSalesContracts; private EntitySet<EMC_CTSalesContracts> _EMC_CTSalesContracts;
private EntitySet<EMC_CTSalesContracts> _Depart; private EntitySet<EMC_CTSalesContracts> _Depart;
@ -1763,6 +1765,8 @@ namespace Model
partial void OnRemarkChanged(); partial void OnRemarkChanged();
partial void OnDepartLeaderChanging(string value); partial void OnDepartLeaderChanging(string value);
partial void OnDepartLeaderChanged(); partial void OnDepartLeaderChanged();
partial void OnDelegatedRepresentativeChanging(string value);
partial void OnDelegatedRepresentativeChanged();
#endregion #endregion
public Base_Depart() public Base_Depart()
@ -1875,6 +1879,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegatedRepresentative", DbType="NVarChar(50)")]
public string DelegatedRepresentative
{
get
{
return this._DelegatedRepresentative;
}
set
{
if ((this._DelegatedRepresentative != value))
{
this.OnDelegatedRepresentativeChanging(value);
this.SendPropertyChanging();
this._DelegatedRepresentative = value;
this.SendPropertyChanged("DelegatedRepresentative");
this.OnDelegatedRepresentativeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_CTSalesContracts_Base_Depart", Storage="_EMC_CTSalesContracts", ThisKey="DepartId", OtherKey="DeptOfRevenue", DeleteRule="NO ACTION")] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_CTSalesContracts_Base_Depart", Storage="_EMC_CTSalesContracts", ThisKey="DepartId", OtherKey="DeptOfRevenue", DeleteRule="NO ACTION")]
public EntitySet<EMC_CTSalesContracts> EMC_CTSalesContracts public EntitySet<EMC_CTSalesContracts> EMC_CTSalesContracts
{ {