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

冗余代码清理

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DigData/HSEDataCollect.aspx.cs
+6 -16
View File
@@ -122,16 +122,6 @@ namespace FineUIPro.Web.DigData
protected void btnRefresh_Click(object sender, EventArgs e)
{
int year = Funs.GetNewInt(this.drpYear.SelectedValue) ?? DateTime.Now.Year;
var getSeDin_MonthReports = from x in Funs.DB.SeDin_MonthReport
where x.States == Const.State_3 && x.ReporMonth.Value.Year == year
select x;
if (getSeDin_MonthReports.Count() > 0)
{
foreach (var item in getSeDin_MonthReports)
{
BLL.HSEDataCollectService.SaveHSEDataCollectItem(item);
}
}
this.BindGrid();
this.BindGrid2();
ShowNotify("刷新完成！", MessageBoxIcon.Success);
@@ -146,12 +136,12 @@ namespace FineUIPro.Web.DigData
var getSubmission = Funs.DB.DigData_HSEDataCollectSubmission.FirstOrDefault(x => x.HSEDataCollectSubmissionId == e.RowID);
if (getSubmission != null)
{
var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.ReporMonth.Value.Year == year.Value && x.ReporMonth.Value.Month == month.Value && x.ProjectId == getSubmission.ProjectId);
if (getMont != null)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Manager/ManagerMonth_SeDinEdit.aspx?MonthReportId={0}&projectId={1}", getMont.MonthReportId, getMont.ProjectId, "查看 - ")));
//PrinterDocService.PrinterDocMethod(Const.ProjectManagerMonth_SeDinMenuId, getMont.MonthReportId, "安全月报");
}
//var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.ReporMonth.Value.Year == year.Value && x.ReporMonth.Value.Month == month.Value && x.ProjectId == getSubmission.ProjectId);
//if (getMont != null)
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Manager/ManagerMonth_SeDinEdit.aspx?MonthReportId={0}&projectId={1}", getMont.MonthReportId, getMont.ProjectId, "查看 - ")));
// //PrinterDocService.PrinterDocMethod(Const.ProjectManagerMonth_SeDinMenuId, getMont.MonthReportId, "安全月报");
//}
}
}
else
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
-16
View File
@@ -2150,8 +2150,6 @@
<Content Include="HSSE\Manager\HSSELogView.aspx" />
<Content Include="HSSE\Manager\ManagerMonthB.aspx" />
<Content Include="HSSE\Manager\ManagerMonthC.aspx" />
<Content Include="HSSE\Manager\ManagerMonth_SeDin.aspx" />
<Content Include="HSSE\Manager\ManagerMonth_SeDinEdit.aspx" />
<Content Include="HSSE\Manager\ManagerWeek.aspx" />
<Content Include="HSSE\Manager\ManagerWeekEdit.aspx" />
<Content Include="HSSE\Manager\ManagerWeekView.aspx" />
@@ -14792,20 +14790,6 @@
<Compile Include="HSSE\Manager\ManagerMonthC.aspx.designer.cs">
<DependentUpon>ManagerMonthC.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonth_SeDin.aspx.cs">
<DependentUpon>ManagerMonth_SeDin.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonth_SeDin.aspx.designer.cs">
<DependentUpon>ManagerMonth_SeDin.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonth_SeDinEdit.aspx.cs">
<DependentUpon>ManagerMonth_SeDinEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\Manager\ManagerMonth_SeDinEdit.aspx.designer.cs">
<DependentUpon>ManagerMonth_SeDinEdit.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\Manager\ManagerWeek.aspx.cs">
<DependentUpon>ManagerWeek.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx
-139
View File
@@ -1,139 +0,0 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ManagerMonth_SeDin.aspx.cs" Inherits="FineUIPro.Web.HSSE.Manager.ManagerMonth_SeDin" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>月报</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css">
.LabelColor
{
color: Red;
font-size:small;
}
.f-grid-row.Green
{
background-color: LightGreen;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="月报" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="MonthReportId" DataIDField="MonthReportId"
AllowSorting="true" SortField="ReporMonth" SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" >
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="月份" ID="txtReporMonth" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
LabelAlign="right">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DatePicker runat="server" DateFormatString="yyyy-MM" Label="月报月份" EmptyText="请选择年月"
ID="txtMonth" LabelAlign="right" DisplayType="Month" ShowTodayButton="false">
</f:DatePicker>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server"
OnClick="btnNew_Click" Hidden="true">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="85px" ColumnID="ReporMonth" DataField="ReporMonth" SortField="ReporMonth"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StartDate" DataField="StartDate" SortField="StartDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="开始日期"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="EndDate" DataField="EndDate" SortField="EndDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="结束日期"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DueDate" DataField="DueDate" SortField="DueDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="截止日期"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
SortField="ReportManName" FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="AuditManName" DataField="AuditManName"
SortField="ReportManName" FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ApprovalManName" DataField="ApprovalManName"
SortField="ReportManName" FieldType="String" HeaderText="批准人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="StateName" DataField="StateName"
SortField="StateName" FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<%-- <f:RenderField Width="250px" ColumnID="ThisSummary" DataField="ThisSummary"
FieldType="String" HeaderText="本月HSE活动综述" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
<%-- <f:RenderField Width="250px" ColumnID="NextPlan" DataField="NextPlan" ExpandUnusedSpace="true"
FieldType="String" HeaderText="下月HSE工作计划" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
<%-- <f:Label ID="Label2" runat="server" Text="说明：绿色-未冻结；白色-已冻结。" CssClass="LabelColor"></f:Label>--%>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编辑月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
Text="编辑" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
</f:MenuButton>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
-281
View File
@@ -1,281 +0,0 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.HSSE.Manager
{
public partial class ManagerMonth_SeDin : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
#endregion
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
////权限按钮方法
this.GetButtonPower();
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
this.BindGrid();
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT mr.MonthReportId,mr.ProjectId,mr.DueDate,mr.StartDate,mr.EndDate,mr.ReporMonth,mr.CompileManId,CompileMan.UserName AS CompileManName,mr.AuditManId
,AuditMan.UserName AS AuditManName,mr.ApprovalManId,mr.AuditManId,ApprovalMan.UserName AS ApprovalManName,mr.ThisSummary,mr.NextPlan,mr.States
,(CASE WHEN mr.States='0' THEN '待['+ (CASE WHEN nextMan.UserName IS NULL THEN CompileMan.UserName ELSE nextMan.UserName END) +']提交'
WHEN mr.States='1' OR mr.States='2' THEN '待['+nextMan.UserName+']审核'
WHEN mr.States='3' THEN '已完成'
ELSE '待['+(CASE WHEN nextMan.UserName IS NULL THEN CompileMan.UserName ELSE nextMan.UserName END)+']提交' END) AS StateName
FROM dbo.SeDin_MonthReport AS mr
LEFT JOIN Sys_User AS CompileMan on mr.CompileManId = CompileMan.UserId
LEFT JOIN Sys_User AS AuditMan on mr.AuditManId = AuditMan.UserId
LEFT JOIN Sys_User AS ApprovalMan on mr.ApprovalManId = ApprovalMan.UserId
LEFT JOIN Sys_User AS nextMan on mr.NextManId = nextMan.UserId
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND mr.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
if (!string.IsNullOrEmpty(this.txtReporMonth.Text.Trim()))
{
strSql += " AND mr.ReporMonth LIKE @ReporMonth";
listStr.Add(new SqlParameter("@ReporMonth", "%" + this.txtReporMonth.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
#region 表排序、分页、关闭窗口
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
BindGrid();
}
/// <summary>
/// 关闭弹出窗
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
#region Grid双击事件
/// <summary>
/// Grid行双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
btnMenuModify_Click(null, null);
}
#endregion
#region 编辑
/// <summary>
/// 编辑按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuModify_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string MonthReportId = Grid1.SelectedRowID;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ManagerMonth_SeDinEdit.aspx?MonthReportId={0}", MonthReportId, "编辑 - ")));
}
#endregion
#region 删除
/// <summary>
/// 批量删除
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuDel_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length > 0)
{
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var mont = ManagerMonth_SeDinService.GetMonthReportByMonthReportId(rowID);
if (mont != null)
{
BLL.HSEDataCollectService.DeleteHSEDataCollectItem(mont);
LogService.AddSys_Log(this.CurrUser, mont.ReporMonth.ToString(), mont.MonthReportId, BLL.Const.ProjectManagerMonth_SeDinMenuId, BLL.Const.BtnDelete);
ManagerMonth_SeDinService.DeleteMonthReportByMonthReportId(rowID);
}
}
BindGrid();
ShowNotify("删除数据成功!（表格数据已重新绑定）");
}
}
#endregion
#region 新增
/// <summary>
/// 新增
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (string.IsNullOrWhiteSpace(txtMonth.Text.Trim())) {
Alert.ShowInTop("请输入您要添加的月份！", MessageBoxIcon.Warning);
return;
}
if (ManagerMonth_SeDinService.GetMonthReportByDate(Convert.ToDateTime(txtMonth.Text.Trim()), this.ProjectId))
{
Alert.ShowInTop("当前月份的月报已存在！", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ManagerMonth_SeDinEdit.aspx?Month={0}", txtMonth.Text.Trim()), "添加月报表"));
}
#endregion
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
/// </summary>
/// <param name="button"></param>
/// <returns></returns>
private void GetButtonPower()
{
if (Request.Params["value"] == "0")
{
return;
}
var buttonList = CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectManagerMonth_SeDinMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(Const.BtnAdd))
{
this.btnNew.Hidden = false;
}
if (buttonList.Contains(Const.BtnModify))
{
this.btnMenuModify.Hidden = false;
}
if (buttonList.Contains(Const.BtnDelete))
{
this.btnMenuDel.Hidden = false;
}
}
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("管理月报" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
#endregion
protected void btnPrinter_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
PrinterDocService.PrinterDocMethod(Const.ProjectManagerMonth_SeDinMenuId, Grid1.SelectedRowID, "安全月报");
}
}
}
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.designer.cs
Generated
-195
View File
@@ -1,195 +0,0 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Manager {
public partial class ManagerMonth_SeDin {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtReporMonth 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtReporMonth;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// txtMonth 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMonth;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnPrinter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnPrinter;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDel;
}
}
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx
-1299
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
-1382
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.designer.cs
Generated
-2526
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx
+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">
SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.cs
+7 -7
View File
@@ -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) {
SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.designer.cs
Generated
+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>
SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx
+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" AutoPostBack="true" Readonly="true">
</f:DropDownList>
<f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" Readonly="true">
SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.cs
+2 -2
View File
@@ -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;
SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.designer.cs
Generated
+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>
SGGL/FineUIPro.Web/Person/PersonDutyView.aspx
+1 -1
View File
@@ -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">
SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.cs
+2 -2
View File
@@ -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))
{
SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.designer.cs
Generated
+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>
SGGL/FineUIPro.Web/Person/PersonSet.aspx.cs
+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()))
SGGL/FineUIPro.Web/Person/PersonTrainingAdd.aspx.cs
+1 -1
View File
@@ -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)
{
SGGL/FineUIPro.Web/Person/PersonTrainingEdit.aspx.cs
+1 -1
View File
@@ -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)
SGGL/FineUIPro.Web/Person/PersonTrainingView.aspx.cs
+1 -1
View File
@@ -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)
SGGL/FineUIPro.Web/Person/Shunt.aspx.cs
+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)
{
SGGL/FineUIPro.Web/Person/ShuntDetailEdit.aspx.cs
+1 -1
View File
@@ -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)
{
SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs
+1 -1
View File
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.Personal
+ @" LEFT JOIN Base_Unit as units on users.UnitId=units.UnitId"
+ @" LEFT JOIN Project_ProjectUser as ProjectUser on ProjectUser.UserId=sysLog.UserId and ProjectUser.ProjectId=sysLog.ProjectId"
+ @" LEFT JOIN Base_Project as Project on sysLog.ProjectId=Project.ProjectId"
+ @" WHERE sysLog.UserId != '" + Const.hfnbdId + "' AND sysLog.UserId !='" + Const.sedinId + "'";
+ @" WHERE sysLog.UserId != '" + Const.hfnbdId + "'";
List<SqlParameter> listStr = new List<SqlParameter>();
//if (this.CurrUser.UserId != BLL.Const.sysglyId)
//{