1

2026-04-08 14:03:39 +08:00
parent 7ecbc2ebc0
commit 4a1b636ce0
353 changed files with 1378 additions and 500 deletions
@@ -9,7 +9,7 @@ namespace BLL
 {
    public class DesignApproveService
    {
-        public static Model.CNPCDB db = Funs.DB;
+        

        /// <summary>
        /// 获取设计变更模板列表
@@ -19,6 +19,7 @@ namespace BLL
        /// <returns></returns>
        public static IEnumerable getListData(string DesignId)
        {
+            Model.CNPCDB db = Funs.DB;
            return from x in db.Check_DesignApprove
                   where x.DesignId == DesignId && x.ApproveDate != null
                   orderby x.ApproveDate
@@ -41,6 +42,7 @@ namespace BLL
        /// <returns>一个设计变更审批实体</returns>
        public static Model.Check_DesignApprove GetDesignApproveByDesignId(string DesignId)
        {
+            Model.CNPCDB db = Funs.DB;
            return db.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveDate == null);
        }

@@ -51,21 +53,25 @@ namespace BLL
        /// <returns>一个设计变更审批实体</returns>
        public static Model.Check_DesignApprove GetDesignApproveByApproveId(string approveId)
        {
+            Model.CNPCDB db = Funs.DB;
            return db.Check_DesignApprove.FirstOrDefault(x => x.DesignApproveId == approveId);
        }

        public static Model.Check_DesignApprove GetComplie(string DesignId)
        {
+            Model.CNPCDB db = Funs.DB;
            return db.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == BLL.Const.Design_Compile);
        }

        public static Model.Check_DesignApprove GetAuditMan(string DesignId, string state)
        {
+            Model.CNPCDB db = Funs.DB;
            return db.Check_DesignApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == state);
        }

        public static Model.Check_DesignApprove GetAudit2(string DesignId)
        {
+            Model.CNPCDB db = Funs.DB;
            return db.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == BLL.Const.Design_Audit2);
        }

@@ -76,6 +82,7 @@ namespace BLL
        /// <returns>设计变更审批集合</returns>
        public static List<Model.Check_DesignApprove> GetDesignApprovesByDesignId(string DesignId)
        {
+            Model.CNPCDB db = Funs.DB;
            return (from x in db.Check_DesignApprove where x.DesignId == DesignId select x).ToList();
        }