组织架构去掉分页 班组管理，角色管理，岗位管理导入功能开发

yl

2023-09-12 50aeb4c0145561bc137732bc4d383a890bd401dd

组织架构去掉分页
班组管理，角色管理，岗位管理导入功能开发

 VueWebCoreApi/Controllers/BasicSettingController.cs

@@ -31,20 +31,14 @@
        /// </summary>
        /// <param name="storg_code">组织编码</param>
        /// <param name="storg_name">组织名称</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "STorgData")]
        [HttpGet]
        public JsonResult STorgData(string storg_code,string storg_name, int page = 0, int rows = 0, string prop = null, string order = null)
        public JsonResult STorgData(string storg_code,string storg_name)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = BasicSettingBLL.STorgData(storg_code,storg_name,startNum,endNum,prop,order);
            mes = BasicSettingBLL.STorgData(storg_code,storg_name);
            return Json(mes);
        }
        #endregion

 VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs

@@ -116,9 +116,9 @@


        #region[组织架构,查询组织信息]
        public static ToMessage STorgData(string storg_code, string storg_name, int startNum, int endNum, string prop, string order)
        public static ToMessage STorgData(string storg_code, string storg_name)
        {
            return BasicSettingDAL.STorgData(storg_code, storg_name, startNum, endNum, prop, order);
            return BasicSettingDAL.STorgData(storg_code, storg_name);
        }
        #endregion


 VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs

@@ -680,7 +680,7 @@


        #region[组织架构,查询组织信息]
        public static ToMessage STorgData(string storg_code, string storg_name, int startNum, int endNum, string prop, string order)
        public static ToMessage STorgData(string storg_code, string storg_name)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -696,18 +696,16 @@
                    search += "and T.torg_name like '%'+@storg_name+'%' ";
                    dynamicParams.Add("@storg_name", storg_name);
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select T.id,T.parent_id,T.torg_code,T.torg_name,T.status,T.leve,T.torg_seq,
                            T.lm_user  as usercode,U.username,T.lm_date  
                            from TOrganization T
                            left join  TUser U on T.lm_user=U.usercode
                            where 1=1" + search + "";
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                            where 1=1" + search + " order by T.lm_date desc";
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
                mes.count = data.Rows.Count;
                mes.data = data;
            }
            catch (Exception e)
            {

 VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs

@@ -24,16 +24,16 @@
                    Message = ImportExcelData.Zerro(savePath, out StuCode);
                    break;
                case "1"://岗位管理
                    Message = ImportExcelData.One(savePath, out StuCode);
                    Message = ImportExcelData.One(dataTable, out StuCode);
                    break;
                case "2"://班组管理
                    Message = ImportExcelData.Two(savePath, out StuCode);
                    Message = ImportExcelData.Two(dataTable, out StuCode);
                    break;
                case "3"://人员管理
                    Message = ImportExcelData.Three(dataTable, out StuCode);
                    break;
                case "4"://角色管理
                    Message = ImportExcelData.Four(savePath, out StuCode);
                    Message = ImportExcelData.Four(dataTable, out StuCode);
                    break;
                case "5"://往来单位
                    Message = ImportExcelData.Five(savePath, out StuCode);
@@ -122,16 +122,16 @@
                    list = ImportExcelData.ZerroData(savePath, out stuCode, out message, out count);
                    break;
                case "1": //岗位管理
                    list = ImportExcelData.OneData(savePath, out stuCode, out message, out count);
                    list = ImportExcelData.OneData(dataTable, out stuCode, out message, out count);
                    break;
                case "2"://班组管理
                    list = ImportExcelData.TwoData(savePath, out stuCode, out message, out count);
                    list = ImportExcelData.TwoData(dataTable, out stuCode, out message, out count);
                    break;
                case "3"://人员管理
                    list = ImportExcelData.ThreeData(dataTable, out stuCode, out message, out count);
                    break;
                case "4"://角色管理
                    list = ImportExcelData.FourData(savePath, out stuCode, out message, out count);
                    list = ImportExcelData.FourData(dataTable, out stuCode, out message, out count);
                    break;
                case "5"://往来单位
                    list = ImportExcelData.FiveData(savePath, out stuCode, out message, out count);
@@ -212,16 +212,16 @@
                    Message = ImportExcelData.ZerroSubmit(savePath, User, out StuCode);
                    break;
                case "1": //岗位管理
                    Message = ImportExcelData.OneSubmit(savePath, User, out StuCode);
                    Message = ImportExcelData.OneSubmit(dataTable, us, out StuCode);
                    break;
                case "2"://班组管理
                    Message = ImportExcelData.TwoSubmit(savePath, User, out StuCode);
                    Message = ImportExcelData.TwoSubmit(dataTable, us, out StuCode);
                    break;
                case "3"://人员管理
                    Message = ImportExcelData.ThreeSubmit(dataTable, us, out StuCode);
                    break;
                case "4"://角色管理
                    Message = ImportExcelData.FourSubmit(savePath, User, out StuCode);
                    Message = ImportExcelData.FourSubmit(dataTable, us, out StuCode);
                    break;
                case "5"://往来单位
                    Message = ImportExcelData.FiveSubmit(savePath, User, out StuCode);

 VueWebCoreApi/Tools/ImportExcelData.cs

@@ -27,89 +27,45 @@
        #endregion

        #region【Excel模板上传验证,岗位管理模板】
        public static string One(string FileCode, out string code)
        public static string One(List<DataTable> excelTable, out string code)
        {
            string Message = "";
            code = "";
            List<DataTable> excelTable = new List<DataTable>();
            excelTable = ImportExcel.ExcelToTableList(FileCode);
            if (excelTable.Count != 4)
            if (excelTable.Count != 1)
            {
                code = "300";
                code = "301";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;

            }
            else if (excelTable[0].Columns.Count != 4)
            {
                code = "300";
                Message = "角色类型模板不符合规范,请检查列名字段数";
                code = "301";
                Message = "岗位清单模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[1].Columns.Count != 6)
            else if (excelTable[0].Columns[0].ColumnName != "*岗位编号(唯一)")
            {
                code = "300";
                Message = "模板角色清单不符合规范,请检查列名字段数";
                code = "301";
                Message = "岗位清单模板：表头信息不符合规范,第1列应为{*岗位编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[0].ColumnName != "序号")
            else if (excelTable[0].Columns[1].ColumnName != "*岗位名称")
            {
                code = "300";
                Message = "角色类型模板：表头信息不符合规范,第1列应为{序号}";
                code = "301";
                Message = "岗位清单模板：表头信息不符合规范,第2列应为{*岗位名称}";
                return Message;
            }
            else if (excelTable[0].Columns[1].ColumnName != "组织编码")
            else if (excelTable[0].Columns[2].ColumnName != "*状态")
            {
                code = "300";
                Message = "角色类型模板：表头信息不符合规范,第1列应为{组织编码}";
                code = "301";
                Message = "岗位清单模板：表头信息不符合规范,第3列应为{*状态}";
                return Message;
            }
            else if (excelTable[0].Columns[2].ColumnName != "角色类型编号(唯一)")
            else if (excelTable[0].Columns[3].ColumnName != "描述")
            {
                code = "300";
                Message = "角色类型模板：表头信息不符合规范,第2列应为{角色类型编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[3].ColumnName != "角色类型名称")
            {
                code = "300";
                Message = "角色类型模板：表头信息不符合规范,第3列应为{角色类型名称}";
                return Message;
            }
            else if (excelTable[1].Columns[0].ColumnName != "序号")
            {
                code = "300";
                Message = "角色清单模板：表头信息不符合规范,第1列应为{序号}";
                return Message;
            }
            else if (excelTable[1].Columns[1].ColumnName != "组织编码")
            {
                code = "300";
                Message = "角色清单模板：表头信息不符合规范,第1列应为{组织编码}";
                return Message;
            }
            else if (excelTable[1].Columns[2].ColumnName != "角色编号(唯一)")
            {
                code = "300";
                Message = "角色清单模板：表头信息不符合规范,第2列应为{角色编号(唯一)}";
                return Message;
            }
            else if (excelTable[1].Columns[3].ColumnName != "角色姓名")
            {
                code = "300";
                Message = "角色清单模板：表头信息不符合规范,第3列应为{角色姓名}";
                return Message;
            }
            else if (excelTable[1].Columns[4].ColumnName != "角色类型编码")
            {
                code = "300";
                Message = "角色清单模板：表头信息不符合规范,第4列应为{角色类型编码}";
                return Message;
            }
            else if (excelTable[1].Columns[5].ColumnName != "角色描述")
            {
                code = "300";
                Message = "角色清单模板：表头信息不符合规范,第5列应为{角色描述}";
                code = "301";
                Message = "岗位清单模板：表头信息不符合规范,第4列应为{描述}";
                return Message;
            }
            else
@@ -122,11 +78,52 @@
        #endregion

        #region【Excel模板上传验证,班组管理模板】
        public static string Two(string FileCode, out string code)
        public static string Two(List<DataTable> excelTable, out string code)
        {
            string Message = "";
            code = "";
           
            if (excelTable.Count != 1)
            {
                code = "301";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;

            }
            else if (excelTable[0].Columns.Count != 4)
            {
                code = "301";
                Message = "班组清单模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[0].Columns[0].ColumnName != "*班组编号(唯一)")
            {
                code = "301";
                Message = "班组清单模板：表头信息不符合规范,第1列应为{*班组编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[1].ColumnName != "*班组名称")
            {
                code = "301";
                Message = "班组清单模板：表头信息不符合规范,第2列应为{*班组名称}";
                return Message;
            }
            else if (excelTable[0].Columns[2].ColumnName != "*状态")
            {
                code = "301";
                Message = "班组清单模板：表头信息不符合规范,第3列应为{*状态}";
                return Message;
            }
            else if (excelTable[0].Columns[3].ColumnName != "描述")
            {
                code = "301";
                Message = "班组清单模板：表头信息不符合规范,第4列应为{描述}";
                return Message;
            }
            else
            {
                code = "200";
                Message = "模板检验通过";
            }
            return Message;
        }
        #endregion
@@ -219,65 +216,57 @@
        #endregion

        #region【Excel模板上传验证,角色管单模板】
        public static string Four(string FileCode, out string code)
        public static string Four(List<DataTable> excelTable, out string code)
        {
            string Message = "";
            code = "";
            List<DataTable> excelTable = new List<DataTable>();
            excelTable = ImportExcel.ExcelToTableList(FileCode);
            if (excelTable.Count != 2)
            if (excelTable.Count != 1)
            {
                code = "300";
                code = "301";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;

            }
            else if (excelTable[0].Columns.Count != 7)
            else if (excelTable[0].Columns.Count != 6)
            {
                code = "300";
                Message = "往来单位模板不符合规范,请检查列名字段数";
                code = "301";
                Message = "角色清单模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[0].Columns[0].ColumnName != "序号")
            else if (excelTable[0].Columns[0].ColumnName != "*角色编号(唯一)")
            {
                code = "300";
                Message = "往来单位模板不符合规范：表头信息不符合规范,第1列应为{序号}";
                code = "301";
                Message = "角色清单模板：表头信息不符合规范,第1列应为{*角色编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[1].ColumnName != "往来单位编号(唯一)")
            else if (excelTable[0].Columns[1].ColumnName != "*角色名称")
            {
                code = "300";
                Message = "往来单位模板不符合规范：表头信息不符合规范,第2列应为{往来单位编号(唯一)}";
                code = "301";
                Message = "角色清单模板：表头信息不符合规范,第2列应为{*角色名称}";
                return Message;
            }
            else if (excelTable[0].Columns[2].ColumnName != "往来单位名称")
            else if (excelTable[0].Columns[2].ColumnName != "*状态")
            {
                code = "300";
                Message = "往来单位模板不符合规范：表头信息不符合规范,第3列应为{往来单位名称}";
                code = "301";
                Message = "角色清单模板：表头信息不符合规范,第3列应为{*状态}";
                return Message;
            }
            else if (excelTable[0].Columns[3].ColumnName != "往来单位属性")
            else if (excelTable[0].Columns[3].ColumnName != "数据范围")
            {
                code = "300";
                Message = "往来单位模板不符合规范：表头信息不符合规范,第4列应为{往来单位属性}";
                code = "301";
                Message = "角色清单模板：表头信息不符合规范,第4列应为{数据范围}";
                return Message;
            }
            else if (excelTable[0].Columns[4].ColumnName != "联系人")
            else if (excelTable[0].Columns[4].ColumnName != "数据权限")
            {
                code = "300";
                Message = "往来单位模板不符合规范：表头信息不符合规范,第5列应为{联系人}";
                code = "301";
                Message = "角色清单模板：表头信息不符合规范,第5列应为{数据权限}";
                return Message;
            }
            else if (excelTable[0].Columns[5].ColumnName != "联系方式")
            else if (excelTable[0].Columns[5].ColumnName != "描述")
            {
                code = "300";
                Message = "往来单位模板不符合规范：表头信息不符合规范,第6列应为{联系方式}";
                return Message;
            }
            else if (excelTable[0].Columns[6].ColumnName != "地址")
            {
                code = "300";
                Message = "往来单位模板不符合规范：表头信息不符合规范,第7列应为{地址}";
                code = "301";
                Message = "角色清单模板：表头信息不符合规范,第6列应为{描述}";
                return Message;
            }
            else
@@ -1815,7 +1804,7 @@
        #endregion

        #region【Excel上传数据验证,岗位管理】
        public static List<ExcelErro> OneData(string FileCode, out string StuCode, out string message, out int count)
        public static List<ExcelErro> OneData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
        {
            message = "";
            StuCode = "";
@@ -1824,121 +1813,38 @@
            var dynamicParams = new DynamicParameters();
            DataTable dt;
            List<ExcelErro> list = new List<ExcelErro>();
            List<DataTable> excelTable = new List<DataTable>();
            list = ImportExcel.ExcelToTableListErro(FileCode);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            excelTable = ImportExcel.ExcelToTableList(FileCode);  //获取Excel数据
            //主表
            for (int j = 0; j < excelTable[0].Rows.Count; j++)
            list = ImportExcel.InportExcelToTableListErro(excelTable);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            //岗位表
            for (int k = 0; k < excelTable[0].Rows.Count; k++)
            {
                if (excelTable[1].Rows[j][1].ToString().Trim() != null && excelTable[1].Rows[j][1].ToString().Trim() != "")
                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
                {
                    sql = @"select *  from TOrganization where org_code=@org_code";
                    dynamicParams.Add("@org_code", excelTable[1].Rows[j][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt == null || dt.Rows.Count <= 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{组织编码}";
                        erro.ErrorCont = "角色类型表:{组织编码}字段" + excelTable[1].Rows[j][1].ToString().Trim() + "不存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[0].Rows[j][2].ToString().Trim() != null && excelTable[0].Rows[j][2].ToString().Trim() != "")
                {
                    sql = @"select *  from TRoleType where roletype_code=@roletype_code";
                    dynamicParams.Add("@roletype_code", excelTable[0].Rows[j][2].ToString().Trim());
                    sql = @"select *  from TPost where postcode=@postcode";
                    dynamicParams.Add("@postcode", excelTable[0].Rows[k][0].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{角色类型编码(唯一)}";
                        erro.ErrorCont = "班组表:{角色类型编码(唯一)}字段" + excelTable[0].Rows[j][2].ToString().Trim() + "已存在";
                        erro.ErrorField = "{*岗位编号(唯一)}";
                        erro.ErrorCont = "岗位表:{*岗位编号(唯一)}字段" + excelTable[0].Rows[k][0].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
            }
            //子表
            for (int k = 0; k < excelTable[1].Rows.Count; k++)
            {
                if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
                {
                    sql = @"select *  from TRole where role_code=@role_code";
                    dynamicParams.Add("@role_code", excelTable[1].Rows[k][2].ToString().Trim());
                    sql = @"select *  from TPost where postname=@postname";
                    dynamicParams.Add("@postname", excelTable[0].Rows[k][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{角色编号(唯一)}";
                        erro.ErrorCont = "角色表:{角色编号(唯一)}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "已存在";
                        erro.ErrorField = "{*岗位名称}";
                        erro.ErrorCont = "岗位表:{*岗位名称}字段" + excelTable[1].Rows[k][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
                {
                    sql = @"select *  from TOrganization where org_code=@org_code";
                    dynamicParams.Add("@org_code", excelTable[1].Rows[k][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt == null || dt.Rows.Count <= 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{组织编码}";
                        erro.ErrorCont = "角色表:{组织编码}字段" + excelTable[1].Rows[k][1].ToString().Trim() + "不存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[1].Rows[k][4].ToString().Trim() != null && excelTable[1].Rows[k][4].ToString().Trim() != "")
                {
                    sql = @"select torg_code  from TRoleType where roletype_code=@roletype_code";
                    dynamicParams.Add("@roletype_code", excelTable[1].Rows[k][4].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt != null && dt.Rows.Count > 0)
                    {
                        if (dt.Rows[0]["torg_code"].ToString() != excelTable[1].Rows[k][1].ToString().Trim())
                        {
                            ExcelErro erro = new ExcelErro();
                            erro.RoeNumber = "/";
                            erro.ErrorField = "{角色类型编码}";
                            erro.ErrorCont = "角色表:{角色类型编码}字段" + excelTable[1].Rows[k][4].ToString().Trim() + " ä¸æ˜¯ç»„织编码:" + excelTable[1].Rows[k][1].ToString().Trim() + "下的角色组";
                            list.Add(erro);
                        }
                    }
                }
            }
            //判断子表组织编码不存在于主表组织编码中的数据
            var dt2 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("组织编码")
                      ).Contains(r.Field<string>("组织编码"))
                      select r;
            List<DataRow> listRow2 = dt2.ToList();
            if (listRow2.Count > 0)
            {
                ExcelErro erro = new ExcelErro();
                erro.RoeNumber = "/";
                erro.ErrorField = "{组织编码}";
                erro.ErrorCont = "角色表:{组织编码}字段中有值在角色类型表:{组织编码}中不存在";
                list.Add(erro);
            }
            //判断子表外键不存在于主表主键中的数据
            var dt3 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("角色类型编号(唯一)")
                      ).Contains(r.Field<string>("角色类型编码"))
                      select r;
            List<DataRow> listRow = dt3.ToList();
            if (listRow.Count > 0)
            {
                ExcelErro erro = new ExcelErro();
                erro.RoeNumber = "/";
                erro.ErrorField = "{角色类型编码}";
                erro.ErrorCont = "角色表:{角色类型编码}字段中有值在角色类型表:{角色类型编号(唯一)}中不存在";
                list.Add(erro);
            }
            if (list.Count > 0)
            {
@@ -1962,15 +1868,65 @@
        #endregion

        #region【Excel上传数据验证,班组管理】
        public static List<ExcelErro> TwoData(string FileCode, out string StuCode, out string message, out int count)
        public static List<ExcelErro> TwoData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
        {
            message = "";
            StuCode = "";
            count = 0;
            string sql = "";
            var dynamicParams = new DynamicParameters();
            DataTable dt;
            List<ExcelErro> list = new List<ExcelErro>();

            list = ImportExcel.InportExcelToTableListErro(excelTable);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            //班组表
            for (int k = 0; k < excelTable[0].Rows.Count; k++)
            {
                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
                {
                    sql = @"select *  from TGroup where usergroupcode=@usergroupcode";
                    dynamicParams.Add("@usergroupcode", excelTable[0].Rows[k][0].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*班组编号(唯一)}";
                        erro.ErrorCont = "班组表:{*班组编号(唯一)}字段" + excelTable[0].Rows[k][0].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
                {
                    sql = @"select *  from TGroup where usergroupname=@usergroupname";
                    dynamicParams.Add("@usergroupname", excelTable[0].Rows[k][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*班组名称}";
                        erro.ErrorCont = "班组表:{*班组名称}字段" + excelTable[1].Rows[k][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
            }
            if (list.Count > 0)
            {
                int index = 0;
                foreach (ExcelErro item in list)
                {
                    index++;
                    item.Seq = index.ToString();
                }
                StuCode = "301";
                message = "数据验证失败";
            }
            else
            {
                StuCode = "200";
                message = "数据验证成功";
                count = excelTable[0].Rows.Count;
            }
            return list;
        }
        #endregion
@@ -2138,33 +2094,91 @@
        #endregion

        #region【Excel上传数据验证,角色管理】
        public static List<ExcelErro> FourData(string FileCode, out string StuCode, out string message, out int count)
        public static List<ExcelErro> FourData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
        {
            message = "";
            StuCode = "";
            count = 0;
            string sql = "";
            DataTable dt;
            var dynamicParams = new DynamicParameters();
            DataTable dt;
            List<ExcelErro> list = new List<ExcelErro>();
            DataTable excelTable = new DataTable();
            list = ImportExcel.ExcelToTableErro(FileCode);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            excelTable = ImportExcel.ExcelToTable(FileCode);  //获取Excel数据
            for (int i = 0; i < excelTable.Rows.Count; i++)
            list = ImportExcel.InportExcelToTableListErro(excelTable);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            //班组表
            for (int k = 0; k < excelTable[0].Rows.Count; k++)
            {
                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
                {
                    sql = @"select code  from TCustomer where code=@code";

                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
                    sql = @"select *  from TRole where rolecode=@rolecode";
                    dynamicParams.Add("@rolecode", excelTable[0].Rows[k][0].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{往来单位编码(唯一)}";
                        erro.ErrorCont = "往来单位表:{往来单位编码(唯一)}字段" + excelTable.Rows[i][1].ToString().Trim() + "已存在";
                        erro.ErrorField = "{*角色编号(唯一)}";
                        erro.ErrorCont = "角色表:{*角色编号(唯一)}字段" + excelTable[0].Rows[k][0].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
                {
                    sql = @"select *  from TRole where rolename=@rolename";
                    dynamicParams.Add("@rolename", excelTable[0].Rows[k][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*角色名称}";
                        erro.ErrorCont = "角色表:{*角色名称}字段" + excelTable[1].Rows[k][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[0].Rows[k][3].ToString().Trim() != null && excelTable[0].Rows[k][3].ToString().Trim() != "")
                {
                    if (excelTable[0].Rows[k][3].ToString().Trim() == "自定义") 
                    {
                        if (excelTable[0].Rows[k][4].ToString().Trim() == null && excelTable[0].Rows[k][4].ToString().Trim() == "")
                        {
                            ExcelErro erro = new ExcelErro();
                            erro.RoeNumber = "/";
                            erro.ErrorField = "{数据权限}";
                            erro.ErrorCont = "角色表:{数据范围}字段为：" + excelTable[1].Rows[k][3].ToString().Trim() + "时,{数据权限}字段不能为空";
                            list.Add(erro);
                        }
                        else 
                        {
                            //判断数据权限编码是否合理
                            if (excelTable[0].Rows[k][4].ToString().Trim() != null && excelTable[0].Rows[k][4].ToString().Trim() != "")
                            {
                                string[] torgcode = Array.ConvertAll<string, string>(excelTable[0].Rows[k][4].ToString().Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                                sql = @"select postcode  from TOrganization  where torg_code in @torgcode";
                                dynamicParams.Add("@torgcode", torgcode);
                                dt = DapperHelper.selectdata(sql, dynamicParams);
                                if (dt != null && dt.Rows.Count > 0)
                                {
                                    string[] values = excelTable[0].Rows[k][4].ToString().Trim().Split(',');
                                    var unmatchedValues = values.Except(dt.AsEnumerable().Select(row => row.Field<string>("torg_code")));
                                    foreach (var value in unmatchedValues)
                                    {
                                        ExcelErro erro = new ExcelErro();
                                        erro.RoeNumber = (k + 1).ToString();
                                        erro.ErrorField = "{数据权限}";
                                        erro.ErrorCont = "角色表:{数据权限}字段" + value + " ä¸æ˜¯æœ‰æ•ˆçš„组织编码";
                                        list.Add(erro);
                                    }
                                }
                                else
                                {
                                    ExcelErro erro = new ExcelErro();
                                    erro.RoeNumber = (k + 1).ToString();
                                    erro.ErrorField = "{数据权限}";
                                    erro.ErrorCont = "角色表:{数据权限}字段" + excelTable[0].Rows[k][4].ToString().Trim() + " ä¸æ˜¯æœ‰æ•ˆçš„组织编码";
                                    list.Add(erro);
                                }
                            }
                        }
                    }
                }
            }
@@ -2183,7 +2197,7 @@
            {
                StuCode = "200";
                message = "数据验证成功";
                count = excelTable.Rows.Count;
                count = excelTable[0].Rows.Count;
            }
            return list;
        }
@@ -3335,53 +3349,32 @@
        #endregion

        #region【Excel数据上传,岗位管理】
        public static string OneSubmit(string FileCode, string User, out string StuCode)
        public static string OneSubmit(List<DataTable> excelTable, User us, out string StuCode)
        {
            string message = "";
            StuCode = "";
            string sql = "";
            string ZZName = "", Enable = "", WageType = "";
            DataTable dt;
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                List<DataTable> excelTable = new List<DataTable>();
                excelTable = ImportExcel.ExcelToTableList(FileCode);
                //导入角色类型
                for (int k = 0; k < excelTable[0].Rows.Count; k++)
                //导入岗位
                for (int i = 0; i < excelTable[0].Rows.Count; i++)
                {
                    sql = @"insert into TRoleType(roletype_code,roletype_name,torg_code) 
                            values(@roletype_code,@roletype_name,@torg_code)";
                    sql = @"insert into TPost(postcode,postname,status,description,lm_user,lm_date) 
                            values(@postcode,@postname,@status,@description,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            roletype_code = excelTable[0].Rows[k][2].ToString().Trim(),
                            roletype_name = excelTable[0].Rows[k][3].ToString().Trim(),
                            torg_code = excelTable[0].Rows[k][1].ToString().Trim()
                        }
                    });
                }
                //导入角色
                for (int i = 0; i < excelTable[1].Rows.Count; i++)
                {
                    sql = @"insert into TRole(role_code,role_name,roletype_code,description,lm_user,lm_date,torg_code) 
                            values(@role_code,@role_name,@roletype_code,@description,@Operator,@CreateDate,@torg_code)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            role_code = excelTable[1].Rows[i][2].ToString().Trim(),
                            role_name = excelTable[1].Rows[i][3].ToString().Trim(),
                            roletype_code = excelTable[1].Rows[i][4].ToString().Trim(),
                            description = excelTable[1].Rows[i][5].ToString().Trim(),
                            Operator = User,
                            CreateDate = DateTime.Now.ToString(),
                            torg_code = excelTable[1].Rows[i][1].ToString().Trim()
                            usercode = excelTable[0].Rows[i][0].ToString().Trim(),
                            username = excelTable[0].Rows[i][1].ToString().Trim(),
                            status = excelTable[0].Rows[i][2].ToString().Trim(),
                            description = excelTable[0].Rows[i][3].ToString().Trim(),
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                        }
                    });
                }
@@ -3407,13 +3400,46 @@
        #endregion

        #region【Excel数据上传,分组管理】
        public static string  TwoSubmit(string FileCode, string User, out string StuCode)
        public static string  TwoSubmit(List<DataTable> excelTable, User us, out string StuCode)
        {
            string message = "";
            StuCode = "";
            string sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {

                list.Clear();
                //导入班组
                for (int i = 0; i < excelTable[0].Rows.Count; i++)
                {
                    sql = @"insert into TGroup(usergroupcode,usergroupname,status,description,lm_user,lm_date) 
                            values(@usergroupcode,@usergroupname,@status,@description,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            usergroupcode = excelTable[0].Rows[i][0].ToString().Trim(),
                            usergroupname = excelTable[0].Rows[i][1].ToString().Trim(),
                            status = excelTable[0].Rows[i][2].ToString().Trim(),
                            description = excelTable[0].Rows[i][3].ToString().Trim(),
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                        }
                    });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    StuCode = "200";
                    message = "导入成功！";
                }
                else
                {
                    StuCode = "300";
                    message = "导入失败！";
                }
            }
            catch (Exception e)
            {
@@ -3491,53 +3517,57 @@
        #endregion

        #region【Excel数据上传,角色管理】
        public static string FourSubmit(string FileCode, string User, out string StuCode)
        public static string FourSubmit(List<DataTable> excelTable, User us, out string StuCode)
        {
            string message = "";
            StuCode = "";
            string sql = "";
            DataTable dt;
            string sql = "", datarange = "", datapermissions = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                DataTable excelTable = new DataTable();
                excelTable = ImportExcel.ExcelToTable(FileCode);
                //导入往来单位表
                for (int i = 0; i < excelTable.Rows.Count; i++)
                //导入角色
                for (int i = 0; i < excelTable[0].Rows.Count; i++)
                {
                    string Type = "";
                    switch (excelTable.Rows[i][3].ToString().Trim())
                    if (excelTable[0].Rows[i][3].ToString().Trim() != null && excelTable[0].Rows[i][3].ToString().Trim() != "")
                    {
                        case "供应商":
                            Type = "226";
                            break;
                        case "客户":
                            Type = "211";
                            break;
                        case "客户/供应商":
                            Type = "228";
                            break;
                        default:
                            break;
                        //数据范围
                        switch (excelTable[0].Rows[i][3].ToString().Trim())
                        {
                            case "全部":
                                datarange = "ALL";
                                break;
                            case "本级":
                                datarange = "LEVEL";
                                break;
                            case "本人":
                                datarange = "PERSON";
                                break;
                            case "自定义":
                                datarange = "CUSTOM";
                                datapermissions = excelTable[0].Rows[i][4].ToString().Trim();
                                break;
                            default:
                                break;
                        }
                    }

                    sql = @"insert into TCustomer(code,name,type,conttacts,conttphone,addr,lm_user,lm_date) 
                            values(@code,@name,@type,@conttacts,@conttphone,@addr,@Operator,@CreateDate)";
                    sql = @"insert into TRole(rolecode,rolename,status,datarange,datapermissions,identifying,description,lm_user,lm_date) 
                            values(@rolecode,@rolename,@status,@datarange,@datapermissions,@identifying,@description,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            code = excelTable.Rows[i][1].ToString().Trim(),
                            name = excelTable.Rows[i][2].ToString().Trim(),
                            type = Type,
                            conttacts = excelTable.Rows[i][4].ToString().Trim(),
                            conttphone = excelTable.Rows[i][5].ToString().Trim(),
                            addr = excelTable.Rows[i][6].ToString().Trim(),
                            Operator = User,
                            CreateDate = DateTime.Now.ToString()
                            rolecode = excelTable[0].Rows[i][0].ToString().Trim(),
                            rolename = excelTable[0].Rows[i][1].ToString().Trim(),
                            status = excelTable[0].Rows[i][2].ToString().Trim(),
                            datarange = datarange,
                            datapermissions = datapermissions,
                            description = excelTable[0].Rows[i][5].ToString().Trim(),
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                        }
                    });
                }

 VueWebCoreApi/VueWebCoreApi.csproj

@@ -53,10 +53,8 @@
      <None Include="wwwroot\Excel\仓库库位清单.xls" />
      <None Include="wwwroot\Excel\往来单位.xls" />
      <None Include="wwwroot\Excel\物料清单.xls" />
      <None Include="wwwroot\Excel\用户清单.xls" />
      <None Include="wwwroot\Excel\缺陷定义.xls" />
      <None Include="wwwroot\Excel\节拍工价.xls" />
      <None Include="wwwroot\Excel\角色清单.xls" />
      <None Include="wwwroot\Excel\设备保养标准.xls" />
      <None Include="wwwroot\Excel\设备保养项目.xls" />
      <None Include="wwwroot\Excel\设备清单.xls" />

 VueWebCoreApi/wwwroot/Excel/ÈËÔ±¹ÜÀí.xls

Binary files differ

 VueWebCoreApi/wwwroot/Excel/¸Úλ¹ÜÀí.xls

copy from "VueWebCoreApi/wwwroot/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
copy to "VueWebCoreApi/wwwroot/Excel/\345\262\227\344\275\215\347\256\241\347\220\206.xls"
Binary files differ

 VueWebCoreApi/wwwroot/Excel/°à×é¹ÜÀí.xls

copy from "VueWebCoreApi/wwwroot/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
copy to "VueWebCoreApi/wwwroot/Excel/\347\217\255\347\273\204\347\256\241\347\220\206.xls"
Binary files differ

 VueWebCoreApi/wwwroot/Excel/½ÇÉ«Çåµ¥.xls

Binary files differ

 VueWebCoreApi/wwwroot/Excel/½ÇÉ«¹ÜÀí.xls

copy from "VueWebCoreApi/wwwroot/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
copy to "VueWebCoreApi/wwwroot/Excel/\350\247\222\350\211\262\347\256\241\347\220\206.xls"
Binary files differ