From 866f4989ea8623ba75bd06ff86e8cdcced16bd64 Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Mon, 15 Apr 2024 14:39:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=B1=E5=A4=A7=E6=96=BD?=
 =?UTF-8?q?=E5=B7=A5=E5=B7=A5=E7=A8=8B=E6=96=B9=E6=A1=88=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_WH_2024-04-15-phf.sql                 | 1 +
 SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx   | 3 +++
 .../FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-15-phf.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-15-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-15-phf.sql
new file mode 100644
index 00000000..38cd82c6
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-04-15-phf.sql
@@ -0,0 +1 @@
+update sys_menu set menuname='����ר����' where menuname='��������'
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
index d12ce18a..5a8446de 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
@@ -71,6 +71,9 @@
                         <f:RenderField ColumnID="ApprovalMan" DataField="ApprovalMan" FieldType="String" HeaderText="批准人" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
+                         <f:RenderField ColumnID="IsReview" DataField="IsReview" FieldType="String" HeaderText="是否通过专家评审" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="150px">
+                        </f:RenderField>
                       <%--  <f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
                             HeaderTextAlign="Center" Width="220px">
                         </f:RenderField>--%>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs
index 458f636a..22736c68 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs
@@ -33,7 +33,8 @@ namespace FineUIPro.Web.Comprehensive
         {
             string strSql = @"select MajorPlanApprovalId, ProjectId, PlanCode, PlanName, ReviewMan, ApprovalDate,
                               AuditMan, ApprovalMan, ImplementationDeviation, AttachUrl, CompileMan, CompileDate, 
-                              UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName 
+                              UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName ,
+ case IsReview when 1 then '是' else '否' end as IsReview
                               from Comprehensive_MajorPlanApproval C 
                               left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
 							  left join Base_Unit as u on u.UnitId = C.UnitId