zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据穿透

This commit is contained in:
李超 2023-06-09 14:28:23 +08:00
parent 72f0109f93
commit 1c8c630c21
13 changed files with 362 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataBase/版本日志/SGGLDB_CD_V2023-06-09-001.sql
View File

@ -9,3 +9,12 @@ INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName],
INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'11F44E2B-F3EB-4189-B324-69DB226CF39B', N'D12C2412-E12A-4F78-9AEF-1EE8AC84A561', N'ÐÞ¸Ä', '2');
INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'826C9DEB-7A48-4B70-9312-FC5D0D5D2555', N'D12C2412-E12A-4F78-9AEF-1EE8AC84A561', N'ɾ³ý', '3');
INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'C4A17D4C-25A7-4F37-B6CF-F07526AECBC2', N'D12C2412-E12A-4F78-9AEF-1EE8AC84A561', N'±£´æ', '4');
INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'8ed133de-5899-4687-878a-20b1f5280f18', N'人员报验', NULL, N'CQMS/Comprehensive/InspectionPerson.aspx', '20', N'4a0e62cb-ee50-4a14-80b7-377602e9902c', N'Menu_CQMS', '0', '1', '1');
INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'99972f90-f71e-496b-948e-14a60d369652', N'8ed133de-5899-4687-878a-20b1f5280f18', N'增加', '1');
INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'd1c27c9f-ab4a-4d0a-a1a8-4c43b7d93707', N'8ed133de-5899-4687-878a-20b1f5280f18', N'修改', '2');
INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'db5f68ba-d58d-46e7-8e60-c6237c93140f', N'8ed133de-5899-4687-878a-20b1f5280f18', N'删除', '3');
INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) VALUES (N'0a2cb532-cf99-4b47-a8a9-66289bde6be0', N'8ed133de-5899-4687-878a-20b1f5280f18', N'保存', '4');

4
SGGL/BLL/BaseInfo/WorkPostService.cs
View File

@ -19,12 +19,10 @@ namespace BLL
{
return Funs.DB.Base_WorkPost.FirstOrDefault(e => e.WorkPostId == workPostId);
}
public static Model.Base_WorkPost GetWorkPostByName(string name)
{
return Funs.DB.Base_WorkPost.FirstOrDefault(e => e.WorkPostName == name);
}
/// <summary>
/// 添加
/// </summary>
@ -39,6 +37,7 @@ namespace BLL
WorkPostName = workPost.WorkPostName,
PostType = workPost.PostType,
IsHsse = workPost.IsHsse,
IsCQMS = workPost.IsCQMS,
CNCodes = workPost.CNCodes,
Remark = workPost.Remark
};
@ -61,6 +60,7 @@ namespace BLL
newWorkPost.WorkPostName = workPost.WorkPostName;
newWorkPost.PostType = workPost.PostType;
newWorkPost.IsHsse = workPost.IsHsse;
newWorkPost.IsCQMS = workPost.IsCQMS;
newWorkPost.CNCodes = workPost.CNCodes;
newWorkPost.Remark = workPost.Remark;
db.SubmitChanges();

29
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx
View File

@ -24,10 +24,10 @@
<f:TextBox runat="server" Label="名称" ID="txtKey" EmptyText="输入查询条件"
AutoPostBack="true" Width="200px" LabelWidth="50px"></f:TextBox>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
@ -51,6 +51,10 @@
RendererFunction="renderIsHsse" HeaderText="安管人员" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsCQMS" DataField="IsCQMS" FieldType="Boolean"
RendererFunction="renderIsHsse" HeaderText="质量管理" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="120px" HeaderText="对口专业" HeaderTextAlign="Center" TextAlign="Center" >
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# ConvertCNCodes(Eval("CNCodes")) %>'></asp:Label>
@ -83,8 +87,9 @@
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="80px" BodyPadding="5px" Width="350px">
<Items>
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="hfFormID" Hidden="true"
runat="server" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpWorkPostCode" runat="server" Label="编号" LabelAlign="Right" Required="true"
ShowRedStar="true" LabelWidth="80px">
</f:DropDownList>
@ -95,7 +100,9 @@
<f:DropDownList ID="drpPostType" runat="server" Label="类型" LabelAlign="Right" Required="true"
ShowRedStar="true" LabelWidth="80px">
</f:DropDownList>
<f:CheckBox ID="ckbIsHsse" runat="server" Label="安管" LabelAlign="Right" LabelWidth="80px">
<f:CheckBox ID="ckbIsHsse" runat="server" Label="安管人员" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:CheckBox ID="ckbIsCQMS" runat="server" Label="质量管理" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:DropDownBox runat="server" Label="对口专业" ID="txtCNCodes" EmptyText="--请选择--" EnableMultiSelect="true" MatchFieldWidth="true" LabelWidth="80px">
<PopPanel>
@ -118,24 +125,26 @@
</f:Label>
<f:Label ID="Label2" runat="server" Text="1、若选中安管人员即为安全专职人员；">
</f:Label>
<f:Label ID="Label3" runat="server" Text="2、特种作业人员和一般作业岗位为单位作业人员。">
<f:Label ID="Label5" runat="server" Text="2、若选中质量管理即为质量管理人员；">
</f:Label>
<f:Label ID="Label3" runat="server" Text="3、特种作业人员和一般作业岗位为单位作业人员。">
</f:Label>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server">
<Items>
<f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" Hidden="true"
<f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" Hidden="true" Text="新增"
runat="server">
<Listeners>
<f:Listener Event="click" Handler="onNewButtonClick" />
</Listeners>
</f:Button>
<f:Button ID="btnDelete" Enabled="false" ToolTip="删除" Icon="Delete" ConfirmText="确定删除当前数据？"
<f:Button ID="btnDelete" Enabled="false" ToolTip="删除" Icon="Delete" ConfirmText="确定删除当前数据？" Text="删除"
Hidden="true" OnClick="btnDelete_Click" runat="server">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Text="保存"
Hidden="true" OnClick="btnSave_Click">
</f:Button>
</Items>
@ -177,6 +186,7 @@
var txtNameClientID = '<%= txtWorkPostName.ClientID %>';
var drpPostTypeClientID = '<%= drpPostType.ClientID %>';
var ckbIsHsseClientID = '<%= ckbIsHsse.ClientID %>';
var ckbIsCQMSClientID = '<%= ckbIsCQMS.ClientID %>';
var txtCNCodesClientID = '<%= txtCNCodes.ClientID %>';
var txtRemarkClientID = '<%=txtRemark.ClientID %>';
@ -194,6 +204,7 @@
F(txtNameClientID).setValue(rowValue['WorkPostName']);
F(drpPostTypeClientID).setValue(rowValue['PostType']);
F(ckbIsHsseClientID).setValue(rowValue['IsHsse']);
F(ckbIsCQMSClientID).setValue(rowValue['IsCQMS']);
F(txtCNCodesClientID).setValue(rowValue['CNCodes']);
F(txtRemarkClientID).setValue(rowValue['Remark']);

24
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.cs
View File

@ -38,7 +38,7 @@ namespace FineUIPro.Web.BaseInfo
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.CNCodes,
string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,wp.CNCodes,
case wp.IsHsse when 1 then '是' else '否' end as IsHsseStr,const.ConstText as PostTypeName
FROM dbo.Base_WorkPost AS wp
LEFT JOIN Sys_Const AS const ON const.ConstValue = wp.PostType and const.GroupId = '" + ConstValue.Group_PostType + "' ";
@ -109,8 +109,15 @@ namespace FineUIPro.Web.BaseInfo
protected void btnDelete_Click(object sender, EventArgs e)
{
BLL.LogService.AddSys_Log(this.CurrUser, this.drpWorkPostCode.SelectedValue, hfFormID.Text, BLL.Const.WorkPostMenuId, BLL.Const.BtnDelete);
BLL.WorkPostService.DeleteWorkPostById(hfFormID.Text);
if (hfFormID.Text != BLL.Const.WorkPost_HSSEDirector && hfFormID.Text != BLL.Const.WorkPost_ProjectHSSEDirector)
{
BLL.WorkPostService.DeleteWorkPostById(hfFormID.Text);
}
else
{
Alert.ShowInTop("内置岗位，无法删除！", MessageBoxIcon.Warning);
return;
}
// 重新绑定表格，并模拟点击[新增按钮]
BindGrid();
PageContext.RegisterStartupScript("onNewButtonClick();");
@ -180,6 +187,10 @@ namespace FineUIPro.Web.BaseInfo
{
this.ckbIsHsse.Checked = true;
}
if (workPost.IsCQMS == true)
{
this.ckbIsCQMS.Checked = true;
}
if (!string.IsNullOrEmpty(workPost.CNCodes))
{
txtCNCodes.Values = workPost.CNCodes.Split(',');
@ -215,6 +226,12 @@ namespace FineUIPro.Web.BaseInfo
ShowNotify("请选择类型！", MessageBoxIcon.Warning);
return;
}
var q2 = Funs.DB.Base_WorkPost.FirstOrDefault(x => x.WorkPostName == this.txtWorkPostName.Text.Trim() && (x.WorkPostId != hfFormID.Text || (hfFormID.Text == null && x.WorkPostId != null)));
if (q2 != null)
{
ShowNotify("输入的岗位名称已存在！", MessageBoxIcon.Warning);
return;
}
string strRowID = hfFormID.Text;
Model.Base_WorkPost newWorkPost = new Model.Base_WorkPost
{
@ -222,6 +239,7 @@ namespace FineUIPro.Web.BaseInfo
WorkPostName = this.txtWorkPostName.Text.Trim(),
PostType = this.drpPostType.SelectedValue,
IsHsse = Convert.ToBoolean(this.ckbIsHsse.Checked),
IsCQMS = Convert.ToBoolean(this.ckbIsCQMS.Checked),
CNCodes = string.Join(",", txtCNCodes.Values),
Remark = txtRemark.Text.Trim()
};

96
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs generated
View File

@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo
{
public partial class WorkPost
{
namespace FineUIPro.Web.BaseInfo {
public partial class WorkPost {
/// <summary>
/// form1 控件。
/// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -58,7 +56,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtKey 控件。
/// </summary>
@ -67,7 +65,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtKey;
/// <summary>
/// btnQuery 控件。
/// </summary>
@ -76,7 +74,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnOut 控件。
/// </summary>
@ -85,7 +83,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Label1 控件。
/// </summary>
@ -94,7 +92,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label4 控件。
/// </summary>
@ -103,7 +101,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -112,7 +110,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -121,7 +119,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -130,7 +128,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -139,7 +137,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm1;
/// <summary>
/// hfFormID 控件。
/// </summary>
@ -147,8 +145,8 @@ namespace FineUIPro.Web.BaseInfo
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hfFormID;
protected global::FineUIPro.TextBox hfFormID;
/// <summary>
/// drpWorkPostCode 控件。
/// </summary>
@ -157,7 +155,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPostCode;
/// <summary>
/// txtWorkPostName 控件。
/// </summary>
@ -166,7 +164,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPostName;
/// <summary>
/// drpPostType 控件。
/// </summary>
@ -175,7 +173,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPostType;
/// <summary>
/// ckbIsHsse 控件。
/// </summary>
@ -184,7 +182,16 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsHsse;
/// <summary>
/// ckbIsCQMS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsCQMS;
/// <summary>
/// txtCNCodes 控件。
/// </summary>
@ -193,7 +200,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox txtCNCodes;
/// <summary>
/// gvCNCodes 控件。
/// </summary>
@ -202,7 +209,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvCNCodes;
/// <summary>
/// txtRemark 控件。
/// </summary>
@ -211,7 +218,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// lb1 控件。
/// </summary>
@ -220,7 +227,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lb1;
/// <summary>
/// Label2 控件。
/// </summary>
@ -229,7 +236,16 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
/// <summary>
/// Label3 控件。
/// </summary>
@ -238,7 +254,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -247,7 +263,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -256,7 +272,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
@ -265,7 +281,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -274,7 +290,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -283,7 +299,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -292,7 +308,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@ -301,7 +317,7 @@ namespace FineUIPro.Web.BaseInfo
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

36
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
View File

@ -13,10 +13,10 @@
<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">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量验收" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
EnableTextSelection="True">
@ -61,18 +61,26 @@
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="allcount" DataField="allcount" FieldType="Int"
HeaderText="总项数" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ccount" DataField="ccount" FieldType="Int"
HeaderText="合格数" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ucCount" DataField="ucCount" FieldType="Int"
HeaderText="不合格数" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="rateV" DataField="rateV" FieldType="String" HeaderText="一次验收合格率（%）" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="100px" HeaderText="总项数" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count2" Width="100px" HeaderText="合格数" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="100px" HeaderText="不合格数" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count4" Width="100px" HeaderText="一次验收合格率（%）" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

112
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
View File

@ -25,36 +25,22 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
}
}
#endregion
#region 加载页面
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string strSql = @"select NEWID() as ID, v.ProjectId,v.ProjectCode,v.ProjectName,v.allcount,v.ccount,isnull(v.allCount,0)-ISNULL(v.cCount,0) as ucCount,
(case when isnull(v.allCount,0) > 0 then cast((isnull(v.allCount,0)-ISNULL(v.cCount,0)) *1.0 /isnull(v.allCount,0)*100 as decimal(18, 2))
else 0 end) as rateV
from (select B.ProjectId,p.ProjectCode,p.ProjectName,COUNT(*) as allCount,
isnull((select COUNT(*)
from ProcessControl_InspectionManagementDetail AS Detail
LEFT JOIN WBS_BreakdownProject AS Breakp ON Detail.ControlPointType=Breakp.BreakdownProjectId
LEFT JOIN ProcessControl_InspectionManagement AS Inspection ON Detail.InspectionId=Inspection.InspectionId
where Breakp.CheckAcceptType =@type AND Inspection.IsOnceQualified = 1
group by Breakp.ProjectId),0) as cCount
FROM ProcessControl_InspectionManagementDetail AS A
LEFT JOIN WBS_BreakdownProject AS B ON A.ControlPointType=B.BreakdownProjectId
left join Base_Project as p on B.ProjectId=p.ProjectId
where p.projectId is not null AND B.CheckAcceptType =@type ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@type", this.rbType.SelectedValue));
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND B.projectId = @projectId"; ///状态为已完成
strSql += " AND projectId = @projectId"; ///状态为已完成
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
}
@ -62,13 +48,17 @@ namespace FineUIPro.Web.DataShow
//{
// strSql += " AND h.RegisterDate >=@StartTime";
// listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
// cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
//}
//if (!string.IsNullOrEmpty(this.txtEndTime.Text))
//{
// strSql += " AND h.RegisterDate <=@EndTime";
// listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
strSql += " group by B.ProjectId,p.ProjectCode,p.ProjectName) as v";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@ -76,7 +66,6 @@ namespace FineUIPro.Web.DataShow
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 查询
/// <summary>
@ -132,5 +121,88 @@ namespace FineUIPro.Web.DataShow
BindGrid();
}
#endregion
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.QualityAcceptanceItem> getDataItemLists = from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
join z in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
select new Model.QualityAcceptanceItem
{
InspectionDetailId = x.InspectionDetailId,
ProjectId = z.ProjectId,
CheckAcceptType = z.CheckAcceptType,
IsOnceQualified = y.IsOnceQualified
};
/// <summary>
/// 数量
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected int Count1(object projectId)
{
int cout1 = 0;
if (projectId != null)
{
var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
cout1 = getT.Count();
}
return cout1;
}
/// <summary>
/// 数量
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected int Count2(object projectId)
{
int cout1 = 0;
if (projectId != null)
{
var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
cout1 = getT.Count();
}
return cout1;
}
/// <summary>
/// 数量
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected int Count3(object projectId)
{
int cout1 = 0;
if (projectId != null)
{
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
cout1 = getT1.Count() - getT2.Count();
}
return cout1;
}
/// <summary>
/// 数量
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected string Count4(object projectId)
{
string rate = string.Empty;
if (projectId != null)
{
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
if (getT1.Count() > 0)
{
rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString();
}
}
return rate;
}
}
}

70
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.designer.cs generated
View File

@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow
{
public partial class QualityAcceptance
{
namespace FineUIPro.Web.DataShow {
public partial class QualityAcceptance {
/// <summary>
/// form1 控件。
/// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -58,7 +56,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpProject 控件。
/// </summary>
@ -67,7 +65,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// rbType 控件。
/// </summary>
@ -76,7 +74,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbType;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -85,7 +83,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// labNumber 控件。
/// </summary>
@ -94,7 +92,43 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -103,7 +137,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -112,7 +146,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>

36
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1610,3 +1610,39 @@ IP地址:::1
出错时间:06/08/2023 11:13:04
错误信息开始=====>
错误类型:SqlException
错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT LargerHazard.HazardId,LargerHa' 需要参数 '@ProjectId'，但未提供该参数。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\project\vs\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
在 FineUIPro.Web.HSSE.Solution.LargerHazardList.BindGrid() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardList.aspx.cs:行号 84
在 FineUIPro.Web.HSSE.Solution.LargerHazardList.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardList.aspx.cs:行号 28
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:06/09/2023 10:32:18
出错文件:http://localhost:1295/HSSE/Solution/LargerHazardList.aspx
IP地址:::1
操作人员:JT
出错时间:06/09/2023 10:32:18

1
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
View File

@ -20,6 +20,7 @@
</TreeNode>
<TreeNode id="4a0e62cb-ee50-4a14-80b7-377602e9902c" Text="综合管理" NavigateUrl=""><TreeNode id="6c2c1e5e-1812-4e1c-a683-7125518e28c7" Text="设备材料报验" NavigateUrl="CQMS/Comprehensive/InspectionEquipment.aspx"></TreeNode>
<TreeNode id="318589ea-2367-4e68-905a-9d7957138df5" Text="设计交底管理" NavigateUrl="CQMS/Comprehensive/DesignDetails.aspx"></TreeNode>
<TreeNode id="8ed133de-5899-4687-878a-20b1f5280f18" Text="人员报验" NavigateUrl="CQMS/Comprehensive/InspectionPerson.aspx"></TreeNode>
<TreeNode id="7e628f48-385f-4d52-8063-d0f812514316" Text="NCR管理" NavigateUrl="CQMS/Comprehensive/NCRManagement.aspx"></TreeNode>
<TreeNode id="9ac06df6-b91a-42bb-9a51-5cd59d8733a9" Text="特种设备管理" NavigateUrl="CQMS/Comprehensive/SpecialEquipment.aspx"></TreeNode>
<TreeNode id="49b87812-c07d-4b0e-9909-960e5cd822c7" Text="压力管道管理" NavigateUrl="CQMS/Comprehensive/PressurePipe.aspx"></TreeNode>

3
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -67,6 +67,9 @@
<TreeNode id="C4BD5635-39BC-4DE8-85CF-652B2C33CBB4" Text="文件柜" NavigateUrl=""><TreeNode id="6621CF4A-EAD4-40AF-9FFE-51DA4348C10C" Text="文件柜A(检查类)" NavigateUrl="ZHGL/InformationProject/FileCabinetA.aspx"></TreeNode>
<TreeNode id="DDD1CE30-F8B9-4011-A20F-7AC60B34788C" Text="文件柜B(内业)" NavigateUrl="ZHGL/InformationProject/FileCabinetB.aspx"></TreeNode>
</TreeNode>
<TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
<TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D78C6E54-4240-4E82-B9B5-8ED76CF62981" Text="劳务实名制对接" NavigateUrl=""><TreeNode id="1E451E0C-A125-4117-B8AC-14E74011B52B" Text="同步设置" NavigateUrl="ZHGL/RealName/SynchroSet.aspx"></TreeNode>
<TreeNode id="C0B52610-ED93-4881-AC61-1764C243F84A" Text="基础数据" NavigateUrl="ZHGL/RealName/BasicData.aspx"></TreeNode>
<TreeNode id="F36E6C54-E39F-4032-874D-548EE090A35B" Text="同步记录" NavigateUrl="ZHGL/RealName/SynchroRecord.aspx"></TreeNode>

47
SGGL/Model/CQMS/QualityAcceptanceItem.cs Normal file
View File

@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
public class QualityAcceptanceItem
{
/// <summary>
///
/// </summary>
public string InspectionDetailId
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
///
/// </summary>
public string CheckAcceptType
{
get;
set;
}
/// <summary>
///
/// </summary>
public bool? IsOnceQualified
{
get;
set;
}
}
}

1
SGGL/Model/Model.csproj
View File

@ -181,6 +181,7 @@
<Compile Include="CQMS\NCRStatisc.cs" />
<Compile Include="CQMS\NDTCheckItem.cs" />
<Compile Include="CQMS\PassWelderStatisc.cs" />
<Compile Include="CQMS\QualityAcceptanceItem.cs" />
<Compile Include="CQMS\SteelItem.cs" />
<Compile Include="CQMS\WelderItem.cs" />
<Compile Include="DoorServer\AbsenceDutyItem.cs" />