yl
2022-06-18 0ea0fc59c2dc8014fdd9d9f332d699b3be2308e6
往来单位查询接口、新增编辑、删除
已添加1个文件
已修改12个文件
232 ■■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/BasicSettingController.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/BasicSettingBLL.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/BasicSettingDAL.cs 162 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Logs/2022-06-18.TXT 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/VueWebApi.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Debug/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/Excel/用户清单.xls 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
.vs/VueWebApi/v16/.suo
Binary files differ
VueWebApi/Controllers/BasicSettingController.cs
@@ -215,6 +215,13 @@
        #endregion
        #region[用户清单导入]
        /// <summary>
        /// ç”¨æˆ·æ¸…单导入
        /// </summary>
        /// <param name="files">上传用户清单导入文件</param>
        /// <returns></returns>
        [Route(template: "ImportUserExcel")]
        [HttpPost]
        public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files)
        {
            string savePath;
@@ -417,14 +424,14 @@
        /// <param name="rolecode">角色编码</param>
        /// <param name="json">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "SaveUserAssoctRole")]
        [Route(template: "SaveRoleAssoctUser")]
        [HttpPost]
        public HttpResponseMessage SaveRoleAssociationUser(string rolecode, List<ObjectData> json)
        public HttpResponseMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
        {
            //JavaScriptSerializer Serializer = new JavaScriptSerializer();
            //List<RoleUserSubmit> objs = new List<RoleUserSubmit>(); 
            //objs = Serializer.Deserialize<List<RoleUserSubmit>>(json);
            mes = BasicSettingBLL.SaveRoleAssociationUser(rolecode, json);
            mes = BasicSettingBLL.SaveRoleAssoctUser(rolecode, json);
            return TJson.toJson(mes);
        }
        #endregion
@@ -511,5 +518,20 @@
            return TJson.toJson(mes);
        }
        #endregion
        #region[往来单位删除]
        /// <summary>
        /// å¾€æ¥å•位删除
        /// </summary>
        /// <param name="unitid">往来单位ID</param>
        /// <returns></returns>
        [Route(template: "DeleteCurrentUnit")]
        [HttpPost]
        public HttpResponseMessage DeleteCurrentUnit(string unitid)
        {
            mes = BasicSettingBLL.DeleteCurrentUnit(unitid);
            return TJson.toJson(mes);
        }
        #endregion
    }
}
VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -142,9 +142,9 @@
        #endregion
        #region[角色清单关联用户保存]
        public static ToMessage SaveRoleAssociationUser(string rolecode, List<ObjectData> json)
        public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
        {
            return BasicSettingDAL.SaveRoleAssociationUser(rolecode, json);
            return BasicSettingDAL.SaveRoleAssoctUser(rolecode, json);
        }
        #endregion
@@ -177,5 +177,12 @@
            return BasicSettingDAL.AddUpdateCurrentUnit(unitid, unitcode, unitname, unitattr, person, contact, description, usercode, OperType);
        }
        #endregion
        #region[往来单位删除]
        public static ToMessage DeleteCurrentUnit(string unitid)
        {
            return BasicSettingDAL.DeleteCurrentUnit(unitid);
        }
        #endregion
    }
}
VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -443,12 +443,10 @@
                var data = DapperHelper.selectdata(sql, dynamicParams);
                sql = @"update TUserRoleRelation set is_delete='1'  where user_code=@usercode";
                dynamicParams.Add("@usercode", data.Rows[0]["USERCODE"].ToString());
                list.Add(new { str = sql, parm = dynamicParams });
                list.Add(new { str = sql, parm = new { usercode = data.Rows[0]["USERCODE"].ToString() } });
                sql = @"update TUser set is_delete='1'  where id=@userid";
                dynamicParams.Add("@userid", userid);
                list.Add(new { str = sql, parm = dynamicParams });
                list.Add(new { str = sql, parm = new { userid = userid } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
@@ -518,7 +516,6 @@
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
@@ -526,35 +523,30 @@
                {
                    //清除用户关联角色表数据
                    sql = @"delete TUserRoleRelation where user_code=@usercode";
                    dynamicParams.Add("@usercode", usercode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm =new {usercode = usercode } });
                    //清除用户表关联角色标识
                    sql = @"update TUser set is_role='N' where user_code=@usercode";
                    dynamicParams.Add("@usercode", usercode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    sql = @"update TUser set is_role='N' where usercode=@usercode";
                    list.Add(new { str = sql, parm = new { usercode = usercode } });
                }
                else
                {
                    //清除用户关联角色表数据
                    sql = @"delete TUserRoleRelation where user_code=@usercode";
                    dynamicParams.Add("@usercode", usercode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { usercode = usercode } });
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        for (int j = 0; j < json[i].Data.Count; j++)
                        {
                            sql = @"insert into TUserRoleRelation(usercode,role_code) values(@usercode,@role_code)";
                            dynamicParams.Add("@usercode", usercode);
                            dynamicParams.Add("@role_code", json[i].Data[j]);
                            list.Add(new { str = sql, parm = dynamicParams });
                            sql = @"insert into TUserRoleRelation(user_code,role_code) values(@usercode,@role_code)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, role_code= json[i].Data[j] } });
                        }
                    }
                    //标记用户表关联角色标识
                    sql = @"update TUser set is_role='Y' where user_code=@usercode";
                    dynamicParams.Add("@usercode", usercode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    sql = @"update TUser set is_role='Y' where usercode=@usercode";
                    list.Add(new { str = sql, parm = new { usercode = usercode} });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -583,7 +575,6 @@
            var sql = "";
            List<object> list = new List<object>();
            DataTable ds = new DataTable();
            var dynamicParams = new DynamicParameters();
            try
            {
@@ -604,17 +595,19 @@
                        {
                            sql = @"insert into TUser(usercode,username,enable,password,mobile,email,lm_user,lm_date,wagetype,stu_torgcode)
                                    values(@usercode,@username,@enable,@password,@mobile,@email,@lm_user,@lm_date,@wagetype,@stu_torgcode)";
                            dynamicParams.Add("@usercode", ds.Rows[i][1].ToString());
                            dynamicParams.Add("@username", ds.Rows[i][2].ToString());
                            dynamicParams.Add("@enable", ds.Rows[i][3].ToString());
                            dynamicParams.Add("@password", ds.Rows[i][4].ToString());
                            dynamicParams.Add("@mobile", ds.Rows[i][5].ToString());
                            dynamicParams.Add("@email", ds.Rows[i][6].ToString());
                            dynamicParams.Add("@lm_user", username);
                            dynamicParams.Add("@lm_date", DateTime.Now.ToString());
                            dynamicParams.Add("@wagetype", ds.Rows[i][7].ToString());
                            dynamicParams.Add("@stu_torgcode", ds.Rows[i][8].ToString());
                            list.Add(new { str = sql, parm = dynamicParams });
                            list.Add(new { str = sql, parm = new {
                                usercode = ds.Rows[i][1].ToString(),
                                username = ds.Rows[i][2].ToString(),
                                enable = ds.Rows[i][3].ToString(),
                                password = ds.Rows[i][4].ToString(),
                                mobile = ds.Rows[i][5].ToString(),
                                email = ds.Rows[i][6].ToString(),
                                lm_user = username,
                                lm_date = DateTime.Now.ToString(),
                                wagetype = ds.Rows[i][7].ToString(),
                                stu_torgcode = ds.Rows[i][8].ToString()
                            }
                            });
                        }
                    }
                    bool aa = DapperHelper.DoTransaction(list);
@@ -680,9 +673,15 @@
                for (int i = 0; i < json.Count; i++)
                {
                    sql = @"insert into TRoleType(roletypecode,roletypename) values(@roletypecode,@roletypename)";
                    dynamicParams.Add("@roletypecode", json[i].code);
                    dynamicParams.Add("@roletypename", json[i].name);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            roletypecode = json[i].code,
                            roletypename = json[i].name
                        }
                    });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -710,17 +709,13 @@
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                sql = @"delete TRoleType where roletype_code=@roletypecode";
                dynamicParams.Add("@roletypecode", roleTypeCode);
                list.Add(new { str = sql, parm = dynamicParams });
                list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode}});
                sql = @"delete TRole where roletype_code=@roletypecode";
                dynamicParams.Add("@roletypecode", roleTypeCode);
                list.Add(new { str = sql, parm = dynamicParams });
                list.Add(new { str = sql, parm = new { roletypecode = roleTypeCode }});
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
@@ -859,24 +854,17 @@
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                //更新角色表、角色关联用户标识及删除状态
                sql = @"update TRole set is_user='N',is_right='N',is_delete='1'  where role_code=@RoleCode";
                dynamicParams.Add("@RoleCode", RoleCode);
                list.Add(new { str = sql, parm = dynamicParams });
                list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
                //更新角色关联用户表、角色关联用户标识及删除状态
                sql = @"update TUserRoleRelation set is_delete='1'  where role_code=@RoleCode";
                dynamicParams.Add("@RoleCode", RoleCode);
                list.Add(new { str = sql, parm = dynamicParams });
                list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
                //删除(更新状态)角色功能表
                sql = @"update TRoleRightRelation set is_delete='1'  where user_code=@RoleCode";
                dynamicParams.Add("@RoleCode", RoleCode);
                list.Add(new { str = sql, parm = dynamicParams });
                list.Add(new { str = sql, parm = new { RoleCode = RoleCode } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
@@ -960,11 +948,10 @@
        #endregion
        #region[角色清单关联用户保存]
        public static ToMessage SaveRoleAssociationUser(string rolecode, List<ObjectData> json)
        public static ToMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
@@ -972,31 +959,25 @@
                {
                    //清除用户关联角色表数据
                    sql = @"delete TUserRoleRelation where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                    //标记角色表关联用户标识
                    sql = @"update TRole set is_user='N' where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                }
                else
                {
                    //清除用户关联角色表数据
                    sql = @"delete TUserRoleRelation where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        sql = @"insert into TUserRoleRelation(usercode,role_code) values(@usercode,@role_code)";
                        dynamicParams.Add("@usercode", json[i]);
                        dynamicParams.Add("@role_code", rolecode);
                        list.Add(new { str = sql, parm = dynamicParams });
                        list.Add(new { str = sql, parm = new { usercode = json[i], role_code = rolecode } });
                    }
                    //标记角色表关联用户标识
                    sql = @"update TRole set is_user='Y' where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -1057,7 +1038,6 @@
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
@@ -1065,19 +1045,16 @@
                {
                    //清除用户关联功能表数据
                    sql = @"delete TRoleRightRelation where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                    //标记角色表关联功能标识
                    sql = @"update TRole set is_right='N' where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                }
                else
                {
                    //清除角色关联功能表数据
                    sql = @"delete TRoleRightRelation where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)  //PC、APP层
                    {
@@ -1086,18 +1063,18 @@
                            for (int k = 0; k < json[i].children[j].children.Count; k++) //二级菜单
                            {
                                sql = @"insert into TRoleRightRelation(role_code,right_code,lm_user,lm_date) values(@role_code,@right_code,@lm_user,@lm_date)";
                                dynamicParams.Add("@role_code", rolecode);
                                dynamicParams.Add("@right_code", json[i].children[j].children[k].code);
                                dynamicParams.Add("@lm_user", usercode);
                                dynamicParams.Add("@lm_date", DateTime.Now.ToString());
                                list.Add(new { str = sql, parm = dynamicParams });
                                list.Add(new { str = sql, parm = new {
                                    role_code = rolecode,
                                    right_code= json[i].children[j].children[k].code,
                                    lm_user= usercode, lm_date= DateTime.Now.ToString()
                                }
                                });
                            }
                        }
                    }
                    //标记角色表关联用户标识
                    sql = @"update TRole set is_right='Y' where role_code=@rolecode";
                    dynamicParams.Add("@rolecode", rolecode);
                    list.Add(new { str = sql, parm = dynamicParams });
                    list.Add(new { str = sql, parm = new { rolecode = rolecode } });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -1233,5 +1210,36 @@
            return mes;
        }
        #endregion
        #region[往来单位删除]
        public static ToMessage DeleteCurrentUnit(string unitid)
        {
            var sql = "";
            List<object> list = new List<object>();
            try
            {
                //删除(更新状态)往来单位表
                sql = @"update TCustomer set is_delete='1'  where id=@unitid";
                list.Add(new { str = sql, parm = new { unitid = unitid } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    mes.code = "200";
                    mes.Message = "删除用户成功!";
                }
                else
                {
                    mes.code = "300";
                    mes.Message = "删除用户失败!";
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.Message = e.Message;
            }
            return mes;
        }
        #endregion
    }
}
VueWebApi/Logs/2022-06-18.TXT
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -372,13 +372,13 @@
      <publishTime>11/28/2018 13:04:24</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>06/17/2022 16:46:55</publishTime>
      <publishTime>06/18/2022 14:31:58</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll.config">
      <publishTime>06/15/2022 15:31:43</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>06/17/2022 16:46:55</publishTime>
      <publishTime>06/18/2022 14:31:58</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>06/16/2022 14:26:01</publishTime>
@@ -447,7 +447,7 @@
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="Excel/用户清单.xls">
      <publishTime>06/17/2022 08:12:21</publishTime>
      <publishTime>06/17/2022 17:19:59</publishTime>
    </File>
    <File Include="favicon.ico">
      <publishTime>06/10/2022 08:20:24</publishTime>
VueWebApi/VueWebApi.csproj.user
@@ -8,7 +8,7 @@
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\新凯迪MES\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
VueWebApi/bin/VueWebApi.pdb
Binary files differ
VueWebApi/bin/VueWebApi.xml
@@ -591,6 +591,13 @@
            <param name="json">提交数据对象</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.ImportUserExcel(System.Web.HttpPostedFileBase)">
            <summary>
            ç”¨æˆ·æ¸…单导入
            </summary>
            <param name="files">上传用户清单导入文件</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.RoleTypeSearch(System.Int32,System.Int32,System.String,System.String)">
            <summary>
            è§’色类型查询
@@ -658,7 +665,7 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.SaveRoleAssociationUser(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
        <member name="M:VueWebApi.Controllers.BasicSettingController.SaveRoleAssoctUser(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            è§’色清单关联用户保存
            </summary>
@@ -697,6 +704,20 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AddUpdateCurrentUnit(Newtonsoft.Json.Linq.JObject)">
            <summary>
            å¾€æ¥å•位新增编辑
            </summary>
            <param name="obj">提交数据对象</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.DeleteCurrentUnit(System.String)">
            <summary>
            å¾€æ¥å•位删除
            </summary>
            <param name="unitid">往来单位ID</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ImportExcelController.DownLoadExcel(System.String)">
            <summary>
            Excel导入模板下载
VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/Excel/Óû§Çåµ¥.xls
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ