Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/BLL/Common/Const.cs

@@ -217,6 +217,11 @@ namespace BLL
         /// </summary>
         public const string Depart_constructionId = "ab1eb44a-1821-48ee-86f2-64b7e6425efa";
 
+        /// <summary>
+        ///公司领导部门id
+        /// </summary>
+        public const string Depart_CompanyLeaderId = "c09c17b7-742a-4d1e-aa26-5470b6782d1e";
+
         /// <summary>
         ///测试项目id
         /// </summary>
@@ -3343,6 +3348,11 @@ namespace BLL
         /// </summary>
         public const string OpinionTemplateUrl = "File\\Excel\\DataOut\\策划评审意见收集汇总表.xlsx";
 
+        /// <summary>
+        /// 进度计划编制模板文件原始虚拟路径
+        /// </summary>
+        public const string JDPlanTemplateUrl = "File\\Excel\\DataOut\\进度计划编制.xls";
+
         #endregion
 
         #region 初始化上传路径
@@ -4458,6 +4468,13 @@ namespace BLL
 
         #endregion
 
+        #region 进度
+        /// <summary>
+        /// 项目施工WBS定制
+        /// </summary>
+        public const string PlanSetMenuId = "E23F0879-3E9F-4E7B-9A2D-EFF34798D629";
+        #endregion
+
         #region 施工综合
         #region 菜单Id
         /// <summary>

SGGL/BLL/Common/Funs.cs

@@ -1220,15 +1220,15 @@ namespace BLL
             {
                 if (score >= 80)
                 {
-                    value = "合格";
+                    value = "A级（合格）";
                 }
                 else if (score >= 71 && score <= 79)
                 {
-                    value = "基本合格";
+                    value = "B级（基本合格）";
                 }
                 else if (score <= 70)
                 {
-                    value = "不合格";
+                    value = "C级（不合格）";
                 }
             }
             return value;