diff --git a/DataBase/版本日志/SGGLDB_V2025-12-12-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql b/DataBase/版本日志/SGGLDB_V2025-12-12-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql
new file mode 100644
index 00000000..26399a2a
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-12-12-xiaj（View_DCGL_CheckRectifyListFromSUB）.sql
@@ -0,0 +1,56 @@
+
+
+ALTER VIEW [dbo].[View_DCGL_CheckRectifyListFromSUB]
+AS
+/*ӹ˾ĵͼ*/
+SELECT CheckRectifyItem.CheckRectifyItemId
+ ,CheckRectifyItem.CheckRectifyId
+ ,CheckRectifyItem.NoticeItemId
+ ,CheckRectifyItem.ConfirmMan
+ ,CheckRectifyItem.ConfirmManName
+ ,CheckRectifyItem.ConfirmDate
+ ,CheckRectifyItem.OrderEndDate
+ ,CheckRectifyItem.OrderEndPerson
+ ,CheckRectifyItem.RealEndDate
+ ,CheckRectifyItem.Verification
+ ,CheckRectify.CheckRectifyCode
+ ,CheckRectify.ProjectId
+ ,CheckRectify.UnitId
+ ,CheckRectify.CheckDate
+ ,CheckRectify.IssueMan
+ ,CheckRectify.IssueDate
+ ,CheckRectify.HandleState
+ ,NoticeItem.ProblemTypes AS ProblemTypes
+ ,NoticeItem.RiskLevel AS RiskLevel
+ ,NoticeItem.SortIndex AS SortIndex
+ ,NoticeItem.Situation AS Situation
+ ,'' AS WorkType
+ ,'' AS DangerPoint
+ ,'⣩:'+NoticeItem.Describe+';ݱ:'+NoticeItem.Standards+';:'+NoticeItem.Advice AS RiskExists
+ ,'' AS IsProject
+ ,'' AS CheckMan
+ ,'' AS SubjectUnitMan
+ --,Table5Item.SortIndex
+ --,Table5Item.WorkType
+ --,Table5Item.DangerPoint
+ --,Table5Item.RiskExists
+ --,Table5Item.IsProject
+ --,Table5Item.CheckMan
+ --,Table5Item.SubjectUnitMan
+ ,AttachFile.AttachFileId
+ ,AttachFile.ToKeyId
+ ,AttachFile.AttachSource
+ ,AttachFile.AttachUrl
+ ,AttachFile2.AttachFileId AS AttachFileId2
+ ,AttachFile2.ToKeyId AS ToKeyId2
+ ,AttachFile2.AttachSource AS AttachSource2
+ ,AttachFile2.AttachUrl AS AttachUrl2
+FROM dbo.DCGL_Check_CheckRectifyItem AS CheckRectifyItem
+LEFT JOIN dbo.DCGL_Check_CheckRectify AS CheckRectify ON CheckRectifyItem.CheckRectifyid=CheckRectify.CheckRectifyId
+--LEFT JOIN dbo.Check_CheckInfo_Table5Item as Table5Item on CheckRectifyItem.Table5ItemId=Table5Item.ID
+LEFT JOIN DCGL_Check_CheckInfo_TableNoticeItem AS NoticeItem ON CheckRectifyItem.NoticeItemId=NoticeItem.ID
+LEFT JOIN dbo.AttachFile AS AttachFile on AttachFile.ToKeyId =CheckRectifyItem.NoticeItemId
+LEFT JOIN dbo.AttachFile AS AttachFile2 on AttachFile2.ToKeyId =CheckRectifyItem.CheckRectifyItemId
+GO
+
+
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
index 1aaa265b..a33c8ad1 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
+using System.Windows.Forms;
+using System.Xml.Linq;
namespace FineUIPro.Web.DCGL.ServerCheck
{
@@ -38,6 +40,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
{
if (!IsPostBack)
{
+ getDCGLCheckInfo();
////权限按钮方法
this.InitTreeMenu();
this.CheckInfoId = string.Empty;
@@ -348,6 +351,16 @@ namespace FineUIPro.Web.DCGL.ServerCheck
///
///
protected void btnGet_Click(object sender, EventArgs e)
+ {
+ getDCGLCheckInfo();
+ }
+
+ ///
+ /// 从集团获取
+ ///
+ ///
+ ///
+ protected void getDCGLCheckInfo()
{
var returnValue = getDCGLCheckInfo_CheckTeam();
// var returnValue= CNCECHSSEGetWebService.getCheck_CheckInfo_Table8Item();
@@ -362,7 +375,6 @@ namespace FineUIPro.Web.DCGL.ServerCheck
Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
}
}
-
#region 获取
///
/// 获取
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
index aa25e49b..39b929e8 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
@@ -18,6 +18,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
{
if (!IsPostBack)
{
+ getCheck();
proType = Request.Params["proType"] ?? string.Empty;
this.GetButtonPower();
//btnNew.OnClientClick = Window1.GetShowReference("CheckRectifyEdit.aspx") + "return false;";
@@ -38,9 +39,10 @@ namespace FineUIPro.Web.DCGL.ServerCheck
sb.Append("FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId ");
sb.Append(" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId ");
sb.Append(" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId ");
- if (!string.IsNullOrWhiteSpace(proType) && proType == "1")
+ sb.Append("WHERE 1=1 ");
+ if (!string.IsNullOrWhiteSpace(this.CurrUser.LoginProjectId) && !string.IsNullOrWhiteSpace(proType) && proType == "1")
{//只查询本项目检查数据
- sb.Append($"WHERE S.ProjectId='{this.CurrUser.LoginProjectId}' ");
+ sb.Append($"And S.ProjectId='{this.CurrUser.LoginProjectId}' ");
}
sb.Append("ORDER BY HandleState");
SqlParameter[] parameter = new SqlParameter[] { };
@@ -135,7 +137,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
return;
}
string CheckRectifyId = Grid1.SelectedRowID;
- PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckRectifyEdit.aspx?CheckRectifyId={0}", CheckRectifyId, "编辑 - ")));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckRectifyEdit.aspx?CheckRectifyId={0}&proType={1}", CheckRectifyId, proType, "编辑 - ")));
}
#endregion
@@ -378,6 +380,14 @@ namespace FineUIPro.Web.DCGL.ServerCheck
///
///
protected void btnGet_Click(object sender, EventArgs e)
+ {
+ getCheck();
+ }
+
+ ///
+ /// 从集团获取整改单
+ ///
+ protected void getCheck()
{
var returnValue = getCheck_CheckRectifyListToSUB();
if (returnValue.code == 1)
@@ -391,7 +401,6 @@ namespace FineUIPro.Web.DCGL.ServerCheck
}
}
-
#region 获取
///
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
index d87ec2cf..d4ac1623 100644
--- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
@@ -7,13 +7,14 @@
隐患整改单
-
+