冗余代码清理

This commit is contained in:
2026-06-15 19:05:39 +08:00
parent 1fd3ca5094
commit eacb45828c
57 changed files with 134 additions and 31930 deletions
+1 -1
View File
@@ -16,7 +16,7 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpSEDINUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
<f:DropDownList ID="drpUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
Required="true" ShowRedStar="true" LabelWidth="110px" >
</f:DropDownList>
<f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" AutoPostBack="true" OnSelectedIndexChanged="drpWorkPost_SelectedIndexChanged">
@@ -30,14 +30,14 @@ namespace FineUIPro.Web.Person
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
this.DutyId = Request.Params["DutyId"];
if (!string.IsNullOrEmpty(this.DutyId)) {
var PersonDuty = BLL.Person_DutyService.GetPersonDutyById(this.DutyId);
if (PersonDuty != null) {
if (!string.IsNullOrEmpty(PersonDuty.DutyPersonId)) {
this.drpSEDINUser.SelectedValue=PersonDuty.DutyPersonId;
this.drpUser.SelectedValue=PersonDuty.DutyPersonId;
}
if (!string.IsNullOrEmpty(PersonDuty.WorkPostId)) {
this.drpWorkPost.SelectedValue = PersonDuty.WorkPostId;
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.Person
private void SaveData(string type)
{
if (this.drpSEDINUser.SelectedValue == BLL.Const._Null)
if (this.drpUser.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择员工", MessageBoxIcon.Warning);
return;
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.Person
}
Model.Person_Duty PersonDuty = new Model.Person_Duty
{
DutyPersonId = this.drpSEDINUser.SelectedValue,
DutyPersonId = this.drpUser.SelectedValue,
CompilePersonId = CurrUser.UserId,
CompileTime = DateTime.Now,
WorkPostId=this.drpWorkPost.SelectedValue,
@@ -124,10 +124,10 @@ namespace FineUIPro.Web.Person
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
protected void drpSEDINUser_SelectedIndexChanged(object sender, EventArgs e)
protected void drpUser_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpSEDINUser.SelectedValue != BLL.Const._Null) {
var getUser = BLL.UserService.GetUserByUserId(drpSEDINUser.SelectedValue);
if (drpUser.SelectedValue != BLL.Const._Null) {
var getUser = BLL.UserService.GetUserByUserId(drpUser.SelectedValue);
if (getUser != null) {
this.drpWorkPost.SelectedValue = getUser.WorkPostId;
if (this.drpWorkPost.SelectedValue != null) {
+18 -16
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Person {
public partial class PersonDutyAdd {
namespace FineUIPro.Web.Person
{
public partial class PersonDutyAdd
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,16 +40,16 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpSEDINUser 控件。
/// drpUser 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSEDINUser;
protected global::FineUIPro.DropDownList drpUser;
/// <summary>
/// drpWorkPost 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPost;
/// <summary>
/// txtTemplate 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtTemplate;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnClose 控件。
/// </summary>
@@ -16,7 +16,7 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpSEDINUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
<f:DropDownList ID="drpUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
Required="true" ShowRedStar="true" LabelWidth="110px" AutoPostBack="true" Readonly="true">
</f:DropDownList>
<f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" Readonly="true">
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.Person
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
BLL.UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, Const.Depart_constructionId,true);
this.DutyId = Request.Params["DutyId"];
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.Person
var PersonDuty = BLL.Person_DutyService.GetPersonDutyById(this.DutyId);
if (PersonDuty != null) {
if (!string.IsNullOrEmpty(PersonDuty.DutyPersonId)) {
this.drpSEDINUser.SelectedValue=PersonDuty.DutyPersonId;
this.drpUser.SelectedValue=PersonDuty.DutyPersonId;
}
if (!string.IsNullOrEmpty(PersonDuty.WorkPostId)) {
this.drpWorkPost.SelectedValue = PersonDuty.WorkPostId;
+21 -19
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Person {
public partial class PersonDutyEdit {
namespace FineUIPro.Web.Person
{
public partial class PersonDutyEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,16 +40,16 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpSEDINUser 控件。
/// drpUser 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSEDINUser;
protected global::FineUIPro.DropDownList drpUser;
/// <summary>
/// drpWorkPost 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPost;
/// <summary>
/// txtTemplate 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtTemplate;
/// <summary>
/// IsAgree 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow IsAgree;
/// <summary>
/// rdbIsAgree 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rdbIsAgree;
/// <summary>
/// BackMan 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow BackMan;
/// <summary>
/// drpHandleMan 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHandleMan;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSubmit 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnClose 控件。
/// </summary>
@@ -15,7 +15,7 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpSEDINUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
<f:DropDownList ID="drpUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
Required="true" ShowRedStar="true" LabelWidth="110px" AutoPostBack="true" Readonly="true">
</f:DropDownList>
<f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" Readonly="true">
@@ -14,7 +14,7 @@ namespace FineUIPro.Web.Person
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
string DutyId = Request.Params["DutyId"];
if (!string.IsNullOrEmpty(DutyId))
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.Person
{
if (!string.IsNullOrEmpty(PersonDuty.DutyPersonId))
{
this.drpSEDINUser.SelectedValue = PersonDuty.DutyPersonId;
this.drpUser.SelectedValue = PersonDuty.DutyPersonId;
}
if (!string.IsNullOrEmpty(PersonDuty.WorkPostId))
{
+16 -14
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Person {
public partial class PersonDutyView {
namespace FineUIPro.Web.Person
{
public partial class PersonDutyView
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,16 +40,16 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpSEDINUser 控件。
/// drpUser 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSEDINUser;
protected global::FineUIPro.DropDownList drpUser;
/// <summary>
/// drpWorkPost 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPost;
/// <summary>
/// txtTemplate 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtTemplate;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Person {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnClose 控件。
/// </summary>
+1 -1
View File
@@ -51,7 +51,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim()))
@@ -90,7 +90,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
{
@@ -82,7 +82,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId;
if (personIds.Count() > 0)
@@ -83,7 +83,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId;
if (personIds.Count() > 0)
+1 -1
View File
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.Person
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
+ @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
{
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.Person
+ @" From dbo.Sys_User AS Users"
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId"
+ @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
+ @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
{