From 2c74bec31183ddc17391d5d0cdbd27da88ef7a2b Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 24 Mar 2025 16:57:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E7=9C=8B=E6=9D=BF=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SGGLDB_WH_V2025-03-25-xiaj.sql | 79 ++++++++++++++++++ .../File/Excel/DataOut/关键事项.xlsx | Bin 10165 -> 10232 bytes SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx | 8 +- .../FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs | 73 +++++++++------- SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx | 8 +- .../FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs | 15 ++-- .../common/mainMenu_PGJSX.aspx.cs | 24 +++--- 7 files changed, 149 insertions(+), 58 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_V2025-03-25-xiaj.sql diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-25-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-25-xiaj.sql new file mode 100644 index 00000000..38758b3f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2025-03-25-xiaj.sql @@ -0,0 +1,79 @@ + + +--ؼ + +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 + ,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 +' order by state desc,GJSXID desc' + + 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/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx index 45e14775ad67dc2c764135a47bd8bd13f6fc0c12..2eb95b5a5fe5bd31807c8a015a3f8bcb8566e9e4 100644 GIT binary patch delta 5418 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 diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx index 119481a3..6886cf1c 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx @@ -39,7 +39,7 @@ @@ -97,9 +97,9 @@ - <%----%> + + diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs index 55554e53..4a5428d1 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs @@ -79,21 +79,27 @@ namespace FineUIPro.Web.PZHGL.GJSX if (state == "0") { //Grid1.Rows[i].RowCssClass = "green"; - Grid1.Rows[i].CellCssClasses[5] = "green"; + Grid1.Rows[i].CellCssClasses[6] = "green"; } else if (state == "2" || state == "3") { - if (DateTime.Now > dtCompleteDate.AddDays(1)) - { - //Grid1.Rows[i].RowCssClass = "red"; - Grid1.Rows[i].CellCssClasses[5] = "red"; - //Grid1.Rows[i].Cells[5].Text = "red"; - } - else - { - //Grid1.Rows[i].RowCssClass = "blue"; - Grid1.Rows[i].CellCssClasses[5] = "blue"; - } + Grid1.Rows[i].CellCssClasses[6] = "blue"; + //if (DateTime.Now > dtCompleteDate.AddDays(1)) + //{ + // //Grid1.Rows[i].RowCssClass = "red"; + // Grid1.Rows[i].CellCssClasses[6] = "red"; + // //var ssss = Grid1.Rows[i].; + // //Grid1.Rows[i].Cells[6].Text = "超期"; + //} + //else + //{ + // //Grid1.Rows[i].RowCssClass = "blue"; + // Grid1.Rows[i].CellCssClasses[6] = "blue"; + //} + } + else if (state == "4") + { + Grid1.Rows[i].CellCssClasses[6] = "red"; } } } @@ -125,14 +131,14 @@ namespace FineUIPro.Web.PZHGL.GJSX int i = 0; foreach (var item in stateList) { - if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null && item != "4") - { - strSql += $" OR state = '{item}' "; - } - else if (item == "4") - { - strSql += " OR (state <> '0' and getdate() > DATEADD(day, 1, CompleteDate)) "; - } + //if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null && item != "4") + //{ + strSql += $" OR state = '{item}' "; + //} + //else if (item == "4") + //{ + // strSql += " OR (state <> '0' and getdate() > DATEADD(day, 1, CompleteDate)) "; + //} i++; } strSql += ")"; @@ -527,41 +533,44 @@ namespace FineUIPro.Web.PZHGL.GJSX cell.SetCellValue((i - 1).ToString()); cell = row.CreateCell(1); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["QuestionTypeName"].ToString()); + cell.SetCellValue(tb.Rows[j]["GJSXID"].ToString()); cell = row.CreateCell(2); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["CNProfessionalID"].ToString()); + cell.SetCellValue(tb.Rows[j]["QuestionTypeName"].ToString()); cell = row.CreateCell(3); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["Detail"].ToString()); + cell.SetCellValue(tb.Rows[j]["CNProfessionalID"].ToString()); cell = row.CreateCell(4); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["GJSXTypeName"].ToString()); + cell.SetCellValue(tb.Rows[j]["Detail"].ToString()); cell = row.CreateCell(5); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["StateStr"].ToString()); + cell.SetCellValue(tb.Rows[j]["GJSXTypeName"].ToString()); cell = row.CreateCell(6); cell.CellStyle = cellStyle; - cell.SetCellValue(createDate); + cell.SetCellValue(tb.Rows[j]["StateStr"].ToString()); cell = row.CreateCell(7); cell.CellStyle = cellStyle; - cell.SetCellValue(completeDate); + cell.SetCellValue(createDate); cell = row.CreateCell(8); cell.CellStyle = cellStyle; - cell.SetCellValue(closeDate); + cell.SetCellValue(completeDate); cell = row.CreateCell(9); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["unitname"].ToString()); + cell.SetCellValue(closeDate); cell = row.CreateCell(10); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["username"].ToString()); + cell.SetCellValue(tb.Rows[j]["unitname"].ToString()); cell = row.CreateCell(11); cell.CellStyle = cellStyle; - cell.SetCellValue(tb.Rows[j]["User_Acceptance"].ToString()); + cell.SetCellValue(tb.Rows[j]["username"].ToString()); cell = row.CreateCell(12); cell.CellStyle = cellStyle; + cell.SetCellValue(tb.Rows[j]["User_Acceptance"].ToString()); + cell = row.CreateCell(13); + cell.CellStyle = cellStyle; cell.SetCellValue(tb.Rows[j]["User_ReceiveID"].ToString()); - //cell = row.CreateCell(13); + //cell = row.CreateCell(14); //cell.CellStyle = cellStyle; //cell.SetCellValue(""); i++; diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx index 186dfece..2b81fed6 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx @@ -33,7 +33,7 @@ @@ -85,9 +85,9 @@ - <%-- - --%> + + diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs index ccc6c4bf..4682e48a 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs @@ -62,8 +62,11 @@ namespace FineUIPro.Web.PZHGL.GJSX a.GJSXID,a.ProjectId,a.detail,a.Userid,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 + ,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 + --,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,'') ,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 @@ -108,7 +111,7 @@ namespace FineUIPro.Web.PZHGL.GJSX strSql += " AND a.CsUsers like'%" + uid + "%' "; } - strSql += " order by a.GJSXID desc "; + strSql += " order by state2 desc,a.GJSXID asc "; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); @@ -129,20 +132,20 @@ namespace FineUIPro.Web.PZHGL.GJSX if (state == "0") { //Grid1.Rows[i].RowCssClass = "green"; - Grid1.Rows[i].CellCssClasses[5] = "green"; + Grid1.Rows[i].CellCssClasses[6] = "green"; } else if (state == "2" || state == "3") { if (DateTime.Now > dtCompleteDate.AddDays(1)) { //Grid1.Rows[i].RowCssClass = "red"; - Grid1.Rows[i].CellCssClasses[5] = "red"; + Grid1.Rows[i].CellCssClasses[6] = "red"; //Grid1.Rows[i].Cells[5].Text = "red"; } else { //Grid1.Rows[i].RowCssClass = "blue"; - Grid1.Rows[i].CellCssClasses[5] = "blue"; + Grid1.Rows[i].CellCssClasses[6] = "blue"; } } } diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs index ac13d794..4ff847d3 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs @@ -67,7 +67,7 @@ namespace FineUIPro.Web businessColumn.title = "关键事项关闭率"; var allItems = from x in db.GJSX - where x.ProjectId == this.CurrUser.LoginProjectId + where x.ProjectId == this.CurrUser.LoginProjectId && x.State != "1" orderby x.GJSXID select x; int closeNum = allItems.Where(x => x.State == "0").Count(); @@ -104,7 +104,7 @@ namespace FineUIPro.Web businessColumn.xFontNum = 8; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" select x; Model.SingleSerie s = new Model.SingleSerie(); Model.SingleSerie s2 = new Model.SingleSerie(); @@ -143,11 +143,11 @@ namespace FineUIPro.Web businessColumn.xFontNum = 5; //var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" select x; //按照未关闭数取前10 var groupedUser = (from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId && x.State != "0" + where x.ProjectId == this.ProjectId && x.State != "0" && x.State != "1" select x).GroupBy(p => p.User_Acceptance) .Select(g => new { @@ -193,7 +193,7 @@ namespace FineUIPro.Web Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate) + where x.ProjectId == this.ProjectId && x.State != "1" && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate) select x; StringBuilder sb = new StringBuilder(); sb.Append(" "); @@ -264,7 +264,7 @@ namespace FineUIPro.Web Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate) && (x.CloseDate ?? DateTime.Now) < Convert.ToDateTime(x.CompleteDate).AddDays(7) select x; @@ -300,7 +300,7 @@ namespace FineUIPro.Web Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate).AddDays(7) && (x.CloseDate ?? DateTime.Now) < Convert.ToDateTime(x.CompleteDate).AddDays(14) select x; @@ -336,7 +336,7 @@ namespace FineUIPro.Web Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate).AddDays(14) && (x.CloseDate ?? DateTime.Now) < Convert.ToDateTime(x.CompleteDate).AddDays(21) select x; @@ -372,7 +372,7 @@ namespace FineUIPro.Web Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate).AddDays(21) && (x.CloseDate ?? DateTime.Now) < Convert.ToDateTime(x.CompleteDate).AddDays(30) select x; @@ -408,7 +408,7 @@ namespace FineUIPro.Web Model.SGGLDB db = Funs.DB; var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate).AddDays(30) select x; Model.SingleSerie s = new Model.SingleSerie(); @@ -455,7 +455,7 @@ namespace FineUIPro.Web var gjsxTypes = BLL.GJSXTypeService.GetGJSXTypeList(); //全平台 var overallItems = from x in Funs.DB.GJSX - where (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate) + where (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate) && x.State != "1" select new { x.GJSXTypeId, @@ -463,7 +463,7 @@ namespace FineUIPro.Web }; //本项目 var allItems = from x in Funs.DB.GJSX - where x.ProjectId == this.ProjectId + where x.ProjectId == this.ProjectId && x.State != "1" && (x.CloseDate ?? DateTime.Now) > Convert.ToDateTime(x.CompleteDate) select new {