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

待办显示关键事项申请关闭后

Browse Source
This commit is contained in:
夏菊
2025-08-27 11:12:41 +08:00
parent 2f9d98c2da
commit ce304ec7d9
16 changed files with 1188 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+6
View File
@@ -93,4 +93,10 @@
<TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E64D67C1-BA8E-4329-AFEE-23F9BC45CDDD" Text="现场质量数据" NavigateUrl=""><TreeNode id="51EA8258-C81D-4C33-B939-769450979D14" Text="质量基本信息" NavigateUrl="ZHGL/CQMSData/CQMSBasicData.aspx"></TreeNode>
<TreeNode id="6E1F4EF5-47CA-4DF8-B561-3C98DBD88EA2" Text="焊接管理" NavigateUrl="ZHGL/CQMSData/WeldingData.aspx"></TreeNode>
<TreeNode id="C9076E93-29DB-419C-8902-789163C6554A" Text="现场质量检查" NavigateUrl="ZHGL/CQMSData/CQMSCheckData.aspx"></TreeNode>
<TreeNode id="64FED633-2436-426B-A230-7C0038E44AD4" Text="设备材料计量器具质量文件上报" NavigateUrl="ZHGL/CQMSData/CQMSEquipAndMachineData.aspx"></TreeNode>
<TreeNode id="12E7E1FD-6D8D-41D8-801C-E15B68805213" Text="共检点明细" NavigateUrl="ZHGL/CQMSData/CQMSNoticeDetailsData.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+36 -2
View File
@@ -1642,7 +1642,24 @@ left join (select PlanNum,RealNum,QuantityListId from JDGL_QuantityCompletion wh
GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
)";
)
UNION ALL
SELECT GJSXID AS DataId
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
,'关键事项待关闭' AS MenuName
,GJSX.Detail AS Content
,users.UserId
,users.UserName
,GJSX.CreateDate AS DataTime
,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
FROM GJSX
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE GJSX.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and
GJSX.State = 3 and GJSX.ProgressStatus=1 and (GJSX.UserID = @userId OR GJSX.User_ReceiveID = @userId )
ORDER BY DataTime DESC ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
@@ -1707,7 +1724,24 @@ left join (select PlanNum,RealNum,QuantityListId from JDGL_QuantityCompletion wh
GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
)";
)
UNION ALL
SELECT GJSXID AS DataId
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
,'关键事项待关闭' AS MenuName
,GJSX.Detail AS Content
,users.UserId
,users.UserName
,GJSX.CreateDate AS DataTime
,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
FROM GJSX
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE GJSX.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and
GJSX.State = 3 and GJSX.ProgressStatus=1 and (GJSX.UserID = @userId OR GJSX.User_ReceiveID = @userId )
ORDER BY DataTime DESC ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@userId", CurrUser.UserId));