2023-04-28 天辰质量报验移植

SGGL/BLL/CQMS/Comprehensive/DataDistributionApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class DataDistributionApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_DataDistributionApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_DataDistributionApprove newApprove = new Model.Comprehensive_DataDistributionApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.DataDistributionApproveId))
+            {  //新增
+                newApprove.DataDistributionApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataDistributionApprove));
+                newApprove.DataDistributionId = approve.DataDistributionId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_DataDistributionApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_DataDistributionApprove editApprove = db.Comprehensive_DataDistributionApprove.FirstOrDefault(e => e.DataDistributionApproveId == approve.DataDistributionApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.DataDistributionId = approve.DataDistributionId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_DataDistributionApprove GetCurrentApprove(string DataDistributionId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DataDistributionApprove
+                    where x.DataDistributionId == DataDistributionId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_DataDistributionApprove GetState(string DataDistributionId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DataDistributionApprove
+                    where x.DataDistributionId == DataDistributionId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="DataDistributionId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_DataDistributionApprove GetApproveByApproveMan(string DataDistributionId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_DataDistributionApprove.FirstOrDefault(x => x.DataDistributionId == DataDistributionId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="DataDistributionId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_DataDistributionApprove> GetApproveByApproveManList(string DataDistributionId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_DataDistributionApprove.Where(x => x.DataDistributionId == DataDistributionId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="DataDistributionId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string DataDistributionId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_DataDistributionApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(DataDistributionId))
+            {
+                strSql += "where i.DataDistributionId= @DataDistributionId ";
+                listStr.Add(new SqlParameter("@DataDistributionId", DataDistributionId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs

@@ -129,7 +129,7 @@ namespace BLL
             newDataDistribution.AttachUrl = DataDistribution.AttachUrl;
             newDataDistribution.CompileMan = DataDistribution.CompileMan;
             newDataDistribution.CompileDate = DataDistribution.CompileDate;
-
+            newDataDistribution.Status = DataDistribution.Status;
             db.Comprehensive_DataDistribution.InsertOnSubmit(newDataDistribution);
             db.SubmitChanges();
         }
@@ -159,7 +159,7 @@ namespace BLL
                 newDataDistribution.ReplyDate = DataDistribution.ReplyDate;
                 newDataDistribution.Remark = DataDistribution.Remark;
                 newDataDistribution.AttachUrl = DataDistribution.AttachUrl;
-
+                newDataDistribution.Status = DataDistribution.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/DataReceivingApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class DataReceivingApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_DataReceivingApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_DataReceivingApprove newApprove = new Model.Comprehensive_DataReceivingApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.DataReceivingApproveId))
+            {  //新增
+                newApprove.DataReceivingApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingApprove));
+                newApprove.DataReceivingId = approve.DataReceivingId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_DataReceivingApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_DataReceivingApprove editApprove = db.Comprehensive_DataReceivingApprove.FirstOrDefault(e => e.DataReceivingApproveId == approve.DataReceivingApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.DataReceivingId = approve.DataReceivingId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_DataReceivingApprove GetCurrentApprove(string DataReceivingId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DataReceivingApprove
+                    where x.DataReceivingId == DataReceivingId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_DataReceivingApprove GetState(string DataReceivingId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DataReceivingApprove
+                    where x.DataReceivingId == DataReceivingId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="DataReceivingId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_DataReceivingApprove GetApproveByApproveMan(string DataReceivingId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_DataReceivingApprove.FirstOrDefault(x => x.DataReceivingId == DataReceivingId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="DataReceivingId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_DataReceivingApprove> GetApproveByApproveManList(string DataReceivingId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_DataReceivingApprove.Where(x => x.DataReceivingId == DataReceivingId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="DataReceivingId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string DataReceivingId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_DataReceivingApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(DataReceivingId))
+            {
+                strSql += "where i.DataReceivingId= @DataReceivingId ";
+                listStr.Add(new SqlParameter("@DataReceivingId", DataReceivingId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs

@@ -123,7 +123,7 @@ namespace BLL
             newDataReceiving.AttachUrl = DataReceiving.AttachUrl;
             newDataReceiving.CompileMan = DataReceiving.CompileMan;
             newDataReceiving.CompileDate = DataReceiving.CompileDate;
-
+            newDataReceiving.Status = DataReceiving.Status;
             db.Comprehensive_DataReceiving.InsertOnSubmit(newDataReceiving);
             db.SubmitChanges();
         }
@@ -153,7 +153,7 @@ namespace BLL
                 newDataReceiving.ReplyDate = DataReceiving.ReplyDate;
                 newDataReceiving.Remark = DataReceiving.Remark;
                 newDataReceiving.AttachUrl = DataReceiving.AttachUrl;
-
+                newDataReceiving.Status = DataReceiving.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class DesignChangeOrderApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_DesignChangeOrderApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_DesignChangeOrderApprove newApprove = new Model.Comprehensive_DesignChangeOrderApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.DesignChangeOrderApproveId))
+            {  //新增
+                newApprove.DesignChangeOrderApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrderApprove));
+                newApprove.DesignChangeOrderId = approve.DesignChangeOrderId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_DesignChangeOrderApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_DesignChangeOrderApprove editApprove = db.Comprehensive_DesignChangeOrderApprove.FirstOrDefault(e => e.DesignChangeOrderApproveId == approve.DesignChangeOrderApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.DesignChangeOrderId = approve.DesignChangeOrderId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_DesignChangeOrderApprove GetCurrentApprove(string DesignChangeOrderId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DesignChangeOrderApprove
+                    where x.DesignChangeOrderId == DesignChangeOrderId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_DesignChangeOrderApprove GetState(string DesignChangeOrderId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DesignChangeOrderApprove
+                    where x.DesignChangeOrderId == DesignChangeOrderId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="DesignChangeOrderId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_DesignChangeOrderApprove GetApproveByApproveMan(string DesignChangeOrderId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_DesignChangeOrderApprove.FirstOrDefault(x => x.DesignChangeOrderId == DesignChangeOrderId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="DesignChangeOrderId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_DesignChangeOrderApprove> GetApproveByApproveManList(string DesignChangeOrderId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_DesignChangeOrderApprove.Where(x => x.DesignChangeOrderId == DesignChangeOrderId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="DesignChangeOrderId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string DesignChangeOrderId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_DesignChangeOrderApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(DesignChangeOrderId))
+            {
+                strSql += "where i.DesignChangeOrderId= @DesignChangeOrderId ";
+                listStr.Add(new SqlParameter("@DesignChangeOrderId", DesignChangeOrderId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs

@@ -196,7 +196,7 @@ namespace BLL
             newDesignChangeOrder.CompileMan = desginChangeOrder.CompileMan;
             newDesignChangeOrder.CompileDate = desginChangeOrder.CompileDate;
             newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate;
-
+            newDesignChangeOrder.Status = desginChangeOrder.Status;
             db.Comprehensive_DesignChangeOrder.InsertOnSubmit(newDesignChangeOrder);
             db.SubmitChanges();
         }
@@ -224,7 +224,7 @@ namespace BLL
                 newDesignChangeOrder.AttachUrl = desginChangeOrder.AttachUrl;
                 newDesignChangeOrder.ImplementationFrontState = desginChangeOrder.ImplementationFrontState;
                 newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate;
-
+                newDesignChangeOrder.Status = desginChangeOrder.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/DesignDetailsApproveService.cs

@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class DesignDetailsApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_DesignDetailsApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.DesignDetailsApproveId))
+            {  //新增
+                newApprove.DesignDetailsApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetailsApprove));
+                newApprove.DesignDetailsId = approve.DesignDetailsId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_DesignDetailsApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_DesignDetailsApprove editApprove = db.Comprehensive_DesignDetailsApprove.FirstOrDefault(e => e.DesignDetailsApproveId == approve.DesignDetailsApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.DesignDetailsId = approve.DesignDetailsId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_DesignDetailsApprove GetCurrentApprove(string DesignDetailsId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DesignDetailsApprove
+                    where x.DesignDetailsId == DesignDetailsId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+        public static Model.Comprehensive_DesignDetailsApprove GetAuditApprove(string DesignDetailsId,string approveType)
+        {
+            var q = from x in Funs.DB.Comprehensive_DesignDetailsApprove
+                    where x.DesignDetailsId == DesignDetailsId && x.ApproveType != "S" && x.ApproveDate == null && x.ApproveType == approveType
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+        public static Model.Comprehensive_DesignDetailsApprove GetState(string DesignDetailsId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DesignDetailsApprove
+                    where x.DesignDetailsId == DesignDetailsId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="DesignDetailsId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_DesignDetailsApprove GetApproveByApproveMan(string DesignDetailsId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_DesignDetailsApprove.FirstOrDefault(x => x.DesignDetailsId == DesignDetailsId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="DesignDetailsId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_DesignDetailsApprove> GetApproveByApproveManList(string DesignDetailsId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_DesignDetailsApprove.Where(x => x.DesignDetailsId == DesignDetailsId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="DesignDetailsId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string DesignDetailsId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_DesignDetailsApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(DesignDetailsId))
+            {
+                strSql += "where i.DesignDetailsId= @DesignDetailsId ";
+                listStr.Add(new SqlParameter("@DesignDetailsId", DesignDetailsId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs

@@ -138,6 +138,10 @@ namespace BLL
             newDesignDetails.AttachUrl = designDetails.AttachUrl;
             newDesignDetails.CompileMan = designDetails.CompileMan;
             newDesignDetails.CompileDate = designDetails.CompileDate;
+            newDesignDetails.Status = designDetails.Status;
+            newDesignDetails.AuditMan = designDetails.AuditMan;
+
+            
             db.Comprehensive_DesignDetails.InsertOnSubmit(newDesignDetails);
             db.SubmitChanges();
         }
@@ -160,6 +164,9 @@ namespace BLL
                 newDesignDetails.UnitWorkId = designDetails.UnitWorkId;
                 newDesignDetails.UnitName = designDetails.UnitName;
                 newDesignDetails.AttachUrl = designDetails.AttachUrl;
+                newDesignDetails.Status = designDetails.Status;
+                newDesignDetails.AuditMan = designDetails.AuditMan;
+
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/DesignDrawingsApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class DesignDrawingsApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_DesignDrawingsApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.DesignDrawingsApproveId))
+            {  //新增
+                newApprove.DesignDrawingsApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawingsApprove));
+                newApprove.DesignDrawingsId = approve.DesignDrawingsId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_DesignDrawingsApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_DesignDrawingsApprove editApprove = db.Comprehensive_DesignDrawingsApprove.FirstOrDefault(e => e.DesignDrawingsApproveId == approve.DesignDrawingsApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.DesignDrawingsId = approve.DesignDrawingsId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_DesignDrawingsApprove GetCurrentApprove(string DesignDrawingsId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DesignDrawingsApprove
+                    where x.DesignDrawingsId == DesignDrawingsId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_DesignDrawingsApprove GetState(string DesignDrawingsId)
+        {
+            var q = from x in Funs.DB.Comprehensive_DesignDrawingsApprove
+                    where x.DesignDrawingsId == DesignDrawingsId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="DesignDrawingsId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_DesignDrawingsApprove GetApproveByApproveMan(string DesignDrawingsId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_DesignDrawingsApprove.FirstOrDefault(x => x.DesignDrawingsId == DesignDrawingsId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="DesignDrawingsId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_DesignDrawingsApprove> GetApproveByApproveManList(string DesignDrawingsId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_DesignDrawingsApprove.Where(x => x.DesignDrawingsId == DesignDrawingsId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="DesignDrawingsId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string DesignDrawingsId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_DesignDrawingsApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(DesignDrawingsId))
+            {
+                strSql += "where i.DesignDrawingsId= @DesignDrawingsId ";
+                listStr.Add(new SqlParameter("@DesignDrawingsId", DesignDrawingsId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs

@@ -122,6 +122,8 @@ namespace BLL
             newDesignDrawings.Remark = designDrawings.Remark;
             newDesignDrawings.RemarkCode = designDrawings.RemarkCode;
             newDesignDrawings.UnitWorkId = designDrawings.UnitWorkId;
+            newDesignDrawings.CompileMan = designDrawings.CompileMan;
+            newDesignDrawings.Status = designDrawings.Status;
             db.Comprehensive_DesignDrawings.InsertOnSubmit(newDesignDrawings);
             db.SubmitChanges();
         }
@@ -149,6 +151,7 @@ namespace BLL
                 newDesignDrawings.Remark = designDrawings.Remark;
                 newDesignDrawings.RemarkCode = designDrawings.RemarkCode;
                 newDesignDrawings.UnitWorkId = designDrawings.UnitWorkId;
+                newDesignDrawings.Status = designDrawings.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class InspectionEquipmentApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_InspectionEquipmentApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_InspectionEquipmentApprove newApprove = new Model.Comprehensive_InspectionEquipmentApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.InspectionEquipmentApprove))
+            {  //新增
+                newApprove.InspectionEquipmentApprove = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipmentApprove));
+                newApprove.InspectionEquipmentId = approve.InspectionEquipmentId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_InspectionEquipmentApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_InspectionEquipmentApprove editApprove = db.Comprehensive_InspectionEquipmentApprove.FirstOrDefault(e => e.InspectionEquipmentApprove == approve.InspectionEquipmentApprove);
+                if (editApprove != null)
+                {
+                    editApprove.InspectionEquipmentId = approve.InspectionEquipmentId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_InspectionEquipmentApprove GetCurrentApprove(string InspectionEquipmentId)
+        {
+            var q = from x in Funs.DB.Comprehensive_InspectionEquipmentApprove
+                    where x.InspectionEquipmentId == InspectionEquipmentId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_InspectionEquipmentApprove GetState(string InspectionEquipmentId)
+        {
+            var q = from x in Funs.DB.Comprehensive_InspectionEquipmentApprove
+                    where x.InspectionEquipmentId == InspectionEquipmentId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="InspectionEquipmentId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_InspectionEquipmentApprove GetApproveByApproveMan(string InspectionEquipmentId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_InspectionEquipmentApprove.FirstOrDefault(x => x.InspectionEquipmentId == InspectionEquipmentId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="InspectionEquipmentId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_InspectionEquipmentApprove> GetApproveByApproveManList(string InspectionEquipmentId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_InspectionEquipmentApprove.Where(x => x.InspectionEquipmentId == InspectionEquipmentId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="InspectionEquipmentId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string InspectionEquipmentId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_InspectionEquipmentApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(InspectionEquipmentId))
+            {
+                strSql += "where i.InspectionEquipmentId= @InspectionEquipmentId ";
+                listStr.Add(new SqlParameter("@InspectionEquipmentId", InspectionEquipmentId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs

@@ -124,7 +124,6 @@ namespace BLL
             newInspectionEquipment.UnitId = inspectionEquipment.UnitId;
             newInspectionEquipment.InspectionCode = inspectionEquipment.InspectionCode;
             newInspectionEquipment.CNProfessionalId = inspectionEquipment.CNProfessionalId;
-            newInspectionEquipment.EquipmentOrMatail = inspectionEquipment.EquipmentOrMatail;
             newInspectionEquipment.InspectionName = inspectionEquipment.InspectionName;
             newInspectionEquipment.Specifications = inspectionEquipment.Specifications;
             newInspectionEquipment.Supplier = inspectionEquipment.Supplier;
@@ -139,6 +138,9 @@ namespace BLL
             newInspectionEquipment.RemarkCode = inspectionEquipment.RemarkCode;
             newInspectionEquipment.UsedPlace = inspectionEquipment.UsedPlace;
             newInspectionEquipment.Attribute = inspectionEquipment.Attribute;
+            newInspectionEquipment.AuditMan = inspectionEquipment.AuditMan;
+
+            newInspectionEquipment.Status = inspectionEquipment.Status;
             db.Comprehensive_InspectionEquipment.InsertOnSubmit(newInspectionEquipment);
             db.SubmitChanges();
         }
@@ -159,7 +161,6 @@ namespace BLL
                 newInspectionEquipment.CNProfessionalId = inspectionEquipment.CNProfessionalId;
                 newInspectionEquipment.InspectionName = inspectionEquipment.InspectionName;
                 newInspectionEquipment.Specifications = inspectionEquipment.Specifications;
-                newInspectionEquipment.EquipmentOrMatail = inspectionEquipment.EquipmentOrMatail;
                 newInspectionEquipment.Supplier = inspectionEquipment.Supplier;
                 newInspectionEquipment.Counts = inspectionEquipment.Counts;
                 newInspectionEquipment.SamplingCount = inspectionEquipment.SamplingCount;
@@ -170,6 +171,8 @@ namespace BLL
                 newInspectionEquipment.RemarkCode = inspectionEquipment.RemarkCode;
                 newInspectionEquipment.UsedPlace = inspectionEquipment.UsedPlace;
                 newInspectionEquipment.Attribute = inspectionEquipment.Attribute;
+                newInspectionEquipment.AuditMan = inspectionEquipment.AuditMan;
+                newInspectionEquipment.Status = inspectionEquipment.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/InspectionMachineApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class InspectionMachineApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_InspectionMachineApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_InspectionMachineApprove newApprove = new Model.Comprehensive_InspectionMachineApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.InspectionMachineApproveId))
+            {  //新增
+                newApprove.InspectionMachineApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachineApprove));
+                newApprove.InspectionMachineId = approve.InspectionMachineId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_InspectionMachineApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_InspectionMachineApprove editApprove = db.Comprehensive_InspectionMachineApprove.FirstOrDefault(e => e.InspectionMachineApproveId == approve.InspectionMachineApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.InspectionMachineId = approve.InspectionMachineId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_InspectionMachineApprove GetCurrentApprove(string InspectionMachineId)
+        {
+            var q = from x in Funs.DB.Comprehensive_InspectionMachineApprove
+                    where x.InspectionMachineId == InspectionMachineId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_InspectionMachineApprove GetState(string InspectionMachineId)
+        {
+            var q = from x in Funs.DB.Comprehensive_InspectionMachineApprove
+                    where x.InspectionMachineId == InspectionMachineId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="InspectionMachineId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_InspectionMachineApprove GetApproveByApproveMan(string InspectionMachineId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_InspectionMachineApprove.FirstOrDefault(x => x.InspectionMachineId == InspectionMachineId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="InspectionMachineId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_InspectionMachineApprove> GetApproveByApproveManList(string InspectionMachineId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_InspectionMachineApprove.Where(x => x.InspectionMachineId == InspectionMachineId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="InspectionMachineId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string InspectionMachineId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_InspectionMachineApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(InspectionMachineId))
+            {
+                strSql += "where i.InspectionMachineId= @InspectionMachineId ";
+                listStr.Add(new SqlParameter("@InspectionMachineId", InspectionMachineId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs

@@ -127,7 +127,7 @@ namespace BLL
             newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
             newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
             newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
-
+            newInspectionMachine.Status = inspectionMachine.Status;
             db.Comprehensive_InspectionMachine.InsertOnSubmit(newInspectionMachine);
             db.SubmitChanges();
         }
@@ -158,7 +158,7 @@ namespace BLL
                 newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
                 newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
                 newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
-
+                newInspectionMachine.Status = inspectionMachine.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/InspectionPersonApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class InspectionPersonApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_InspectionPersonApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_InspectionPersonApprove newApprove = new Model.Comprehensive_InspectionPersonApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.InspectionPersonApproveId))
+            {  //新增
+                newApprove.InspectionPersonApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPersonApprove));
+                newApprove.InspectionPersonId = approve.InspectionPersonId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_InspectionPersonApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_InspectionPersonApprove editApprove = db.Comprehensive_InspectionPersonApprove.FirstOrDefault(e => e.InspectionPersonApproveId == approve.InspectionPersonApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.InspectionPersonId = approve.InspectionPersonId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_InspectionPersonApprove GetCurrentApprove(string InspectionPersonId)
+        {
+            var q = from x in Funs.DB.Comprehensive_InspectionPersonApprove
+                    where x.InspectionPersonId == InspectionPersonId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_InspectionPersonApprove GetState(string InspectionPersonId)
+        {
+            var q = from x in Funs.DB.Comprehensive_InspectionPersonApprove
+                    where x.InspectionPersonId == InspectionPersonId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="InspectionPersonId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_InspectionPersonApprove GetApproveByApproveMan(string InspectionPersonId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_InspectionPersonApprove.FirstOrDefault(x => x.InspectionPersonId == InspectionPersonId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="InspectionPersonId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_InspectionPersonApprove> GetApproveByApproveManList(string InspectionPersonId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_InspectionPersonApprove.Where(x => x.InspectionPersonId == InspectionPersonId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="InspectionPersonId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string InspectionPersonId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_InspectionPersonApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(InspectionPersonId))
+            {
+                strSql += "where i.InspectionPersonId= @InspectionPersonId ";
+                listStr.Add(new SqlParameter("@InspectionPersonId", InspectionPersonId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs

@@ -59,6 +59,7 @@ namespace BLL
             newInspectionPerson.CompileDate = inspectionPerson.CompileDate;
             newInspectionPerson.IsOnSite = inspectionPerson.IsOnSite;
             newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
+            newInspectionPerson.Status = inspectionPerson.Status;
             db.Comprehensive_InspectionPerson.InsertOnSubmit(newInspectionPerson);
             db.SubmitChanges();
         }
@@ -88,6 +89,7 @@ namespace BLL
                 newInspectionPerson.CNProfessionalId = inspectionPerson.CNProfessionalId;
                 newInspectionPerson.IsOnSite = inspectionPerson.IsOnSite;
                 newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
+                newInspectionPerson.Status = inspectionPerson.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/NCRManagementApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class NCRManagementApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_NCRManagementApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_NCRManagementApprove newApprove = new Model.Comprehensive_NCRManagementApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.NCRManagementApproveId))
+            {  //新增
+                newApprove.NCRManagementApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagementApprove));
+                newApprove.NCRManagementId = approve.NCRManagementId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_NCRManagementApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_NCRManagementApprove editApprove = db.Comprehensive_NCRManagementApprove.FirstOrDefault(e => e.NCRManagementApproveId == approve.NCRManagementApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.NCRManagementId = approve.NCRManagementId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_NCRManagementApprove GetCurrentApprove(string NCRManagementId)
+        {
+            var q = from x in Funs.DB.Comprehensive_NCRManagementApprove
+                    where x.NCRManagementId == NCRManagementId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_NCRManagementApprove GetState(string NCRManagementId)
+        {
+            var q = from x in Funs.DB.Comprehensive_NCRManagementApprove
+                    where x.NCRManagementId == NCRManagementId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="NCRManagementId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_NCRManagementApprove GetApproveByApproveMan(string NCRManagementId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_NCRManagementApprove.FirstOrDefault(x => x.NCRManagementId == NCRManagementId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="NCRManagementId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_NCRManagementApprove> GetApproveByApproveManList(string NCRManagementId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_NCRManagementApprove.Where(x => x.NCRManagementId == NCRManagementId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="NCRManagementId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string NCRManagementId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_NCRManagementApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(NCRManagementId))
+            {
+                strSql += "where i.NCRManagementId= @NCRManagementId ";
+                listStr.Add(new SqlParameter("@NCRManagementId", NCRManagementId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs

@@ -115,6 +115,7 @@ namespace BLL
             newNCRManagement.ImplementationFrontState = nCRManagement.ImplementationFrontState;
             newNCRManagement.CompileMan = nCRManagement.CompileMan;
             newNCRManagement.UnitWorkId = nCRManagement.UnitWorkId;
+            newNCRManagement.Status = nCRManagement.Status;
             db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement);
             db.SubmitChanges();
         }
@@ -142,6 +143,7 @@ namespace BLL
                 newNCRManagement.AttachUrl = nCRManagement.AttachUrl;
                 newNCRManagement.ImplementationFrontState = nCRManagement.ImplementationFrontState;
                 newNCRManagement.UnitWorkId = nCRManagement.UnitWorkId;
+                newNCRManagement.Status = nCRManagement.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/PressurePipeApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class PressurePipeApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_PressurePipeApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_PressurePipeApprove newApprove = new Model.Comprehensive_PressurePipeApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.PressurePipeApproveId))
+            {  //新增
+                newApprove.PressurePipeApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_PressurePipeApprove));
+                newApprove.PressurePipeId = approve.PressurePipeId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_PressurePipeApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_PressurePipeApprove editApprove = db.Comprehensive_PressurePipeApprove.FirstOrDefault(e => e.PressurePipeApproveId == approve.PressurePipeApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.PressurePipeId = approve.PressurePipeId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_PressurePipeApprove GetCurrentApprove(string PressurePipeId)
+        {
+            var q = from x in Funs.DB.Comprehensive_PressurePipeApprove
+                    where x.PressurePipeId == PressurePipeId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_PressurePipeApprove GetState(string PressurePipeId)
+        {
+            var q = from x in Funs.DB.Comprehensive_PressurePipeApprove
+                    where x.PressurePipeId == PressurePipeId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="PressurePipeId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_PressurePipeApprove GetApproveByApproveMan(string PressurePipeId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_PressurePipeApprove.FirstOrDefault(x => x.PressurePipeId == PressurePipeId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="PressurePipeId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_PressurePipeApprove> GetApproveByApproveManList(string PressurePipeId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_PressurePipeApprove.Where(x => x.PressurePipeId == PressurePipeId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="PressurePipeId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string PressurePipeId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_PressurePipeApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(PressurePipeId))
+            {
+                strSql += "where i.PressurePipeId= @PressurePipeId ";
+                listStr.Add(new SqlParameter("@PressurePipeId", PressurePipeId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs

@@ -100,7 +100,7 @@ namespace BLL
             newPressurePipe.PressurePipeNumber = PressurePipe.PressurePipeNumber;
             newPressurePipe.IssuedReportNumber = PressurePipe.IssuedReportNumber;
             newPressurePipe.CompileMan = PressurePipe.CompileMan;
-
+            newPressurePipe.Status = PressurePipe.Status;
             db.Comprehensive_PressurePipe.InsertOnSubmit(newPressurePipe);
             db.SubmitChanges();
         }
@@ -123,7 +123,7 @@ namespace BLL
                 newPressurePipe.CompletePackageNumber = PressurePipe.CompletePackageNumber;
                 newPressurePipe.PressurePipeNumber = PressurePipe.PressurePipeNumber;
                 newPressurePipe.IssuedReportNumber = PressurePipe.IssuedReportNumber;
-
+                newPressurePipe.Status = PressurePipe.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/QualityAccidentApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class QualityAccidentApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_QualityAccidentApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_QualityAccidentApprove newApprove = new Model.Comprehensive_QualityAccidentApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.QualityAccidentApproveId))
+            {  //新增
+                newApprove.QualityAccidentApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_QualityAccidentApprove));
+                newApprove.QualityAccidentId = approve.QualityAccidentId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_QualityAccidentApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_QualityAccidentApprove editApprove = db.Comprehensive_QualityAccidentApprove.FirstOrDefault(e => e.QualityAccidentApproveId == approve.QualityAccidentApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.QualityAccidentId = approve.QualityAccidentId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_QualityAccidentApprove GetCurrentApprove(string QualityAccidentId)
+        {
+            var q = from x in Funs.DB.Comprehensive_QualityAccidentApprove
+                    where x.QualityAccidentId == QualityAccidentId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_QualityAccidentApprove GetState(string QualityAccidentId)
+        {
+            var q = from x in Funs.DB.Comprehensive_QualityAccidentApprove
+                    where x.QualityAccidentId == QualityAccidentId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="QualityAccidentId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_QualityAccidentApprove GetApproveByApproveMan(string QualityAccidentId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_QualityAccidentApprove.FirstOrDefault(x => x.QualityAccidentId == QualityAccidentId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="QualityAccidentId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_QualityAccidentApprove> GetApproveByApproveManList(string QualityAccidentId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_QualityAccidentApprove.Where(x => x.QualityAccidentId == QualityAccidentId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="QualityAccidentId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string QualityAccidentId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_QualityAccidentApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(QualityAccidentId))
+            {
+                strSql += "where i.QualityAccidentId= @QualityAccidentId ";
+                listStr.Add(new SqlParameter("@QualityAccidentId", QualityAccidentId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs

@@ -100,6 +100,7 @@ namespace BLL
             newQualityAccident.CompileMan = QualityAccident.CompileMan;
             newQualityAccident.CompileDate = QualityAccident.CompileDate;
             newQualityAccident.UnitWorkId = QualityAccident.UnitWorkId;
+            newQualityAccident.Status = QualityAccident.Status;
             db.Comprehensive_QualityAccident.InsertOnSubmit(newQualityAccident);
             db.SubmitChanges();
         }
@@ -124,6 +125,7 @@ namespace BLL
                 newQualityAccident.CorrectiveActions = QualityAccident.CorrectiveActions;
                 newQualityAccident.AttachUrl = QualityAccident.AttachUrl;
                 newQualityAccident.UnitWorkId = QualityAccident.UnitWorkId;
+                newQualityAccident.Status = QualityAccident.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class SiteVisaManagementApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_SiteVisaManagementApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_SiteVisaManagementApprove newApprove = new Model.Comprehensive_SiteVisaManagementApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.SiteVisaManagementApproveId))
+            {  //新增
+                newApprove.SiteVisaManagementApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagementApprove));
+                newApprove.VisaId = approve.VisaId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_SiteVisaManagementApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_SiteVisaManagementApprove editApprove = db.Comprehensive_SiteVisaManagementApprove.FirstOrDefault(e => e.SiteVisaManagementApproveId == approve.SiteVisaManagementApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.VisaId = approve.VisaId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_SiteVisaManagementApprove GetCurrentApprove(string SiteVisaManagementId)
+        {
+            var q = from x in Funs.DB.Comprehensive_SiteVisaManagementApprove
+                    where x.VisaId == SiteVisaManagementId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_SiteVisaManagementApprove GetState(string SiteVisaManagementId)
+        {
+            var q = from x in Funs.DB.Comprehensive_SiteVisaManagementApprove
+                    where x.VisaId == SiteVisaManagementId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="SiteVisaManagementId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_SiteVisaManagementApprove GetApproveByApproveMan(string SiteVisaManagementId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_SiteVisaManagementApprove.FirstOrDefault(x => x.VisaId == SiteVisaManagementId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="SiteVisaManagementId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_SiteVisaManagementApprove> GetApproveByApproveManList(string SiteVisaManagementId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_SiteVisaManagementApprove.Where(x => x.VisaId == SiteVisaManagementId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="SiteVisaManagementId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string SiteVisaManagementId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_SiteVisaManagementApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(SiteVisaManagementId))
+            {
+                strSql += "where i.VisaId= @VisaId ";
+                listStr.Add(new SqlParameter("@VisaId", SiteVisaManagementId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs

@@ -134,7 +134,7 @@ namespace BLL
             newSiteVisaManagement.SignMan = siteVisaMangement.SignMan;
             newSiteVisaManagement.AuditMan = siteVisaMangement.AuditMan;
             newSiteVisaManagement.Remark = siteVisaMangement.Remark;
-
+            newSiteVisaManagement.Status = siteVisaMangement.Status;
             db.Comprehensive_SiteVisaManagement.InsertOnSubmit(newSiteVisaManagement);
             db.SubmitChanges();
         }
@@ -167,7 +167,7 @@ namespace BLL
                 newSiteVisaManagement.SignMan = siteVisaMangement.SignMan;
                 newSiteVisaManagement.AuditMan = siteVisaMangement.AuditMan;
                 newSiteVisaManagement.Remark = siteVisaMangement.Remark;
-
+                newSiteVisaManagement.Status = siteVisaMangement.Status;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentApproveService.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.Comprehensive
+{
+    public class SpecialEquipmentApproveService
+    {
+
+        /// <summary>
+        /// 增加施工方案审批信息
+        /// </summary>
+        /// <param name="managerRuleApprove">施工方案审批实体</param>
+        public static void EditApprove(Model.Comprehensive_SpecialEquipmentApprove approve)
+        {
+            var db = Funs.DB;
+            Model.Comprehensive_SpecialEquipmentApprove newApprove = new Model.Comprehensive_SpecialEquipmentApprove();
+
+            if (string.IsNullOrWhiteSpace(approve.SpecialEquipmentApproveId))
+            {  //新增
+                newApprove.SpecialEquipmentApproveId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipmentApprove));
+                newApprove.SpecialEquipmentId = approve.SpecialEquipmentId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                db.Comprehensive_SpecialEquipmentApprove.InsertOnSubmit(newApprove);
+                db.SubmitChanges();
+            }
+            else
+            {   //修改
+                Model.Comprehensive_SpecialEquipmentApprove editApprove = db.Comprehensive_SpecialEquipmentApprove.FirstOrDefault(e => e.SpecialEquipmentApproveId == approve.SpecialEquipmentApproveId);
+                if (editApprove != null)
+                {
+                    editApprove.SpecialEquipmentId = approve.SpecialEquipmentId;
+                    editApprove.ApproveMan = approve.ApproveMan;
+                    editApprove.ApproveDate = approve.ApproveDate;
+                    editApprove.ApproveIdea = approve.ApproveIdea;
+                    editApprove.IsAgree = approve.IsAgree;
+                    editApprove.ApproveType = approve.ApproveType;
+                    editApprove.Edition = approve.Edition;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+
+        public static Model.Comprehensive_SpecialEquipmentApprove GetCurrentApprove(string SpecialEquipmentId)
+        {
+            var q = from x in Funs.DB.Comprehensive_SpecialEquipmentApprove
+                    where x.SpecialEquipmentId == SpecialEquipmentId && x.ApproveType != "S" && x.ApproveDate == null 
+                    select x;
+            return q.FirstOrDefault();
+
+        }
+
+        public static Model.Comprehensive_SpecialEquipmentApprove GetState(string SpecialEquipmentId)
+        {
+            var q = from x in Funs.DB.Comprehensive_SpecialEquipmentApprove
+                    where x.SpecialEquipmentId == SpecialEquipmentId && x.ApproveType != "S"
+                    orderby x.ApproveDate descending
+                    select x;
+            var res = q.ToList();
+            if (res != null && res.Count > 0)
+            {
+                var q1 = res.Where(x => x.ApproveDate == null);
+                var res1 = q1.FirstOrDefault();
+                if (res1 != null)
+                {
+                    return res1;
+                }
+                else
+                {
+                    var q2 = res.Where(x => x.ApproveDate != null);
+                    var res2 = q2.FirstOrDefault();
+                    if (res2 != null)
+                    {
+                        return res2;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的审核信息
+        /// </summary>
+        /// <param name="SpecialEquipmentId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_SpecialEquipmentApprove GetApproveByApproveMan(string SpecialEquipmentId, string approveMan)
+        { 
+            return Funs.DB.Comprehensive_SpecialEquipmentApprove.FirstOrDefault(x => x.SpecialEquipmentId == SpecialEquipmentId && x.ApproveMan == approveMan &&  x.ApproveDate==null );
+        }
+
+        /// <summary>
+        /// 根据id 和当前用户获取审核列表
+        /// </summary>
+        /// <param name="SpecialEquipmentId"></param>
+        /// <param name="approveMan"></param>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_SpecialEquipmentApprove> GetApproveByApproveManList(string SpecialEquipmentId, string approveMan)
+        {
+            return Funs.DB.Comprehensive_SpecialEquipmentApprove.Where(x => x.SpecialEquipmentId == SpecialEquipmentId && x.ApproveMan == approveMan).ToList();
+        }
+
+
+        /// <summary>
+        /// 根据设备材料ID查询 审核记录
+        /// </summary>
+        /// <param name="SpecialEquipmentId"></param>
+        /// <returns></returns>
+        public static DataTable GetProjectQualityList(string SpecialEquipmentId)
+        {
+            string strSql = @"select i.* ,Sys_User.UserName  from Comprehensive_SpecialEquipmentApprove as i  left join  Sys_User  on( i.ApproveMan = Sys_User.UserId)";
+            List<System.Data.SqlClient.SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(SpecialEquipmentId))
+            {
+                strSql += "where i.SpecialEquipmentId= @SpecialEquipmentId ";
+                listStr.Add(new SqlParameter("@SpecialEquipmentId", SpecialEquipmentId));
+            }
+
+            strSql += " order by i.ApproveDate ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+    }
+
+}

SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs

@@ -104,7 +104,7 @@ namespace BLL
             newEquipment.SubmitDataNumber = SpecialEquipment.SubmitDataNumber;
             newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber;
             newEquipment.CompileMan = SpecialEquipment.CompileMan;
-
+            newEquipment.Status = SpecialEquipment.Status;
             db.Comprehensive_SpecialEquipment.InsertOnSubmit(newEquipment);
             db.SubmitChanges();
         }
@@ -126,7 +126,7 @@ namespace BLL
                 newEquipment.InformNumber = SpecialEquipment.InformNumber;
                 newEquipment.SubmitDataNumber = SpecialEquipment.SubmitDataNumber;
                 newEquipment.MonitoringReportNumber = SpecialEquipment.MonitoringReportNumber;
-
+                newEquipment.Status = SpecialEquipment.Status;
                 db.SubmitChanges();
             }
         }