lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

关键事项补充超期关闭状态

This commit is contained in:
夏菊 2025-12-23 14:44:39 +08:00
parent 22850d18f0
commit 774b197a68
6 changed files with 79 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
DataBase/版本日志/SUBQHSE_V2025-12-23-xiaj（Sp_GJSX_getlist）.sql Normal file
View File

@ -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

4
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx
View File

@ -19,6 +19,9 @@
.red {
background-color: orangered;
}
.orchid {
background-color: orchid;
}
.blue {
background-color: deepskyblue;
@ -52,6 +55,7 @@
<%--<f:ListItem Text="待办" Value="3" />--%>
<f:ListItem Text="已超期" Value="4" />
<f:ListItem Text="已关闭" Value="0" />
<f:ListItem Text="超期关闭" Value="5" />
</f:DropDownList>
<f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" LabelWidth="110px">
</f:DropDownList>

6
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs
View File

@ -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
/// <returns></returns>
private DataTable BindData()
{
string strSql = " AND state in (0,2,3,4) ";
string strSql = " AND state in (0,2,3,4,5) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(Request.Params["projectId"])) ///是否文件柜查看页面传项目值

3
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
View File

@ -19,6 +19,9 @@
.red {
background-color: orangered;
}
.orchid {
background-color: orchid;
}
.blue {
background-color: deepskyblue;

10
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs
View File

@ -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";
}
}
}
}

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />