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

Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair

Browse Source
This commit is contained in:
xiaofajia 2024-11-06 12:04:55 +08:00
commit 20b6bbe763
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -40,6 +40,8 @@ import cn.iocoder.yudao.module.system.api.permission.dto.RoleReqDTO;
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;
import cn.iocoder.yudao.module.system.api.user.dto.UserDTO; import cn.iocoder.yudao.module.system.api.user.dto.UserDTO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets; import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.entity.DlTicketWares; import cn.iocoder.yudao.module.tickets.entity.DlTicketWares;
@ -178,6 +180,8 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
@Resource @Resource
@Lazy @Lazy
private CompanyService companyService; private CompanyService companyService;
@Resource
private AdminUserService userService;
/** /**
* 维修工单表 新增 * 维修工单表 新增
@ -324,6 +328,8 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
// 查工单主表 // 查工单主表
DlRepairTickets dlRepairTickets = baseMapper.selectById(id); DlRepairTickets dlRepairTickets = baseMapper.selectById(id);
DlRepairTicketsRespVO result = BeanUtil.toBean(dlRepairTickets, DlRepairTicketsRespVO.class); DlRepairTicketsRespVO result = BeanUtil.toBean(dlRepairTickets, DlRepairTicketsRespVO.class);
AdminUserDO user = userService.getUser(Long.valueOf(dlRepairTickets.getAdviserId()));
result.setLinkPhone(user.getMobile());
//查车辆 //查车辆
if (ObjectUtil.isNotEmpty(dlRepairTickets.getCarId())) { if (ObjectUtil.isNotEmpty(dlRepairTickets.getCarId())) {
CarMainRespVO carInfo = carMainService.queryCarById(dlRepairTickets.getCarId()); CarMainRespVO carInfo = carMainService.queryCarById(dlRepairTickets.getCarId());

2
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java
View File

@ -48,6 +48,8 @@ public class DlRepairTicketsRespVO extends DlRepairTickets {
List<DlRepairTitemReqVO> wares; List<DlRepairTitemReqVO> wares;
List<DlRepairTitemReqVO> projects; List<DlRepairTitemReqVO> projects;
private String linkPhone;
/** /**
* 维修工完成的类别 * 维修工完成的类别
* 01：完成并移交下一班组 * 01：完成并移交下一班组