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

SGGL/BLL/Common/Const.cs

@@ -342,6 +342,11 @@ namespace BLL
         /// </summary>
         public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
 
+        /// <summary>
+        /// 施工经理岗位Id
+        /// </summary>
+        public static string WorkPost_ConstructionManager = "49198d7c-8d14-4ea6-a495-2fe1aa179769";
+
         /// <summary>
         /// HSE工程师岗位Id
         /// </summary>
@@ -367,6 +372,31 @@ namespace BLL
         /// </summary>
         public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297";
 
+        /// <summary>
+        /// 瓦工岗位Id
+        /// </summary>
+        public static string WorkPost_BricklayerId = "668CB91E-F067-42E6-95ED-FFF1BCCE4576";
+
+        /// <summary>
+        /// 钢筋工岗位Id
+        /// </summary>
+        public static string WorkPost_SteelFixerId = "48280AA2-62D6-4105-AAA7-C38471F44DA9";
+
+        /// <summary>
+        /// 木工岗位Id
+        /// </summary>
+        public static string WorkPost_CarpentryId = "FA155A27-E5E5-44DF-8CC3-05404F572DB8";
+
+        /// <summary>
+        /// 混凝土工岗位Id
+        /// </summary>
+        public static string WorkPost_ConcreteWorkerId = "65F02FD8-6C67-402E-9588-4DAB038A697A";
+
+        /// <summary>
+        /// 架子工岗位Id
+        /// </summary>
+        public static string WorkPost_ScaffolderId = "1331D109-6435-4709-9A35-65AEC7B3F06F";
+
         #endregion
 
         #region 系统环境设置常量
@@ -4522,9 +4552,14 @@ namespace BLL
         public const string ConstructionReportMenuId = "0DAFF358-EA16-44B2-8E4B-E15E40EFAAD0";
 
         /// <summary>
-        /// 项目级施工日志
+        /// 个人施工日志
         /// </summary>
-        public const string ConstructionLogMenuId = "4CB03F8B-C967-4082-ADF1-08776FE40E21";
+        public const string ConstructionLogMenuId = "0383A4A1-1565-4F11-BAF3-2B84CB621796";
+
+        /// <summary>
+        /// 项目施工日志
+        /// </summary>
+        public const string ProjectConstructionLogMenuId = "D3F67A7B-2FC4-468A-98BB-5F3DF2F193C4";
 
         /// <summary>
         /// 项目级施工日志

SGGL/BLL/Common/Funs.cs

@@ -1420,6 +1420,53 @@ namespace BLL
             IRestResponse response = client.Execute(request);
             return response.Content;
         }
+
+        /// <summary>
+        /// 根据星期几返回值
+        /// </summary>
+        /// <returns></returns>
+        public static string GetWeekDay(string value)
+        {
+            if (!String.IsNullOrEmpty(value))
+            {
+                if (value == "Sunday")
+                {
+                    return "日";
+                }
+                else if (value == "Monday")
+                {
+                    return "一";
+                }
+                else if (value == "Tuesday")
+                {
+                    return "二";
+                }
+                else if (value == "Wednesday")
+                {
+                    return "三";
+                }
+                else if (value == "Thursday")
+                {
+                    return "四";
+                }
+                else if (value == "Friday")
+                {
+                    return "五";
+                }
+                else if (value == "Saturday")
+                {
+                    return "六";
+                }
+                else
+                {
+                    return "";
+                }
+            }
+            else
+            {
+                return "";
+            }
+        }
     }
 }