From 49e80197bce41fcad352a2ab97d88786b8020fbc Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 4 Sep 2024 14:13:24 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E5=AE=A2=E6=88=B7=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E6=8C=89=E7=85=A7=E4=B8=9A=E5=8A=A1=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=88=E6=9E=9C=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9A=20=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=8A=A5=E4=BB=B7=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9C=A8=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E4=BB=8E=E5=89=8D=E7=AB=AF=E4=BC=A0=E5=85=A5=E7=9A=84=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=91=98=E5=90=8D=E5=AD=97=E8=BF=9B=E8=A1=8C=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E8=BD=AC=E6=8D=A2=E6=93=8D=E4=BD=9C=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=94=A8=E6=88=B7=E5=90=8D=E6=89=BE=E5=88=B0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=99=BB=E5=BD=95=E5=90=8D=EF=BC=8C=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=BB=99=E4=B8=9A=E5=8A=A1=E5=91=98=E8=B5=8B=E5=80=BC=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E9=80=9A=E8=BF=87=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E6=9F=A5=E8=AF=A2=E7=99=BB=E5=BD=95=E5=90=8D=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerQuoteController.java | 5 +++++ .../service/ISysCustomerQuoteService.java | 5 +++++ .../impl/SysCustomerQuoteServiceImpl.java | 18 +++++++++++++++++- .../com/ruoyi/system/mapper/SysUserMapper.java | 6 ++++++ .../resources/mapper/system/SysUserMapper.xml | 5 +++++ 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java index 5f386507..b115a659 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java @@ -98,6 +98,11 @@ public class SysCustomerQuoteController extends BaseController SysUser curUser = ShiroUtils.getSysUser(); Long userId = curUser.getUserId(); Set roleKeys = roleService.selectRoleKeys(userId); + //通过用户名找到业务登录名，重新给业务员赋值 + String tempLoginName = sysCustomerQuoteService.convertName(sysCustomerQuoteVo); + sysCustomerQuoteVo.setBusinessMembers(tempLoginName); + + startPage(); List list = sysCustomerQuoteService.selectSysCustomerQuoteList(sysCustomerQuoteVo); String loginName = ShiroUtils.getLoginName(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java index 64f847d4..b8a592dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java @@ -112,4 +112,9 @@ public interface ISysCustomerQuoteService * 根据供应商编码数组查询客户报价信息集合 * */ List selectCustomerQuoteOneBySupplierCodes(String[] supplierCodes); + + /** + * 通过用户名找到业务登录名，重新给业务员赋值 + * */ + String convertName(SysCustomerQuoteVo sysCustomerQuoteVo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index 0e964248..60276398 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -104,10 +104,12 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { @Override public List selectSysCustomerQuoteList(SysCustomerQuoteVo sysCustomerQuoteVo) { + + + PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); - //PageHelper 仅对第一List分页有效 Page list = (Page) sysCustomerQuoteMapper.selectSysCustomerQuoteList(sysCustomerQuoteVo); Page returnList = new Page<>(); @@ -167,6 +169,20 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { } + /** + * 通过用户名找到业务登录名，重新给业务员赋值 + * */ + @Override + public String convertName(SysCustomerQuoteVo sysCustomerQuoteVo) { + String businessMembers = sysCustomerQuoteVo.getBusinessMembers(); + if (StringUtils.isNotEmpty(businessMembers)){ + String loginName = userMapper.selectLoginNameByUserName(businessMembers); + return loginName; + } + return businessMembers; + } + + @Override @Transactional public int insertSysCustomerQuote(SysCustomerQuote sysCustomerQuote) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 39fbd81b..cb7fd69e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -164,4 +164,10 @@ public interface SysUserMapper */ @Select("select login_name from sys_user a,sys_user_role b,sys_role c where a.user_id = b.user_id and b.role_id = c.role_id and a.dept_id=#{deptId} and c.role_key= #{roleKey} and a.del_flag = 0 and a.status = 0") public String selectDeptLeaderId(@Param(value = "roleKey") String roleKey, @Param(value = "deptId") Long deptId); + + /** + * 通过用户名查询登录名 + * */ + String selectLoginNameByUserName(String businessMembers); + } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index ab79b235..54739445 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -264,4 +264,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{roleKey} + + + \ No newline at end of file