Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

SGGL/BLL/BLL.csproj

@@ -190,6 +190,7 @@
     <Compile Include="CostGoods\MeasuresPlanService.cs" />
     <Compile Include="CostGoods\PayRegistrationService.cs" />
     <Compile Include="CostGoods\SubPayRegistrationService.cs" />
+    <Compile Include="CQMS\Comprehensive\ConTechnologyDisclosureService.cs" />
     <Compile Include="CQMS\Comprehensive\DataDistributionApproveService.cs" />
     <Compile Include="CQMS\Comprehensive\DataDistributionService.cs" />
     <Compile Include="CQMS\Comprehensive\DataReceivingApproveService.cs" />

SGGL/BLL/CQMS/Comprehensive/ConTechnologyDisclosureService.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 施工技术交底管理
+    /// </summary>
+    public class ConTechnologyDisclosureService
+    {
+        /// <summary>
+        /// 根据主键获取施工技术交底管理
+        /// </summary>
+        /// <param name="conTechnologyDisclosureId"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_ConTechnologyDisclosure GetConTechnologyDisclosureById(string conTechnologyDisclosureId)
+        {
+            return Funs.DB.Comprehensive_ConTechnologyDisclosure.FirstOrDefault(e => e.ConTechnologyDisclosureId == conTechnologyDisclosureId);
+        }
+
+        /// <summary>
+        /// 添加施工技术交底管理
+        /// </summary>
+        /// <param name="newCon"></param>
+        public static void AddConTechnologyDisclosure(Model.Comprehensive_ConTechnologyDisclosure con)
+        {
+            Model.Comprehensive_ConTechnologyDisclosure newCon = new Model.Comprehensive_ConTechnologyDisclosure
+            {
+                ConTechnologyDisclosureId = con.ConTechnologyDisclosureId,
+                ProjectId = con.ProjectId,
+                CNProfessionalId = con.CNProfessionalId,
+                DisclosureCode = con.DisclosureCode,
+                DisclosureName = con.DisclosureName,
+                UnitId = con.UnitId,
+                DisclosureMan = con.DisclosureMan,
+                DisclosureDate = con.DisclosureDate,
+                UnitWorkId = con.UnitWorkId,
+                AttendMan = con.AttendMan,
+                CompileMan = con.CompileMan,
+                CompileDate = con.CompileDate,
+                RemarkCode = con.RemarkCode
+            };
+            Funs.DB.Comprehensive_ConTechnologyDisclosure.InsertOnSubmit(newCon);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改施工技术交底管理
+        /// </summary>
+        /// <param name="con"></param>
+        public static void UpdateConTechnologyDisclosure(Model.Comprehensive_ConTechnologyDisclosure con)
+        {
+            Model.Comprehensive_ConTechnologyDisclosure newCon = Funs.DB.Comprehensive_ConTechnologyDisclosure.FirstOrDefault(e => e.ConTechnologyDisclosureId == con.ConTechnologyDisclosureId);
+            if (newCon != null)
+            {
+                newCon.CNProfessionalId = con.CNProfessionalId;
+                newCon.DisclosureCode = con.DisclosureCode;
+                newCon.DisclosureName = con.DisclosureName;
+                newCon.UnitId = con.UnitId;
+                newCon.DisclosureMan = con.DisclosureMan;
+                newCon.DisclosureDate = con.DisclosureDate;
+                newCon.UnitWorkId = con.UnitWorkId;
+                newCon.AttendMan = con.AttendMan;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据Id删除施工技术交底管理
+        /// </summary>
+        /// <param name="conTechnologyDisclosureId"></param>
+        public static void DeleteConTechnologyDisclosureById(string conTechnologyDisclosureId)
+        {
+            Model.Comprehensive_ConTechnologyDisclosure newCon = Funs.DB.Comprehensive_ConTechnologyDisclosure.FirstOrDefault(e => e.ConTechnologyDisclosureId == conTechnologyDisclosureId);
+            if (newCon != null)
+            {
+                Funs.DB.Comprehensive_ConTechnologyDisclosure.DeleteOnSubmit(newCon);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/Common/Const.cs

@@ -3296,6 +3296,11 @@ namespace BLL
         /// </summary>
         public const string QualityAccidentTemplateUrl = "File\\Excel\\DataIn\\质量事故处理记录导入模板.xls";
 
+        /// <summary>
+        /// 施工技术交底管理导入模板原始虚拟路径
+        /// </summary>
+        public const string ConTechnologyDisclosureTemUrl = "File\\Excel\\DataIn\\施工技术交底管理导入模板.xls";
+
         #endregion
 
         #region 绩效考核模板文件路径
@@ -3850,6 +3855,11 @@ namespace BLL
         /// </summary>
         public const string MajorPlanApprovalMenuId = "fd116c94-714b-4b92-a3c9-cc83d358e2b3";
 
+        /// <summary>
+        /// 设计交底管理
+        /// </summary>
+        public const string ConTechnologyDisclosureMenuId = "A16CFA9D-2783-4573-95F9-EBA2B682B7EA";
+
         /// <summary>
         /// 检验试验计划管理
         /// </summary>