关键事项、周进度、月度计划

SGGL/BLL/BLL.csproj

@@ -601,6 +601,7 @@
     <Compile Include="JDGL\Check\QuantityListService.cs" />
     <Compile Include="JDGL\Check\SteelStructureCompletionService.cs" />
     <Compile Include="JDGL\Check\UndergroundPipeCompletionService.cs" />
+    <Compile Include="JDGL\Check\WeekItemService.cs" />
     <Compile Include="JDGL\Check\WeekPlanService.cs" />
     <Compile Include="JDGL\WBSCompleteAndReal\WBSReportService.cs" />
     <Compile Include="JDGL\WBS\CnProfessionInitService.cs" />

SGGL/BLL/Common/Const.cs

@@ -4805,6 +4805,14 @@ namespace BLL
         public const string WeekPlanOutTemplateUrl = "File\\Excel\\DataOut\\周进度计划.xlsx";
         #endregion
 
+        #region 关键事项
+
+        /// <summary>
+        /// 关键事项模板文件原始虚拟路径
+        /// </summary>
+        public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项.xlsx";
+
+        #endregion
         #endregion
 
         #region 质量流程定义
@@ -5941,7 +5949,7 @@ namespace BLL
         public const string RectificationMeasureMenuId = "0629BAB1-DB1C-42CE-A333-49F3813617D7";
 
         /// <summary>
-        /// 工程量完成情况
+        /// 月进度计划
         /// </summary>
         public const string MonthPlanMenuId = "94287B92-7E96-4B90-BC6F-DAF30AE3B314";
 

SGGL/BLL/JDGL/Check/WeekItemService.cs

@@ -0,0 +1,128 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 自定义周
+    /// </summary>
+    public class WeekItemService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取自定义周情况
+        /// </summary>
+        /// <param name="WeekId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_WeekItem GetWeekItemById(string WeekId)
+        {
+            return db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekId);
+        }
+
+        /// <summary>
+        /// 根据项目Id和周号查询
+        /// </summary>
+        /// <param name="ProjectId"></param>
+        /// <param name="WeekNo"></param>
+        /// <returns></returns>
+        public static Model.JDGL_WeekItem GetWeekItemByProjectIdAndWeekNo(string ProjectId, int WeekNo)
+        {
+            return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.WeekNo == WeekNo);
+        }
+
+        /// <summary>
+        /// 根据当前时间获取所在周
+        /// </summary>
+        /// <param name="ProjectId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_WeekItem GetWeekItemByDateNow(string ProjectId)
+        {
+            return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.StartDate < DateTime.Now && e.EndDate > DateTime.Now);
+        }
+        /// <summary>
+        /// 添加自定义周情况
+        /// </summary>
+        /// <param name="WeekItem"></param>
+        public static void AddWeekItem(Model.JDGL_WeekItem WeekItem)
+        {
+            Model.JDGL_WeekItem newWeekItem = new Model.JDGL_WeekItem
+            {
+                WeekId = WeekItem.WeekId,
+                ProjectId = WeekItem.ProjectId,
+                WeekNo = WeekItem.WeekNo,
+                StartDate = WeekItem.StartDate,
+                EndDate = WeekItem.EndDate,
+                CompileMan = WeekItem.CompileMan,
+                CompileDate = WeekItem.CompileDate,
+            };
+            db.JDGL_WeekItem.InsertOnSubmit(newWeekItem);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改自定义周情况
+        /// </summary>
+        /// <param name="WeekItem"></param>
+        public static void UpdateWeekItem(Model.JDGL_WeekItem WeekItem)
+        {
+            Model.JDGL_WeekItem newWeekItem = db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekItem.WeekId);
+            if (newWeekItem != null)
+            {
+                newWeekItem.WeekNo = WeekItem.WeekNo;
+                newWeekItem.StartDate = WeekItem.StartDate;
+                newWeekItem.EndDate = WeekItem.EndDate;
+                newWeekItem.CompileMan = WeekItem.CompileMan;
+                newWeekItem.CompileDate = WeekItem.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除自定义周情况
+        /// </summary>
+        /// <param name="WeekId"></param>
+        public static void DeleteWeekItemById(string WeekId)
+        {
+            var q = (from x in db.JDGL_WeekItem where x.WeekId == WeekId select x).FirstOrDefault();
+            if (q != null)
+            {
+                db.JDGL_WeekItem.DeleteOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+
+        /// <summary>
+        /// 获取所有自定义周List
+        /// </summary>
+        /// <param name="WeekId"></param>
+        /// <returns></returns>
+        public static List<JDGL_WeekItem> GetWeekItemList(string ProjectId)
+        {
+            return (from x in db.JDGL_WeekItem where x.ProjectId == ProjectId orderby x.WeekNo descending select x).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取自定义周下拉框
+        /// </summary>
+        /// <param name="dropName"></param>
+        /// <param name="projectId"></param>
+        /// <param name="isShowPlease"></param>
+        public static void InitWeekItemDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "WeekNo";
+            dropName.DataTextField = "WeekNo";
+            dropName.DataSource = GetWeekItemList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+    }
+}

SGGL/BLL/PZHGL/GJSX/GJSXService.cs

@@ -66,8 +66,8 @@ namespace BLL
             {
                 newGJSX.GJSXID = _GJSX.GJSXID;
                 newGJSX.Detail = _GJSX.Detail;
-                newGJSX.UserID = _GJSX.UserID;
-                newGJSX.CreateDate = _GJSX.CreateDate;
+                //newGJSX.UserID = _GJSX.UserID;
+                //newGJSX.CreateDate = _GJSX.CreateDate;
                 newGJSX.User_ReceiveID = _GJSX.User_ReceiveID;
                 newGJSX.CNProfessional_ID = _GJSX.CNProfessional_ID;
                 newGJSX.ProjectId = _GJSX.ProjectId;