feat(user): 添加报价人代码字段支持
- 在AppUserForAdminVO中新增quotationCode字段 - 在AppUserVO中新增quotationCode字段 - 更新AppUserMapper.xml查询语句包含quotation_code字段 - 修改AppUserServiceImpl设置quotationCode值 - 为待审核用户查询添加空字符串作为默认quotation_code值
This commit is contained in:
parent
fb0294fe97
commit
4114494056
|
|
@ -128,6 +128,11 @@ public class AppUserForAdminVO {
|
||||||
*/
|
*/
|
||||||
private String departmentName;
|
private String departmentName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 报价人代码
|
||||||
|
*/
|
||||||
|
private String quotationCode;
|
||||||
|
|
||||||
//下级账号
|
//下级账号
|
||||||
private List<AppUserForAdminVO> children=new ArrayList<>();
|
private List<AppUserForAdminVO> children=new ArrayList<>();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -116,4 +116,9 @@ public class AppUserVO {
|
||||||
* 部门名称
|
* 部门名称
|
||||||
*/
|
*/
|
||||||
private String departmentName;
|
private String departmentName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 报价人代码
|
||||||
|
*/
|
||||||
|
private String quotationCode;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -641,6 +641,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
|
||||||
.setTitleId(appUser.getTitleId())
|
.setTitleId(appUser.getTitleId())
|
||||||
.setTitle(positionService.getById(appUser.getTitleId()).getPositionName())
|
.setTitle(positionService.getById(appUser.getTitleId()).getPositionName())
|
||||||
.setState(appUser.getExpireTime().isAfter(LocalDate.now()) ? 1 : 2)
|
.setState(appUser.getExpireTime().isAfter(LocalDate.now()) ? 1 : 2)
|
||||||
|
.setQuotationCode(appUser.getQuotationCode())
|
||||||
.setDepartmentId(appUser.getDepartmentId())
|
.setDepartmentId(appUser.getDepartmentId())
|
||||||
.setDepartmentName(departments.stream()
|
.setDepartmentName(departments.stream()
|
||||||
.filter(dept -> dept.getId().equals(appUser.getDepartmentId()))
|
.filter(dept -> dept.getId().equals(appUser.getDepartmentId()))
|
||||||
|
|
@ -1050,6 +1051,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
|
||||||
.map(u -> new AppUserVO()
|
.map(u -> new AppUserVO()
|
||||||
.setId(u.getId())
|
.setId(u.getId())
|
||||||
.setName(u.getName())
|
.setName(u.getName())
|
||||||
|
.setQuotationCode(u.getQuotationCode())
|
||||||
.setDepartmentId(u.getDepartmentId())
|
.setDepartmentId(u.getDepartmentId())
|
||||||
.setDepartmentName(
|
.setDepartmentName(
|
||||||
departments.stream()
|
departments.stream()
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,7 @@
|
||||||
,IF(CONVERT_TZ(NOW(), @@session.time_zone, '+00:00') < au.expire_time,1,2)) AS 'state',au.create_by
|
,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.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
|
,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
|
FROM app_user au
|
||||||
LEFT JOIN app_area aa ON au.area_id=aa.id
|
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
|
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 '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
|
,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
|
,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
|
FROM app_user_applyfor aua
|
||||||
LEFT JOIN app_user au ON au.id=aua.create_by
|
LEFT JOIN app_user au ON au.id=aua.create_by
|
||||||
LEFT JOIN app_area aa ON aua.area_id=aa.id
|
LEFT JOIN app_area aa ON aua.area_id=aa.id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue