修改项目安全实施计划

2023-06-01 17:14:29 +08:00
parent 5470404048
commit 75b2d905c9
28 changed files with 5430 additions and 190 deletions
@@ -45,6 +45,10 @@ namespace BLL
                ActionPlanListName = actionPlanList.ActionPlanListName,
                VersionNo = actionPlanList.VersionNo,
                ProjectType = actionPlanList.ProjectType,
+                Edition = actionPlanList.Edition,
+                IsReview = actionPlanList.IsReview,
+                ReviewMan = actionPlanList.ReviewMan,
+                IsCompanyReview = actionPlanList.IsCompanyReview,
                ActionPlanListContents = actionPlanList.ActionPlanListContents,
                CompileMan = actionPlanList.CompileMan,
                CompileDate = actionPlanList.CompileDate,
@@ -72,6 +76,10 @@ namespace BLL
                newActionPlanList.ActionPlanListName = actionPlanList.ActionPlanListName;
                newActionPlanList.VersionNo = actionPlanList.VersionNo;
                newActionPlanList.ProjectType = actionPlanList.ProjectType;
+                newActionPlanList.Edition = actionPlanList.Edition;
+                newActionPlanList.IsReview = actionPlanList.IsReview;
+                newActionPlanList.ReviewMan = actionPlanList.ReviewMan;
+                newActionPlanList.IsCompanyReview = actionPlanList.IsCompanyReview;
                newActionPlanList.ActionPlanListContents = actionPlanList.ActionPlanListContents;
                newActionPlanList.CompileMan = actionPlanList.CompileMan;
                newActionPlanList.CompileDate = actionPlanList.CompileDate;
@@ -89,6 +97,7 @@ namespace BLL
            Model.ActionPlan_ActionPlanList actionPlanList = Funs.DB.ActionPlan_ActionPlanList.FirstOrDefault(e => e.ActionPlanListId == actionPlanListId);
            if (actionPlanList != null)
            {
+                BLL.ActionPlanListApproveService.DeleteActionPlanListApprovesByActionPlanListId(actionPlanListId);
                ////删除审核流程表
                BLL.CommonService.DeleteFlowOperateByID(actionPlanList.ActionPlanListId);
                ///删除附件
@@ -99,5 +108,68 @@ namespace BLL
                Funs.DB.SubmitChanges();
            }
        }
+
+        /// <summary>
+        /// 把状态转换代号为文字形式
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        /// 
+        public static string ConvertState(object state)
+        {
+            if (state != null)
+            {
+                if (state.ToString() == BLL.Const.ActionPlanList_ReCompile)
+                {
+                    return "重报";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Compile)
+                {
+                    return "编制";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Audit)
+                {
+                    return "会签";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Review)
+                {
+                    return "评审负责人办理";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Reviewing)
+                {
+                    return "施工管理部评审";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Review2)
+                {
+                    return "评审负责人办理";
+                }
+                else if (state.ToString() == BLL.Const.ActionPlanList_Complete)
+                {
+                    return "审批完成";
+                }
+            }
+            return "";
+        }
+
+        public static string IsAgree(Object type, Object res)
+        {
+            string result = string.Empty;
+            if (type.ToString().Equals(Const.ActionPlanList_ReCompile) || type.ToString().Equals(Const.ActionPlanList_Compile))
+            {
+                res = null;
+            }
+            if (res != null)
+            {
+                if (Convert.ToBoolean(res))
+                {
+                    result = "是";
+                }
+                else
+                {
+                    result = "否";
+                }
+            }
+            return result;
+        }
    }
 }