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