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

SGGL/BLL/Common/Const.cs

@@ -1005,6 +1005,11 @@
         /// </summary>
         public const string NoticeAndSupervisionTypeMenuId = "CCD45D20-EA3F-47E7-8176-AB085778539E";
 
+        /// <summary>
+        /// 公司质量样板类别
+        /// </summary>
+        public const string CompanyModelKindMenuId = "B9372A07-8A93-4EC0-9374-FDE1ED958DAE";
+
         /// <summary>
         /// 公司质量样板
         /// </summary>
@@ -4475,5 +4480,24 @@
         /// </summary>
         public const string Project_SYHSEData_SYHSEMenuId = "";
         #endregion
+
+        #region 上报资源状态
+        /// <summary>
+        /// 本单位
+        /// </summary>
+        public const string UpState_1 = "1";
+        /// <summary>
+        /// 待上报
+        /// </summary>
+        public const string UpState_2 = "2";
+        /// <summary>
+        /// 已上报
+        /// </summary>
+        public const string UpState_3 = "3";
+        /// <summary>
+        /// 上报失败
+        /// </summary>
+        public const string UpState_4 = "4";
+        #endregion
     }
 }

SGGL/BLL/Common/ProjectDataFlowSetService.cs

@@ -1,5 +1,6 @@
 namespace BLL
 {
+    using System;
     using System.Collections;
     using System.Linq;
 
@@ -304,5 +305,20 @@
                     where x.MenuId == menuId && x.DataId == dataId && (x.IsClosed == false || !x.IsClosed.HasValue)
                     select x).FirstOrDefault();
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public static void CloseFlowOperate(string menuId, string dataId, string opinion)
+        {
+            var updateUnFlowOperate = db.ProjectData_FlowOperate.FirstOrDefault(x => x.MenuId == menuId && x.DataId == dataId && (x.IsClosed == false || !x.IsClosed.HasValue));
+            if (updateUnFlowOperate != null)
+            {
+                updateUnFlowOperate.OperaterTime = DateTime.Now;
+                updateUnFlowOperate.IsClosed = true;
+                updateUnFlowOperate.Opinion = opinion;
+                BLL.ProjectDataFlowSetService.UpdateFlowOperateOpinion(updateUnFlowOperate);
+            }
+        }
     }
 }