Merge branch 'master' of http://47.104.102.122:3000/gaofei/SGGL_HBAZ

SGGL/BLL/Common/AttachFileService.cs

@@ -454,5 +454,37 @@ namespace BLL
             }
         }
         #endregion
+
+        /// <summary>
+        /// 判断文件类型是否支持的预览
+        /// </summary>
+        /// <param name="FiletExtension"></param>
+        /// <returns></returns>
+        public static bool IsSupportFileType(string FiletExtension)
+        {
+            bool result = false;
+            List<String> list = new List<string>();
+            list.Add("doc");
+            list.Add("docx");
+            list.Add("pdf");
+            list.Add("txt");
+            list.Add("xlsx");
+            list.Add("xls");
+            list.Add("jpg");
+            list.Add("png");
+            list.Add("gif");
+            list.Add("jpeg");
+            foreach (var item in list)
+            {
+                if (item == FiletExtension)
+                {
+                    result = true;
+                    break;
+                }
+            }
+
+            return result;
+
+        }
     }
 }

SGGL/BLL/Common/Const.cs

@@ -6177,6 +6177,10 @@ namespace BLL
 
         #region 焊接报表
         /// <summary>
+        /// 焊接统计分析表
+        /// </summary>
+        public const string WeldingStatisticalMenuId = "0F3ECADA-F108-4C24-979C-67CA49E3726B";
+        /// <summary>
         /// 单位工区进度分析
         /// </summary>
         public const string UnitAreaAnalyzeMenuId = "66A76F90-96A7-4C1F-B8D9-125DDEACEF52";

SGGL/BLL/ProjectData/WorkAreaService.cs

@@ -39,6 +39,7 @@ namespace BLL
                 WorkAreaCode = WorkArea.WorkAreaCode,
                 WorkAreaName = WorkArea.WorkAreaName,
                 Remark = WorkArea.Remark,
+                CompletionDate=WorkArea.CompletionDate,
             };
 
             db.ProjectData_WorkArea.InsertOnSubmit(newWorkArea);
@@ -61,6 +62,7 @@ namespace BLL
                 newWorkArea.WorkAreaName = WorkArea.WorkAreaName;
                 newWorkArea.InstallationId = WorkArea.InstallationId;
                 newWorkArea.SupervisorUnitId = WorkArea.SupervisorUnitId;
+                newWorkArea.CompletionDate = WorkArea.CompletionDate;
                 db.SubmitChanges();
             }
         }