dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:c11c140c5e125b654304e2417d27f094c26758ea
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
..
compare: dianliang:43c4f421cf4f665dc9cca2a7896e06190f8e81a9
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

No commits in common. "c11c140c5e125b654304e2417d27f094c26758ea" and "43c4f421cf4f665dc9cca2a7896e06190f8e81a9" have entirely different histories.
c11c140c5e ... 43c4f421cf

4 changed files with 33 additions and 96 deletions
Show Stats Expand all files Collapse all files

9
dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
View File

@ -91,15 +91,6 @@ public interface CompanyStaffService extends IService<CompanyStaff> {
**/ **/
void resetPassword(CompanyStaffRespVO staffRespVO); void resetPassword(CompanyStaffRespVO staffRespVO);
/**
* 通过手机号查询员工数据
* @author PQZ
* @date 15:08 2025/2/21
* @param phone 手机号
* @return cn.iocoder.yudao.module.staff.entity.CompanyStaff
**/
CompanyStaff queryByPhone(String phone);
/** /**
* 验证工号是否重复 * 验证工号是否重复
* @author 小李 * @author 小李

23
dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
View File

@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.log.Log; import cn.hutool.log.Log;
import cn.iocoder.yudao.common.*; import cn.iocoder.yudao.common.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
@ -440,32 +439,11 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
* @author 小李 * @author 小李
* @date 16:21 2024/8/9 * @date 16:21 2024/8/9
**/ **/
@Override
public void resetPassword(CompanyStaffRespVO staffRespVO) { public void resetPassword(CompanyStaffRespVO staffRespVO) {
// 修改员工密码 // 修改员工密码
adminUserApi.resetPassword(staffRespVO.getUserId(), staffRespVO.getPassword()); adminUserApi.resetPassword(staffRespVO.getUserId(), staffRespVO.getPassword());
} }
/**
* 通过手机号查询员工数据
*
* @param phone 手机号
* @return cn.iocoder.yudao.module.staff.entity.CompanyStaff
* @author PQZ
* @date 15:08 2025/2/21
**/
@Override
public CompanyStaff queryByPhone(String phone) {
LambdaQueryWrapper<CompanyStaff> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(BaseDO::getDeleted,0).eq(CompanyStaff::getTel,phone);
List<CompanyStaff> list = list(lambdaQueryWrapper);
if (!list.isEmpty()) {
return list.get(0);
} else {
return null;
}
}
/** /**
* 验证工号是否重复 * 验证工号是否重复
* *
@ -473,7 +451,6 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
* @author 小李 * @author 小李
* @date 14:03 2024/8/9 * @date 14:03 2024/8/9
**/ **/
@Override
public Boolean checkWorkNo(String workNo) { public Boolean checkWorkNo(String workNo) {
return staffMapper.selectCount(new LambdaQueryWrapper<CompanyStaff>().and(item -> { return staffMapper.selectCount(new LambdaQueryWrapper<CompanyStaff>().and(item -> {
item.eq(CompanyStaff::getWorkNo, workNo); item.eq(CompanyStaff::getWorkNo, workNo);

96
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java
View File

@ -8,9 +8,6 @@ import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCoachMapper;
import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachService; import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachService;
import cn.iocoder.yudao.module.base.vo.*; import cn.iocoder.yudao.module.base.vo.*;
import cn.iocoder.yudao.module.jx.utils.StringUtils; import cn.iocoder.yudao.module.jx.utils.StringUtils;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import cn.iocoder.yudao.module.staff.service.CompanyStaffService;
import cn.iocoder.yudao.module.staff.service.UniqueCodeService;
import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@ -47,13 +44,7 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
@Lazy @Lazy
private AdminUserApi adminUserApi; private AdminUserApi adminUserApi;
@Resource @Resource
@Lazy
private CompanyStaffService companyStaffService;
@Resource
private PermissionApi permissionApi; private PermissionApi permissionApi;
@Resource
private UniqueCodeService uniqueCodeService;
/** /**
* 驾校教练、普通员工列表 * 驾校教练、普通员工列表
@ -80,9 +71,9 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
@Override @Override
public List<DlDriveSchoolCoach> listSchoolCoach(DlDriveSchoolCoachPageReqVO pageReqVO) { public List<DlDriveSchoolCoach> listSchoolCoach(DlDriveSchoolCoachPageReqVO pageReqVO) {
LambdaQueryWrapper<DlDriveSchoolCoach> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DlDriveSchoolCoach> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(BaseDO::getDeleted, 0).eq(DlDriveSchoolCoach::getType, "jl"); lambdaQueryWrapper.eq(BaseDO::getDeleted,0).eq(DlDriveSchoolCoach::getType,"jl");
if (StringUtils.isNotEmpty(pageReqVO.getName())) { if (StringUtils.isNotEmpty(pageReqVO.getName())){
lambdaQueryWrapper.like(DlDriveSchoolCoach::getName, pageReqVO.getName()); lambdaQueryWrapper.like(DlDriveSchoolCoach::getName,pageReqVO.getName());
} }
return list(lambdaQueryWrapper); return list(lambdaQueryWrapper);
} }
@ -96,7 +87,7 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
**/ **/
@Override @Override
public IPage<DlDriveSchoolStaffVO> pageStaffCoach(DlDriveSchoolStaffVO staffVO, Page<DlDriveSchoolStaffVO> page) { public IPage<DlDriveSchoolStaffVO> pageStaffCoach(DlDriveSchoolStaffVO staffVO, Page<DlDriveSchoolStaffVO> page) {
return dlDriveSchoolCoachMapper.pageStaffCoach(staffVO, page); return dlDriveSchoolCoachMapper.pageStaffCoach(staffVO,page);
} }
/** /**
@ -109,59 +100,36 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveSchoolCoach(DlDriveSchoolCoachSaveReqVO createReqVO) { public void saveSchoolCoach(DlDriveSchoolCoachSaveReqVO createReqVO) {
/*1、基础数据准备*/ /*1、数据类型转换*/
//数据类型转换
DlDriveSchoolCoach dlDriveSchoolCoach = BeanUtils.toBean(createReqVO, DlDriveSchoolCoach.class); DlDriveSchoolCoach dlDriveSchoolCoach = BeanUtils.toBean(createReqVO, DlDriveSchoolCoach.class);
//初始化
CompanyStaff companyStaff = companyStaffService.queryByPhone(createReqVO.getPhone());
//查询用户
AdminUserRespDTO userDTO = new AdminUserRespDTO();
if (null == createReqVO.getUserId()) { if (null == createReqVO.getUserId()) {
userDTO = adminUserApi.getUserByUsername(createReqVO.getPhone()); /*2、新增教练或编辑教练无用户id时，同时插入一条用户数据*/
} //通过手机号查询用户
//定义用户id AdminUserRespDTO userDTO = adminUserApi.getUserByUsername(createReqVO.getPhone());
Long userId = null; Long userId;
if (StringUtils.isEmpty(createReqVO.getId())) { //存在两种情况，1、用户存在，2、用户不存在
/*2、 情况一：新增教练或员工时，员工表中无数据*/ if (null == userDTO) {
//员工表中无数据 UserDTO user = new UserDTO();
if (null == companyStaff) { //如果不存在创建用户；
//用户表中无数据 user.setUsername(createReqVO.getPhone());
if (null == userDTO) { user.setNickname(createReqVO.getName());
UserDTO user = new UserDTO(); //默认密码
//如果不存在创建用户； user.setPassword(PASSWORD_DEFAULT);
user.setUsername(createReqVO.getPhone()); user.setMobile(createReqVO.getPhone());
user.setNickname(createReqVO.getName()); //用户类型员工
//默认密码 user.setUserType(USER_TYPE_STAFF);
user.setPassword(PASSWORD_DEFAULT); //用户表创建教练
user.setMobile(createReqVO.getPhone()); userId = adminUserApi.createUser(user);
//用户类型员工 //创建用户后为客户绑定角色
user.setUserType(USER_TYPE_STAFF); Set<String> roleCodes = new HashSet<>();
//用户表创建教练 if ("jl".equals(createReqVO.getType())) {
userId = adminUserApi.createUser(user); roleCodes.add(SchoolRoleEnum.COACH.getCode());
//创建用户后为客户绑定角色 } else if ("yg".equals(createReqVO.getType())){
Set<String> roleCodes = new HashSet<>(); roleCodes.add(SchoolRoleEnum.STAFF.getCode());
if ("jl".equals(createReqVO.getType())) {
roleCodes.add(SchoolRoleEnum.COACH.getCode());
} else if ("yg".equals(createReqVO.getType())) {
roleCodes.add(SchoolRoleEnum.STAFF.getCode());
}
permissionApi.assignUserRole(userId, roleCodes);
} else {
//用户表中有数据
userId = userDTO.getId();
} }
CompanyStaff newStaff = new CompanyStaff(); permissionApi.assignUserRole(userId, roleCodes);
newStaff.setUserId(userId);
newStaff.setName(createReqVO.getName());
newStaff.setTel(createReqVO.getPhone());
newStaff.setAddress(createReqVO.getAddress());
newStaff.setSex(createReqVO.getSex());
newStaff.setUniqueCode(uniqueCodeService.createUniqueCode());
//保存到员工表
companyStaffService.save(newStaff);
} else { } else {
//员工表中有数据，则取用户id userId = userDTO.getId();
userId = companyStaff.getUserId();
} }
dlDriveSchoolCoach.setUserId(userId); dlDriveSchoolCoach.setUserId(userId);
} }
@ -223,10 +191,10 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
@Override @Override
public DlDriveSchoolCoachRespVO getDlDriveSchoolCoachByUserId(Long userId) { public DlDriveSchoolCoachRespVO getDlDriveSchoolCoachByUserId(Long userId) {
LambdaQueryWrapper<DlDriveSchoolCoach> queryWrapper = new LambdaQueryWrapper<DlDriveSchoolCoach>() LambdaQueryWrapper<DlDriveSchoolCoach> queryWrapper = new LambdaQueryWrapper<DlDriveSchoolCoach>()
.eq(DlDriveSchoolCoach::getUserId, userId); .eq(DlDriveSchoolCoach::getUserId,userId);
List<DlDriveSchoolCoach> list = this.list(queryWrapper); List<DlDriveSchoolCoach> list = this.list(queryWrapper);
DlDriveSchoolCoachRespVO schoolCoach = null; DlDriveSchoolCoachRespVO schoolCoach = null;
if (!list.isEmpty()) { if(!list.isEmpty()){
schoolCoach = BeanUtils.toBean(list.get(0), DlDriveSchoolCoachRespVO.class); schoolCoach = BeanUtils.toBean(list.get(0), DlDriveSchoolCoachRespVO.class);
} }
return schoolCoach; return schoolCoach;

1
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java
View File

@ -56,6 +56,7 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl<DlDriveSchoolSt
//学员基本信息 //学员基本信息
DlDriveSchoolStudent student = getById(id); DlDriveSchoolStudent student = getById(id);
DlDriveSchoolStudentVO result = BeanUtils.toBean(student,DlDriveSchoolStudentVO.class); DlDriveSchoolStudentVO result = BeanUtils.toBean(student,DlDriveSchoolStudentVO.class);
return result; return result;
} }