From 41144940567ccdc774da7a1dc4502a153477c522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 10 Jun 2026 15:38:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E4=BA=BA=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在AppUserForAdminVO中新增quotationCode字段 - 在AppUserVO中新增quotationCode字段 - 更新AppUserMapper.xml查询语句包含quotation_code字段 - 修改AppUserServiceImpl设置quotationCode值 - 为待审核用户查询添加空字符串作为默认quotation_code值 --- .../nflg/mobilebroken/common/pojo/vo/AppUserForAdminVO.java | 5 +++++ .../java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java | 5 +++++ .../repository/service/impl/AppUserServiceImpl.java | 2 ++ .../src/main/resources/mapper/AppUserMapper.xml | 4 ++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserForAdminVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserForAdminVO.java index 7687369e..236eb1e4 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserForAdminVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserForAdminVO.java @@ -128,6 +128,11 @@ public class AppUserForAdminVO { */ private String departmentName; + /** + * 报价人代码 + */ + private String quotationCode; + //下级账号 private List children=new ArrayList<>(); diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java index e341a80e..ceef9b4e 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java @@ -116,4 +116,9 @@ public class AppUserVO { * 部门名称 */ private String departmentName; + + /** + * 报价人代码 + */ + private String quotationCode; } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index 02427bba..3152e6be 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -641,6 +641,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .setTitleId(appUser.getTitleId()) .setTitle(positionService.getById(appUser.getTitleId()).getPositionName()) .setState(appUser.getExpireTime().isAfter(LocalDate.now()) ? 1 : 2) + .setQuotationCode(appUser.getQuotationCode()) .setDepartmentId(appUser.getDepartmentId()) .setDepartmentName(departments.stream() .filter(dept -> dept.getId().equals(appUser.getDepartmentId())) @@ -1050,6 +1051,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .map(u -> new AppUserVO() .setId(u.getId()) .setName(u.getName()) + .setQuotationCode(u.getQuotationCode()) .setDepartmentId(u.getDepartmentId()) .setDepartmentName( departments.stream() diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml index 1ae8994a..d5f8af15 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml @@ -125,7 +125,7 @@ ,IF(CONVERT_TZ(NOW(), @@session.time_zone, '+00:00') < au.expire_time,1,2)) AS 'state',au.create_by ,au.create_time,au.update_by,au.update_time,au.last_login_time,au.is_primary,au.company_id,au.phone,au.area_id ,au.language_code,p.position_name AS 'title',au.title_id,au.type,au.customer_name,au.department_id,d.dept_name - as 'departmentName' + as 'departmentName',au.quotation_code FROM app_user au LEFT JOIN app_area aa ON au.area_id=aa.id LEFT JOIN app_user_applyfor aua ON aua.user_id=au.id AND aua.state=0 @@ -161,7 +161,7 @@ ,null AS 'userState',null AS 'expireTime',0 AS 'state',au.name AS 'createBy',aua.create_time,null AS 'updateBy' ,null AS 'updateTime',null AS 'lastLoginTime',aua.is_primary,aua.company_id,aua.user_phone AS 'phone',aua.area_id ,aua.language_code,p.position_name AS 'title',aua.title_id,au.type,au.customer_name,au.department_id,d.dept_name - as 'departmentName' + as 'departmentName','' as quotation_code FROM app_user_applyfor aua LEFT JOIN app_user au ON au.id=aua.create_by LEFT JOIN app_area aa ON aua.area_id=aa.id