From 878533816a047c61dfa5105c095f6f3f58969399 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 11 Dec 2023 15:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx    | 2 +-
 SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
index efc3c4a1..751e5a4b 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
@@ -129,7 +129,7 @@
                                             <Items>
                                                 <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="施工单位进度统计"
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="UnitName"
-                                                    EnableColumnLines="true" DataIDField="UnitName"
+                                                    EnableColumnLines="true" DataIDField="UnitName" AllowSorting="true" SortField="UnitName" SortDirection="ASC"
                                                     PageSize="15">
                                                     <Columns>
                                                         <f:RenderField HeaderText="施工单位" ColumnID="UnitName" ExpandUnusedSpace="true"
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
index a1464fd5..44dead5a 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
@@ -254,7 +254,7 @@ CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left
 CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_WeldingDaily d on d.WeldingDailyId=jot.WeldingDailyId WHERE d.ProjectId=@ProjectId and d.UnitId=b.UnitId and jot.WeldingDailyId IS NOT NULL and d.WeldingDate<=@WeldingDate) AS DECIMAL(12,3)) AS FinishSize
  from HJGL_WeldingDaily b
  left join Base_Unit u on b.UnitId=u.UnitId 
- where b.ProjectId=@ProjectId";
+ where b.ProjectId=@ProjectId ";
                 listStr.Add(new SqlParameter("@ProjectId", (CurrUser != null) ? CurrUser.LoginProjectId : ""));
                 listStr.Add(new SqlParameter("@WeldingDate", this.txtWeldingDate.Text.Trim()));
             }
@@ -265,7 +265,7 @@ CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left
 CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_WeldingDaily d on d.WeldingDailyId=jot.WeldingDailyId WHERE d.ProjectId=@ProjectId and d.UnitId=b.UnitId and jot.WeldingDailyId IS NOT NULL and d.WeldingDate<=@WeldingEndDate) AS DECIMAL(12,3)) AS FinishSize
  from HJGL_WeldingDaily b
  left join Base_Unit u on b.UnitId=u.UnitId 
- where b.ProjectId=@ProjectId";
+ where b.ProjectId=@ProjectId ";
                 listStr.Add(new SqlParameter("@ProjectId", (CurrUser != null) ? CurrUser.LoginProjectId : ""));
                 listStr.Add(new SqlParameter("@WeldingStartDate", this.txtWeldingStartDate.Text.Trim()));
                 listStr.Add(new SqlParameter("@WeldingEndDate", this.txtWeldingEndDate.Text.Trim()));