1、用户导入；

2、用户角色支持多个；
3、单位资质；

SGGL/BLL/BLL.csproj

@@ -268,6 +268,7 @@
     <Compile Include="BaseInfo\InspectionAreaService.cs" />
     <Compile Include="BaseInfo\LawsRegulationsTypeService.cs" />
     <Compile Include="BaseInfo\EmployeeCategoryService.cs" />
+    <Compile Include="BaseInfo\QualificationService.cs" />
     <Compile Include="BaseInfo\RiskLevelService.cs" />
     <Compile Include="BaseInfo\LicenseTypeService.cs" />
     <Compile Include="BaseInfo\ManageRuleTypeService.cs" />

SGGL/BLL/BaseInfo/QualificationService.cs

@@ -0,0 +1,139 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.UI.WebControls;
+
+namespace BLL
+{
+    public static class QualificationService
+    {
+        /// <summary>
+        /// 根据主键获取信息
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public static Model.Base_Qualification GetQualificationById(string QualificationId)
+        {
+            return Funs.DB.Base_Qualification.FirstOrDefault(e => e.QualificationId == QualificationId);
+        }
+
+        /// <summary>
+        /// 根据主键获取信息
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public static Model.Base_Qualification GetQualificationByName(string QualificationName)
+        {
+            return Funs.DB.Base_Qualification.FirstOrDefault(e => e.QualificationName == QualificationName);
+        }
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="?"></param>
+        public static void AddQualification(Model.Base_Qualification model)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Base_Qualification newModel = new Model.Base_Qualification
+            {
+                QualificationId = model.QualificationId,
+                QualificationCode = model.QualificationCode,
+                QualificationName = model.QualificationName,
+                QualificationType = model.QualificationType,
+                Remark = model.Remark
+            };
+
+            db.Base_Qualification.InsertOnSubmit(newModel);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="teamGroup"></param>
+        public static void UpdateQualification(Model.Base_Qualification model)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Base_Qualification newModel = db.Base_Qualification.FirstOrDefault(e => e.QualificationId == model.QualificationId);
+            if (newModel != null)
+            {
+                newModel.QualificationCode = model.QualificationCode;
+                newModel.QualificationName = model.QualificationName;
+                newModel.QualificationType = model.QualificationType;
+                newModel.Remark = model.Remark;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除信息
+        /// </summary>
+        /// <param name="QualificationId"></param>
+        public static void DeleteQualificationById(string QualificationId)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Base_Qualification model = db.Base_Qualification.FirstOrDefault(e => e.QualificationId == QualificationId);
+            {
+                db.Base_Qualification.DeleteOnSubmit(model);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 获取类别下拉项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_Qualification> GetQualificationList()
+        {
+            var list = (from x in Funs.DB.Base_Qualification orderby x.QualificationCode select x).ToList();
+            return list;
+        }
+        /// <summary>
+        /// 获取建筑业企业资质下拉选项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_Qualification> GetQualificationDropDownList()
+        {
+            var list = (from x in Funs.DB.Base_Qualification orderby x.QualificationCode select x).ToList();
+            return list;
+        }
+
+        #region 建筑业企业资质表下拉框
+        /// <summary>
+        ///  建筑业企业资质表下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitQualificationDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "QualificationId";
+            dropName.DataTextField = "QualificationName";
+            dropName.DataSource = BLL.QualificationService.GetQualificationDropDownList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 根据主键获取信息
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public static string GetQualificationNameById(string QualificationId)
+        {
+            string name = string.Empty;
+            var getType= Funs.DB.Base_Qualification.FirstOrDefault(e => e.QualificationId == QualificationId);
+            if (getType != null)
+            {
+                name = getType.QualificationName;
+            }
+            return name;
+        }
+    }
+}

SGGL/BLL/Common/Const.cs

@@ -1681,6 +1681,10 @@ namespace BLL
         /// </summary>
         public const string ProjectTypeMenuId = "AEB427BD-AE1A-47CC-9337-368BB06B37F7";
         /// <summary>
+        /// 建筑业企业资质
+        /// </summary>
+        public const string QualificationMenuId = "CEB340BE-640E-4C95-ACB1-5E6207D4EDDA";
+        /// <summary>
         /// 执业资格证书证书
         /// </summary>
         public const string PracticeCertificateMenuId = "1390195D8-874B-4E7B-8DBF-D81A5984E973";

SGGL/BLL/Common/Funs.cs

@@ -221,10 +221,10 @@ namespace BLL
         /// <param name="DLL">目标下拉框</param>
         public static void DropDownPageSize(FineUIPro.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new FineUIPro.ListItem("10", "10"));
-            DDL.Items.Insert(1, new FineUIPro.ListItem("20", "20", true));
-            DDL.Items.Insert(2, new FineUIPro.ListItem("30", "30"));
-            DDL.Items.Insert(3, new FineUIPro.ListItem("50", "50"));
+            DDL.Items.Insert(0, new FineUIPro.ListItem("15", "15", true));
+            DDL.Items.Insert(1, new FineUIPro.ListItem("50", "50"));
+            DDL.Items.Insert(2, new FineUIPro.ListItem("100", "100"));
+            DDL.Items.Insert(3, new FineUIPro.ListItem("200", "200"));
             DDL.Items.Insert(4, new FineUIPro.ListItem("所有行", "1000000"));
             return;
         }

SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs

@@ -43,6 +43,7 @@ namespace BLL
             {
                 SubUnitQualityId = subUnitQuality.SubUnitQualityId,
                 UnitId = subUnitQuality.UnitId,
+                QualityId = subUnitQuality.QualityId,
                 SubUnitQualityCode = subUnitQuality.SubUnitQualityCode,
                 SubUnitQualityName = subUnitQuality.SubUnitQualityName,
                 BusinessLicense = subUnitQuality.BusinessLicense,
@@ -84,6 +85,7 @@ namespace BLL
             if (newSubUnitQuality != null)
             {                
                 newSubUnitQuality.UnitId = subUnitQuality.UnitId;
+                newSubUnitQuality.QualityId = subUnitQuality.QualityId;
                 newSubUnitQuality.SubUnitQualityCode = subUnitQuality.SubUnitQualityCode;
                 newSubUnitQuality.SubUnitQualityName = subUnitQuality.SubUnitQualityName;
                 newSubUnitQuality.BusinessLicense = subUnitQuality.BusinessLicense;