xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
geh
2026-09-15 10:24:45 +08:00
parent 77f61d7e06
commit 90d03ab5b3
3 changed files with 139 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx
+1 -1
View File
@@ -74,7 +74,7 @@
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center"> TextAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label> <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<%--<f:RenderField Width="200px" ColumnID="InstallationName" DataField="InstallationName" <%--<f:RenderField Width="200px" ColumnID="InstallationName" DataField="InstallationName"
SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx.cs
+57 -10
View File
@@ -71,16 +71,63 @@ namespace FineUIPro.Web.Door
{ {
if (!string.IsNullOrEmpty(this.ProjectId)) if (!string.IsNullOrEmpty(this.ProjectId))
{ {
string strSql = @"SELECT NewID,Record.ProjectId,InstallationName,P.UnitId,U.UnitName,P.PersonName,RecordDate,Record.EmployName // string strSql = @"SELECT NewID,Record.ProjectId,InstallationName,P.UnitId,U.UnitName,P.PersonName,RecordDate,Record.EmployName
,IDCardNo,P.Nation,B.dictName AS NationName ,PostName,WorkIn1,OffDuty1,WorkIn2,OffDuty2,WorkIn3,OffDuty3,ManHours // ,IDCardNo,P.Nation,B.dictName AS NationName ,PostName,WorkIn1,OffDuty1,WorkIn2,OffDuty2,WorkIn3,OffDuty3,ManHours
,T.TeamGroupId,T.TeamGroupName,P.WorkPostId,W.WorkPostName, ManOverHours // ,T.TeamGroupId,T.TeamGroupName,P.WorkPostId,W.WorkPostName, ManOverHours
FROM dbo.t_d_EmployInOutRecord AS Record // FROM dbo.t_d_EmployInOutRecord AS Record
LEFT JOIN SitePerson_Person AS P ON Record.ProjectId=P.ProjectId AND Record.IDCardNo=P.IdentityCard // LEFT JOIN SitePerson_Person AS P ON Record.ProjectId=P.ProjectId AND Record.IDCardNo=P.IdentityCard
LEFT JOIN Base_Unit AS U ON P.UnitId =U.UnitId // LEFT JOIN Base_Unit AS U ON P.UnitId =U.UnitId
LEFT JOIN ProjectData_TeamGroup AS T ON P.TeamGroupId=T.TeamGroupId // LEFT JOIN ProjectData_TeamGroup AS T ON P.TeamGroupId=T.TeamGroupId
LEFT JOIN Base_WorkPost AS W ON P.WorkPostId =W.WorkPostId // LEFT JOIN Base_WorkPost AS W ON P.WorkPostId =W.WorkPostId
LEFT JOIN RealName_BasicData AS B ON B.dictTypeCode='MINZU_TYPE' AND B.dictCode=P.Nation // LEFT JOIN RealName_BasicData AS B ON B.dictTypeCode='MINZU_TYPE' AND B.dictCode=P.Nation
WHERE Record.ProjectId = @ProjectId"; // WHERE Record.ProjectId = @ProjectId";
string strSql = @"
WITH RecordCTE AS (
SELECT
Record.NewID,
Record.ProjectId,
Record.InstallationName,
P.UnitId,
U.UnitName,
P.PersonName,
Record.RecordDate,
Record.EmployName,
Record.IDCardNo,
P.Nation,
B.dictName AS NationName,
Record.PostName,
Record.WorkIn1,
Record.OffDuty1,
Record.WorkIn2,
Record.OffDuty2,
Record.WorkIn3,
Record.OffDuty3,
Record.ManHours,
T.TeamGroupId,
T.TeamGroupName,
P.WorkPostId,
W.WorkPostName,
Record.ManOverHours,
ROW_NUMBER() OVER(PARTITION BY Record.NewID ORDER BY P.PersonName) AS rn
FROM t_d_EmployInOutRecord AS Record
LEFT JOIN SitePerson_Person AS P
ON Record.ProjectId = P.ProjectId
AND Record.IDCardNo = P.IdentityCard
LEFT JOIN Base_Unit AS U
ON P.UnitId = U.UnitId
LEFT JOIN ProjectData_TeamGroup AS T
ON P.TeamGroupId = T.TeamGroupId
LEFT JOIN Base_WorkPost AS W
ON P.WorkPostId = W.WorkPostId
LEFT JOIN RealName_BasicData AS B
ON B.dictTypeCode = 'MINZU_TYPE'
AND B.dictCode = P.Nation
)
SELECT *
FROM RecordCTE
WHERE rn = 1 and ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter> List<SqlParameter> listStr = new List<SqlParameter>
{ {
new SqlParameter("@ProjectId", this.ProjectId) new SqlParameter("@ProjectId", this.ProjectId)
SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx.designer.cs
Generated
+81 -81
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <自动生成> // <auto-generated>
// 此代码由工具生成。 // This code was generated by a tool.
// //
// 对此文件的更改可能导致不正确的行为，如果 // Changes to this file may cause incorrect behavior and will be lost if
// 重新生成代码，则所做更改将丢失。 // the code is regenerated.
// </自动生成> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.Door namespace FineUIPro.Web.Door
@@ -15,227 +15,227 @@ namespace FineUIPro.Web.Door
{ {
/// <summary> /// <summary>
/// form1 控件。 /// form1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1; protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary> /// <summary>
/// PageManager1 控件。 /// PageManager1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.PageManager PageManager1; protected global::FineUIPro.PageManager PageManager1;
/// <summary> /// <summary>
/// Panel1 控件。 /// Panel1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel Panel1; protected global::FineUIPro.Panel Panel1;
/// <summary> /// <summary>
/// panelLeftRegion 控件。 /// panelLeftRegion control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel panelLeftRegion; protected global::FineUIPro.Panel panelLeftRegion;
/// <summary> /// <summary>
/// ContentPanel1 控件。 /// ContentPanel1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1; protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary> /// <summary>
/// ucTree 控件。 /// ucTree control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree; protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary> /// <summary>
/// panelCenterRegion 控件。 /// panelCenterRegion control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel panelCenterRegion; protected global::FineUIPro.Panel panelCenterRegion;
/// <summary> /// <summary>
/// Grid1 控件。 /// Grid1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Grid Grid1; protected global::FineUIPro.Grid Grid1;
/// <summary> /// <summary>
/// Toolbar2 控件。 /// Toolbar2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar2; protected global::FineUIPro.Toolbar Toolbar2;
/// <summary> /// <summary>
/// drpUnit 控件。 /// drpUnit control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpUnit; protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// drpWorkTeam 控件。 /// drpWorkTeam control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpWorkTeam; protected global::FineUIPro.DropDownList drpWorkTeam;
/// <summary> /// <summary>
/// drpWorkPost 控件。 /// drpWorkPost control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpWorkPost; protected global::FineUIPro.DropDownList drpWorkPost;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary> /// <summary>
/// txtStartDate 控件。 /// txtStartDate control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtStartDate; protected global::FineUIPro.DatePicker txtStartDate;
/// <summary> /// <summary>
/// txtEndDate 控件。 /// txtEndDate control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtEndDate; protected global::FineUIPro.DatePicker txtEndDate;
/// <summary> /// <summary>
/// txtName 控件。 /// txtName control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtName; protected global::FineUIPro.TextBox txtName;
/// <summary> /// <summary>
/// btnSearch 控件。 /// btnSearch control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnSearch; protected global::FineUIPro.Button btnSearch;
/// <summary> /// <summary>
/// btnOut 控件。 /// btnOut control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnOut; protected global::FineUIPro.Button btnOut;
/// <summary> /// <summary>
/// labNumber 控件。 /// lblNumber control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber; protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary> /// <summary>
/// ToolbarSeparator1 控件。 /// ToolbarSeparator1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary> /// <summary>
/// ToolbarText1 控件。 /// ToolbarText1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1; protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary> /// <summary>
/// ddlPageSize 控件。 /// ddlPageSize control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize; protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary> /// <summary>
/// Window1 控件。 /// Window1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Window Window1; protected global::FineUIPro.Window Window1;
/// <summary> /// <summary>
/// Menu1 控件。 /// Menu1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.Menu Menu1; protected global::FineUIPro.Menu Menu1;
/// <summary> /// <summary>
/// btnView 控件。 /// btnView control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUIPro.MenuButton btnView; protected global::FineUIPro.MenuButton btnView;
} }