From 774b197a68b31061567348905077ed64140038fa Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Tue, 23 Dec 2025 14:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BA=8B=E9=A1=B9=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E8=B6=85=E6=9C=9F=E5=85=B3=E9=97=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...UBQHSE_V2025-12-23-xiaj（Sp_GJSX_getlist）.sql | 57 +++++++++++++++++++ SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx | 6 +- .../FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs | 6 +- SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx | 3 + .../FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs | 10 +++- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 6 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2025-12-23-xiaj（Sp_GJSX_getlist）.sql diff --git a/DataBase/版本日志/SUBQHSE_V2025-12-23-xiaj（Sp_GJSX_getlist）.sql b/DataBase/版本日志/SUBQHSE_V2025-12-23-xiaj（Sp_GJSX_getlist）.sql new file mode 100644 index 00000000..793f90db --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-12-23-xiaj（Sp_GJSX_getlist）.sql @@ -0,0 +1,57 @@ + + +--ؼ + +ALTER PROCEDURE [dbo].[Sp_GJSX_getlist] + -- Add the parameters for the stored procedure here + @ProjectId nvarchar(max), + @sql_where varchar(max) +AS +BEGIN + IF EXISTS(select * from tempdb..sysobjects where id=object_id('tempdb..#GJSX_List')) + BEGIN + DROP TABLE #GJSX_List + END + DECLARE @Sql NVARCHAR(max) + select * into #GJSX_List + from( + select + a.GJSXID + ,a.ProjectId + ,a.detail + ,b.username + ,a.createDate + ,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID + ',') >0 FOR XML PATH('')), 1, 1,'') + , CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID + ',') >0 FOR XML PATH('')), 1, 1,'') + ,Base_Project.ProjectName + ,Base_Unit.unitname + ,a.CloseDate + --,a.state + --,case a.state when 2 then 'ڽ' when 3 then 'ڽ' when 0 then 'ѹر' when 1 then '༭' end as stateStr + --,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 3 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 0 then a.state when 1 then a.state end as state + --,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 'ѳ' else 'ڽ' end) when 3 then (case when GETDATE()>a.CompleteDate then 'ѳ' else 'ڽ' end) when 0 then 'ѹر' when 1 then '༭' end as stateStr + ,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 3 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 0 then (case when a.CloseDate>DATEADD(day,1,a.CompleteDate) then 5 else a.state end) when 1 then a.state end as state + ,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 'ѳ' else 'ڽ' end) when 3 then (case when GETDATE()>a.CompleteDate then 'ѳ' else 'ڽ' end) when 0 then (case when a.CloseDate>DATEADD(day,1,a.CompleteDate) then 'ڹر' else 'ѹر' end) when 1 then '༭' end as stateStr + ,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'') + ,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'') + ,a.IsManypeople + ,a.CompleteDate + ,a.AttachUrl + ,user_Acceptance =STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance + ',') >0 FOR XML PATH('')), 1, 1,'') + ,(select top 1 ProgressStatus+''+Progress_detail from GJSX_detail where GJSXID=a.GJSXID order by Date desc) as LastProgress + from GJSX as a left join Sys_User as b on a.UserId=b.UserId + left join [dbo].[Base_Project] on a.ProjectId =Base_Project.ProjectId + left join [dbo].[Base_Unit] on a.UnitId=Base_Unit.UnitId + --left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID + --left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID + where a.ProjectId=@ProjectId + ) as a + + set @Sql ='select * from #GJSX_List where 1=1 ' +@sql_where +' order by state desc,GJSXID asc' + + exec(@Sql) + +END +GO + + diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx index 14098127..d7581445 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx @@ -15,10 +15,13 @@ .green { background-color: Green; } - + .red { background-color: orangered; } + .orchid { + background-color: orchid; + } .blue { background-color: deepskyblue; @@ -52,6 +55,7 @@ <%----%> + diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs index 51b87fa7..6cfb74b7 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs @@ -89,6 +89,10 @@ namespace FineUIPro.Web.PZHGL.GJSX { Grid1.Rows[i].CellCssClasses[6] = "red"; } + else if (state == "5") + { + Grid1.Rows[i].CellCssClasses[6] = "orchid"; + } } } } @@ -101,7 +105,7 @@ namespace FineUIPro.Web.PZHGL.GJSX /// private DataTable BindData() { - string strSql = " AND state in (0,2,3,4) "; + string strSql = " AND state in (0,2,3,4,5) "; List listStr = new List(); if (!string.IsNullOrEmpty(Request.Params["projectId"])) ///是否文件柜查看页面传项目值 diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx index 9d65a286..68fd7fa9 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx @@ -19,6 +19,9 @@ .red { background-color: orangered; } + .orchid { + background-color: orchid; + } .blue { background-color: deepskyblue; diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs index 05b4f9ed..69082db8 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs @@ -63,8 +63,10 @@ namespace FineUIPro.Web.PZHGL.GJSX ,User_ReceiveID = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'') , CNProfessionalId = STUFF((SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%', ',' + a.CNProfessional_ID + ',') > 0 FOR XML PATH('')), 1, 1,'') ,Base_Project.ProjectName,Base_Unit.unitname,a.CloseDate - ,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 3 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 0 then a.state when 1 then a.state end as state2 - ,case a.state when 2 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 3 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 0 then '已关闭' when 1 then '编辑中' end as stateStr + ,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 3 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 0 then (case when a.CloseDate>DATEADD(day,1,a.CompleteDate) then 5 else a.state end) when 1 then a.state end as state2 + ,case a.state when 2 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 3 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 0 then (case when a.CloseDate>DATEADD(day,1,a.CompleteDate) then '超期关闭' else '已关闭' end) when 1 then '编辑中' end as stateStr + --,case a.state when 2 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 3 then (case when GETDATE()>a.CompleteDate then 4 else a.state end) when 0 then a.state when 1 then a.state end as state2 + --,case a.state when 2 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 3 then (case when GETDATE()>a.CompleteDate then '已超期' else '正在进行' end) when 0 then '已关闭' when 1 then '编辑中' end as stateStr --,a.state --,case a.state when 2 then '正在进行' when 3 then '待办' when 0 then '已关闭' when 1 then '编辑中' end as stateStr ,QuestionTypeName = STUFF((SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%', ',' + a.QuestionTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'') @@ -142,6 +144,10 @@ namespace FineUIPro.Web.PZHGL.GJSX { Grid1.Rows[i].CellCssClasses[6] = "red"; } + else if (state == "5") + { + Grid1.Rows[i].CellCssClasses[6] = "orchid"; + } } } } diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index d38a848b..cbae34bb 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Release|Any CPU + Debug|Any CPU true