diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 073bd892..6ef3d483 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -587,6 +587,7 @@
     <Compile Include="JDGL\Check\QuantityListService.cs" />
     <Compile Include="JDGL\Check\SteelStructureCompletionService.cs" />
     <Compile Include="JDGL\Check\UndergroundPipeCompletionService.cs" />
+    <Compile Include="JDGL\Check\WeekPlanService.cs" />
     <Compile Include="JDGL\WBSCompleteAndReal\WBSReportService.cs" />
     <Compile Include="JDGL\WBS\CnProfessionInitService.cs" />
     <Compile Include="JDGL\WBS\CnProfessionService.cs" />
diff --git a/SGGL/BLL/BaseInfo/CNProfessionalService.cs b/SGGL/BLL/BaseInfo/CNProfessionalService.cs
index 43ca4316..35bdff36 100644
--- a/SGGL/BLL/BaseInfo/CNProfessionalService.cs
+++ b/SGGL/BLL/BaseInfo/CNProfessionalService.cs
@@ -104,7 +104,30 @@ namespace BLL
         /// <returns></returns>
         public static ListItem[] GetCNProfessionalItem()
         {
-            var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
+            var q = (from x in Funs.DB.Base_CNProfessional
+                     where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
+                     && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
+                     orderby x.SortIndex
+                     select x).ToList();
+            ListItem[] list = new ListItem[q.Count()];
+            for (int i = 0; i < q.Count(); i++)
+            {
+                list[i] = new ListItem(q[i].ProfessionalName ?? "", q[i].CNProfessionalId);
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 资料收发文专用
+        /// </summary>
+        /// <returns></returns>
+        public static ListItem[] GetCNProfessionalDocItem()
+        {
+            var q = (from x in Funs.DB.Base_CNProfessional
+                     where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
+                     orderby x.SortIndex
+                     select x).ToList();
+            //var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
             ListItem[] list = new ListItem[q.Count()];
             for (int i = 0; i < q.Count(); i++)
             {
@@ -142,5 +165,17 @@ namespace BLL
             }
             return res;
         }
+
+        public static void InitCNProfessionalDocDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "Value";
+            dropName.DataTextField = "Text";
+            dropName.DataSource = GetCNProfessionalDocItem();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
     }
 }
diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
index 220d3ddc..8cb2eaa5 100644
--- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
+++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
@@ -396,5 +396,19 @@ namespace BLL
                 }
             }
         }
+
+        public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
+        {
+            List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList();
+            //if (isOnceQualified == true)
+            //{
+            InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
+            //}
+            if (startDate != null && SoptDate != null)
+            {
+                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+            }
+            return InspectionMangementList;
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index e0439ccc..60ce8daa 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3183,6 +3183,13 @@ namespace BLL
         /// 全厂地下管网完成情况导入模版文件原始的虚拟路径
         /// </summary>
         public const string UndergroundPipeCompletionTemplateUrl = "File\\Excel\\DataIn\\全厂地下管网完成情况导入模板.xls";
+        /// 月度计划情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string MonthPlanTemplateUrl = "File\\Excel\\DataIn\\月度计划情况导入模板.xls";
+        /// <summary>
+        /// 周进度计划导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string WeekPlanTemplateUrl = "File\\Excel\\DataIn\\周进度计划导入模板.xls";
         /// <summary>
         /// 施工进度报表模板
         /// </summary>
@@ -3896,6 +3903,11 @@ namespace BLL
         /// </summary>
         public const string InspectionEquipmentMenuId = "6c2c1e5e-1812-4e1c-a683-7125518e28c7";
 
+        /// <summary>
+        /// 安全专业ID
+        /// </summary>
+        public const string CNProfessionalHSEId = "BD344C54-66CC-4547-89AF-04C297D60CD7";
+
         /// <summary>
         /// 人员报验
         /// </summary>
@@ -5762,6 +5774,11 @@ namespace BLL
         /// </summary>
         public const string MonthPlanMenuId = "94287B92-7E96-4B90-BC6F-DAF30AE3B314";
 
+        /// <summary>
+        /// 周进度计划
+        /// </summary>
+        public const string WeekPlanMenuId = "56A54B4B-BBA3-4249-9FFC-3A60DAC79059";
+
         /// <summary>
         /// 进度完成情况
         /// </summary>
diff --git a/SGGL/BLL/JDGL/Check/MonthPlanService.cs b/SGGL/BLL/JDGL/Check/MonthPlanService.cs
index 9b21c6f6..fd0fb1dc 100644
--- a/SGGL/BLL/JDGL/Check/MonthPlanService.cs
+++ b/SGGL/BLL/JDGL/Check/MonthPlanService.cs
@@ -22,6 +22,16 @@ namespace BLL
             return Funs.DB.JDGL_MonthPlan.FirstOrDefault(e => e.MonthPlanId == MonthPlanId);
         }
 
+        /// <summary>
+        /// 根据主键获取月度计划情况
+        /// </summary>
+        /// <param name="MonthPlanId"></param>
+        /// <returns></returns>
+        public static List<Model.JDGL_MonthPlan> GetMonthPlansByMonths(string projectId, DateTime months)
+        {
+            return (from x in Funs.DB.JDGL_MonthPlan where x.ProjectId == projectId && x.Months == months select x).ToList();
+        }
+
         /// <summary>
         /// 添加月度计划情况
         /// </summary>
@@ -84,5 +94,20 @@ namespace BLL
                 db.SubmitChanges();
             }
         }
+
+        /// <summary>
+        /// 根据主键删除月度计划情况
+        /// </summary>
+        /// <param name="MonthPlanId"></param>
+        public static void DeleteAllMonthPlan(string projectId, DateTime months)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = from x in db.JDGL_MonthPlan where x.ProjectId == projectId && x.Months == months select x;
+            if (q != null)
+            {
+                db.JDGL_MonthPlan.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
     }
 }
diff --git a/SGGL/BLL/JDGL/Check/WeekPlanService.cs b/SGGL/BLL/JDGL/Check/WeekPlanService.cs
new file mode 100644
index 00000000..12deb96d
--- /dev/null
+++ b/SGGL/BLL/JDGL/Check/WeekPlanService.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 周计划情况
+    /// </summary>
+    public class WeekPlanService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取周计划情况
+        /// </summary>
+        /// <param name="WeekPlanId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_WeekPlan GetWeekPlanById(string WeekPlanId)
+        {
+            return Funs.DB.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlanId);
+        }
+
+        /// <summary>
+        /// 根据主键获取周计划情况
+        /// </summary> 
+        /// <param name="WeekPlanId"></param>
+        /// <returns></returns>
+        public static List<Model.JDGL_WeekPlan> GetWeekPlansByWeeks(string projectId, string weekNo)
+        {
+            return (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x).ToList();
+        }
+
+        /// <summary>
+        /// 添加周计划情况
+        /// </summary>
+        /// <param name="WeekPlan"></param>
+        public static void AddWeekPlan(Model.JDGL_WeekPlan WeekPlan)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_WeekPlan newWeekPlan = new Model.JDGL_WeekPlan
+            {
+                WeekPlanId = WeekPlan.WeekPlanId,
+                ProjectId = WeekPlan.ProjectId,
+                WeekNo = WeekPlan.WeekNo,
+                StartDate = WeekPlan.StartDate,
+                EndDate = WeekPlan.EndDate,
+                UnitWork = WeekPlan.UnitWork,
+                Major = WeekPlan.Major,
+                WorkContent = WeekPlan.WorkContent,
+                UnitId = WeekPlan.UnitId,
+                DutyPerson = WeekPlan.DutyPerson,
+                PlanDate = WeekPlan.PlanDate,
+                IsOK = WeekPlan.IsOK,
+                Remark = WeekPlan.Remark,
+                CompileMan = WeekPlan.CompileMan,
+                CompileDate = WeekPlan.CompileDate,
+                SortIndex = WeekPlan.SortIndex,
+            };
+            db.JDGL_WeekPlan.InsertOnSubmit(newWeekPlan);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改周计划情况
+        /// </summary>
+        /// <param name="WeekPlan"></param>
+        public static void UpdateWeekPlan(Model.JDGL_WeekPlan WeekPlan)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_WeekPlan newWeekPlan = db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlan.WeekPlanId);
+            if (newWeekPlan != null)
+            {
+                newWeekPlan.UnitWork = WeekPlan.UnitWork;
+                newWeekPlan.Major = WeekPlan.Major;
+                newWeekPlan.WorkContent = WeekPlan.WorkContent;
+                newWeekPlan.UnitId = WeekPlan.UnitId;
+                newWeekPlan.DutyPerson = WeekPlan.DutyPerson;
+                newWeekPlan.PlanDate = WeekPlan.PlanDate;
+                newWeekPlan.IsOK = WeekPlan.IsOK;
+                newWeekPlan.Remark = WeekPlan.Remark;
+                newWeekPlan.CompileMan = WeekPlan.CompileMan;
+                newWeekPlan.CompileDate = WeekPlan.CompileDate;
+                newWeekPlan.SortIndex = WeekPlan.SortIndex;
+
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除周计划情况
+        /// </summary>
+        /// <param name="WeekPlanId"></param>
+        public static void DeleteWeekPlanByWeekPlanId(string WeekPlanId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in db.JDGL_WeekPlan where x.WeekPlanId == WeekPlanId select x).FirstOrDefault();
+            if (q != null)
+            {
+                db.JDGL_WeekPlan.DeleteOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除周计划情况
+        /// </summary>
+        /// <param name="WeekPlanId"></param>
+        public static void DeleteAllWeekPlan(string projectId, string weekNo)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x;
+            if (q != null)
+            {
+                db.JDGL_WeekPlan.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/ProjectData/ProjectUnitService.cs b/SGGL/BLL/ProjectData/ProjectUnitService.cs
index b923eeee..3265c145 100644
--- a/SGGL/BLL/ProjectData/ProjectUnitService.cs
+++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs
@@ -197,5 +197,31 @@
                     orderby x.UnitType, y.UnitCode
                     select x).ToList();
         }
+
+        /// <summary>
+        ///  项目类型单位表下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitUnitDropDownList2(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var pUnit = (from x in db.Project_ProjectUnit
+                             join y in db.Base_Unit on x.UnitId equals y.UnitId
+                             where x.ProjectId == projectId && x.UnitType == unitType
+                             orderby y.UnitCode
+                             select y).ToList();
+
+                dropName.DataValueField = "UnitName";
+                dropName.DataTextField = "UnitName";
+                dropName.DataSource = pUnit;
+                dropName.DataBind();
+                if (isShowPlease)
+                {
+                    Funs.FineUIPleaseSelect(dropName);
+                }
+            }
+        }
     }
 }