From c015223549a633b1d8eb8a486009dfbe5b153c46 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 27 Feb 2026 14:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E5=A4=A7=E5=B1=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=A9=BF=E9=80=8F=E7=95=8C=E9=9D=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=96=E7=AE=80=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataShow/ConstructionEquipment.aspx.cs | 4 ++-- SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs | 10 +++++----- SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs | 2 +- SGGL/FineUIPro.Web/DataShow/License.aspx.cs | 2 +- SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs | 2 +- SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs | 2 +- SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs index b3eb6c1e..f68a7692 100644 --- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs @@ -39,14 +39,14 @@ namespace FineUIPro.Web.DataShow List listStr = new List(); strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,IsUsed,CompileDate,EQType - FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId + FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,isnull(P.ShortName,P.ProjectName) as ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'特种设备' AS EQType,P.ProjectState FROM InApproveManager_EquipmentInItem AS Item LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId - UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId + UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,isnull(P.ShortName,P.ProjectName) as ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'一般设备' AS EQType,P.ProjectState FROM InApproveManager_GeneralEquipmentInItem AS Item LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs index 4ae5fc47..301295be 100644 --- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs @@ -66,7 +66,7 @@ namespace FineUIPro.Web.DataShow TrainRecord.TrainTitle, Project.ProjectId, Project.ProjectCode, - Project.ProjectName, + isnull(Project.ShortName,Project.ProjectName) as ProjectName, TrainRecord.TrainStartDate, TrainRecord.TrainEndDate, TrainRecord.TrainPersonNum, @@ -84,7 +84,7 @@ namespace FineUIPro.Web.DataShow RecordName as TrainTitle, Project.ProjectId, Project.ProjectCode, - Project.ProjectName, + isnull(Project.ShortName,Project.ProjectName) as ProjectName, TrainStartDate, TrainEndDate, PersonCount as TrainPersonNum, @@ -105,7 +105,7 @@ namespace FineUIPro.Web.DataShow TrainRecord.TrainTitle, Project.ProjectId, Project.ProjectCode, - Project.ProjectName, + isnull(Project.ShortName,Project.ProjectName) as ProjectName, TrainRecord.TrainStartDate, TrainRecord.TrainEndDate, TrainRecord.TrainPersonNum, @@ -123,7 +123,7 @@ namespace FineUIPro.Web.DataShow RecordName as TrainTitle, Project.ProjectId, Project.ProjectCode, - Project.ProjectName, + isnull(Project.ShortName,Project.ProjectName) as ProjectName, TrainStartDate, TrainEndDate, PersonCount as TrainPersonNum, @@ -131,7 +131,7 @@ namespace FineUIPro.Web.DataShow From Bo_Sheng_Train F LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId WHERE Project.ProjectState ='1' - )f WHERE 1=1 " ; + )f WHERE 1=1 "; #endregion if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs index c1f51011..185fc64d 100644 --- a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs @@ -44,7 +44,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, isnull(ShortName,ProjectName) as ProjectName from Base_Project where ProjectState =1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs index 61a1c334..b94c8116 100644 --- a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow string strSql = string.Empty; List listStr = new List(); - strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName,V.IsHighRisk + strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,isnull(Project.ShortName,Project.ProjectName) as ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName,V.IsHighRisk ,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.WorkStatesStr,V.LicenseTypeId,V.UnitId,V.LicenseManageContents ,V.CompileMan,V.CompileDate,V.States,V.UserName FROM View_License_LicenseManager AS V diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs index 6983690e..27d3ca61 100644 --- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs @@ -33,7 +33,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName, + string strSql = @"SELECT Person.ProjectId,Project.ProjectCode,isnull(Project.ShortName,Project.ProjectName) as ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName, Person.PersonName,Person.PersonId,Person.IdentityCard,Person.Sex,Person.WorkPostId,WorkPost.WorkPostName,Person.Telephone ,(CASE WHEN Sex=2 THEN '女' WHEN Sex=1 THEN '男' ELSE '' END) AS SexStr FROM SitePerson_Person AS Person diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs index 3cad9017..f8ed5be6 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow string strSql = string.Empty; List listStr = new List(); - strSql = @"SELECT cost.CostSmallDetailId, p.ProjectId,p.ProjectCode,p.ProjectName,cost.UnitId,Unit.UnitName,cost.Months + strSql = @"SELECT cost.CostSmallDetailId, p.ProjectId,p.ProjectCode,isnull(p.ShortName,p.ProjectName) ProjectName,cost.UnitId,Unit.UnitName,cost.Months ,(CAST((SELECT SUM(ISNULL(CostMoney,0)) FROM CostGoods_CostSmallDetailItem WHERE CostSmallDetailId=cost.CostSmallDetailId) *1.0 /10000 as decimal(18, 2) ))AS SUMCost FROM CostGoods_CostSmallDetail as cost diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs index 29dc864d..c79ab030 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs @@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode,isnull(ShortName,ProjectName) as ProjectName from Base_Project where ProjectState =1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null)