diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql
new file mode 100644
index 00000000..61de85e9
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql
@@ -0,0 +1,89 @@
+
+
+--ؼȫ˵
+update Sys_Menu set SuperMenu='168A94C7-E37D-4B9C-8684-51DF4F8C5134',SortIndex=1,IsUsed=1,MenuName='ȫ' where MenuId='5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680';
+GO
+
+--2
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'GJSX_detail' AND COLUMN_NAME = 'ProgressStatus')
+BEGIN
+ ALTER TABLE GJSX_detail ADD ProgressStatus nvarchar(20);
+END
+GO
+
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+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
+ ,case a.state when 2 then 'ڽ' when 3 then '' when 0 then 'ѹر' when 1 then '' end as state
+ ,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,'')
+ 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
+
+ exec(@Sql)
+
+
+ --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
+ --,case a.state when 2 then 'ڽ' when 3 then '' when 0 then 'ѹر' when 1 then '' end as state
+ --,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,'')
+ --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
+END
+GO
+
diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs
index c206c13c..cc17cf6c 100644
--- a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs
+++ b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs
@@ -1,4 +1,5 @@
-using System;
+using Model;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -61,6 +62,7 @@ namespace BLL
newGJSXMX.Date = gjsxmx.Date;
newGJSXMX.Sort = gjsxmx.Sort;
newGJSXMX.FilePath = gjsxmx.FilePath;
+ newGJSXMX.ProgressStatus = gjsxmx.ProgressStatus;
db.GJSX_detail.InsertOnSubmit(newGJSXMX);
db.SubmitChanges();
@@ -111,7 +113,8 @@ namespace BLL
newGJSX_detail.Progress_detail = _GJSX_detail.Progress_detail;
newGJSX_detail.Sort = _GJSX_detail.Sort;
newGJSX_detail.FilePath = _GJSX_detail.FilePath;
-
+ newGJSX_detail.ProgressStatus = newGJSX_detail.ProgressStatus;
+
db.SubmitChanges();
}
}
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index fbb14cd0..3fa13380 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19729,7 +19729,7 @@
-
+