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

SGGL/BLL/Common/Const.cs

@@ -3427,7 +3427,26 @@ namespace BLL
         /// 合同价格信息导入模板
         /// </summary>
         public const string TemContractTrackTemplateUrl = "File\\Excel\\DataIn\\合同价格信息导入模板.xlsx";
-
+        /// <summary>
+        /// 施工日志模板文件原始虚拟路径
+        /// </summary>
+        public const string ConstructionLogTemplateUrl = "File\\Excel\\ConstructionLog\\施工日志.xlsx";
+        /// <summary>
+        /// 日工效汇总表模板文件原始虚拟路径
+        /// </summary>
+        public const string DayConstructionLogWorkEfficiencyTemplateUrl = "File\\Excel\\ConstructionLog\\日工效汇总表.xlsx";
+        /// <summary>
+        /// 月工效汇总表模板文件原始虚拟路径
+        /// </summary>
+        public const string MonthConstructionLogWorkEfficiencyTemplateUrl = "File\\Excel\\ConstructionLog\\月工效汇总表.xlsx";
+        /// <summary>
+        /// 项目平均工效模板文件原始虚拟路径
+        /// </summary>
+        public const string ProjectConstructionLogWorkEfficiencyTemplateUrl = "File\\Excel\\ConstructionLog\\项目平均工效.xlsx";
+        /// <summary>
+        /// 公司平均工效统计模板文件原始虚拟路径
+        /// </summary>
+        public const string CompanyConstructionLogWorkEfficiencyTemplateUrl = "File\\Excel\\ConstructionLog\\公司平均工效统计.xlsx";
         #endregion
 
         #region 初始化上传路径

SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs

@@ -368,6 +368,29 @@ namespace BLL
             }
         }
 
+        public static string GetMajorName(string majorIds)
+        {
+            string majorName = string.Empty;
+            if (!string.IsNullOrEmpty(majorIds))
+            {
+                string[] strs = majorIds.Split(',');
+                var items = GetMajorItems2();
+                foreach (var item in strs)
+                {
+                    var un = items.FirstOrDefault(x => x.Text == item);
+                    if (un != null)
+                    {
+                        majorName += un.Value + ",";
+                    }
+                }
+                if (!string.IsNullOrEmpty(majorName))
+                {
+                    majorName = majorName.Substring(0, majorName.LastIndexOf(","));
+                }
+            }
+            return majorName;
+        }
+
         #region 获取列表
 
         /// <summary>

SGGL/BLL/PHTGL/ContractCompile/ContractService.cs

@@ -205,5 +205,26 @@ namespace BLL
             }
         }
 
+        public static string GetContractName(string contractIds)
+        {
+            string contractName = string.Empty;
+            if (!string.IsNullOrEmpty(contractIds))
+            {
+                string[] strs = contractIds.Split(',');
+                foreach (var item in strs)
+                {
+                    var cn = GetContractById(item);
+                    if (cn != null)
+                    {
+                        contractName += cn.ContractName + ",";
+                    }
+                }
+                if (!string.IsNullOrEmpty(contractName))
+                {
+                    contractName = contractName.Substring(0, contractName.LastIndexOf(","));
+                }
+            }
+            return contractName;
+        }
     }
 }