修改员工考核

SGGL/BLL/Common/Const.cs

@@ -3543,6 +3543,11 @@
         /// </summary>
         public static string ActionPlanList_Review2 = "5";
 
+        /// <summary>
+        /// 公司部门评审
+        /// </summary>
+        public static string ActionPlanList_DepartReview = "6";
+
         /// <summary>
         /// 审批完成
         /// </summary>

SGGL/BLL/HSSE/ActionPlan/ActionPlanListApproveService.cs

@@ -6,6 +6,12 @@ namespace BLL
 {
     public class ActionPlanListApproveService
     {
+        public static Model.ActionPlan_ActionPlanListApprove GetActionPlanListApproveByActionPlanListApproveId(string ActionPlanListApproveId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            return db.ActionPlan_ActionPlanListApprove.FirstOrDefault(x => x.ActionPlanListApproveId == ActionPlanListApproveId);
+        }
+
         public static Model.ActionPlan_ActionPlanListApprove GetSee(string ActionPlanListId, string userId)
         {
             Model.SGGLDB db = Funs.DB;
@@ -108,6 +114,7 @@ namespace BLL
             newApprove.ApproveMan = approve.ApproveMan;
             newApprove.ApproveDate = approve.ApproveDate;
             newApprove.ApproveIdea = approve.ApproveIdea;
+            newApprove.DepartId = approve.DepartId;
             newApprove.IsAgree = approve.IsAgree;
             newApprove.ApproveType = approve.ApproveType;
             newApprove.Edition = approve.Edition;
@@ -179,6 +186,35 @@ namespace BLL
             return res.ToList();
         }
 
+        /// <summary>
+        /// 获取安全实施计划模板列表
+        /// </summary>
+        /// <param name="satartRowIndex"></param>
+        /// <param name="maximumRows"></param>
+        /// <returns></returns>
+        public static IList<Model.ActionPlan_ActionPlanListApprove> getDepartListData(string ActionPlanListId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var res = from x in db.ActionPlan_ActionPlanListApprove
+                      where x.ActionPlanListId == ActionPlanListId && x.DepartId != null
+                      orderby x.ApproveDate
+                      select x;
+
+            //select new
+            //{
+            //    x.ActionPlanListApproveId,
+            //    x.ActionPlanListId,
+            //    x.ApproveMan,
+            //    x.ApproveDate,
+            //    x.IsAgree,
+            //    x.ApproveIdea,
+            //    x.ApproveType,
+            //    x.SignType,
+            //    //= x.IsAgree == true ? "是" : "否",
+            //};
+            return res.ToList();
+        }
+
         /// <summary>
         /// 获取未代办的记录数量
         /// </summary>
@@ -233,6 +269,22 @@ namespace BLL
                 db.SubmitChanges();
             }
         }
+
+        /// <summary>
+        /// 根据安全实施计划编号删除对应的所有安全实施计划审批信息
+        /// </summary>
+        /// <param name="ActionPlanListCode">安全实施计划编号</param>
+        public static void DeleteActionPlanListApprovesByActionPlanListApproveId(string ActionPlanListApproveId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in Funs.DB.ActionPlan_ActionPlanListApprove where x.ActionPlanListApproveId == ActionPlanListApproveId select x).FirstOrDefault();
+            if (q!=null)
+            {
+                db.ActionPlan_ActionPlanListApprove.DeleteOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
         /// <summary>
         /// 根据安全实施计划编号获取一个安全实施计划审批信息
         /// </summary>
@@ -277,6 +329,7 @@ namespace BLL
             newApprove.ApproveIdea = approve.ApproveIdea;
             newApprove.IsAgree = approve.IsAgree;
             newApprove.ApproveType = approve.ApproveType;
+            newApprove.DepartId = approve.DepartId;
             newApprove.SignType = approve.SignType;
             newApprove.Edition = approve.Edition;
             db.ActionPlan_ActionPlanListApprove.InsertOnSubmit(newApprove);
@@ -299,6 +352,7 @@ namespace BLL
                 newApprove.ApproveMan = approve.ApproveMan;
                 newApprove.ApproveDate = approve.ApproveDate;
                 newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.DepartId = approve.DepartId;
                 newApprove.IsAgree = approve.IsAgree;
                 newApprove.ApproveType = approve.ApproveType;
                 newApprove.SignType = approve.SignType;

SGGL/BLL/HSSE/ActionPlan/ActionPlanListService.cs

@@ -143,6 +143,10 @@ namespace BLL
                 {
                     return "评审负责人办理";
                 }
+                else if (state.ToString() == BLL.Const.ActionPlanList_DepartReview)
+                {
+                    return "公司部门评审";
+                }
                 else if (state.ToString() == BLL.Const.ActionPlanList_Complete)
                 {
                     return "审批完成";

SGGL/BLL/SysManage/DepartService.cs

@@ -124,5 +124,24 @@ namespace BLL
             }
         }
         #endregion
+
+        #region 表下拉框
+        /// <summary>
+        ///  表下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitDepartNameDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "DepartName";
+            dropName.DataTextField = "DepartName";
+            dropName.DataSource = BLL.DepartService.GetDepartList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+        #endregion
     }
 }