|
@@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.om.entity.dto.*;
|
|
import com.om.entity.dto.*;
|
|
import com.om.entity.po.*;
|
|
import com.om.entity.po.*;
|
|
|
|
+import com.om.entity.po.VciInfo;
|
|
import com.om.entity.vo.*;
|
|
import com.om.entity.vo.*;
|
|
import com.om.exception.BadReqException;
|
|
import com.om.exception.BadReqException;
|
|
import com.om.exception.BizException;
|
|
import com.om.exception.BizException;
|
|
import com.om.mapper.RepairMapper;
|
|
import com.om.mapper.RepairMapper;
|
|
|
|
+import com.om.mapper.VciInfoMapper;
|
|
import com.om.service.*;
|
|
import com.om.service.*;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.om.utils.*;
|
|
import com.om.utils.*;
|
|
@@ -74,6 +76,11 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
|
|
@Resource
|
|
@Resource
|
|
private JwtUtils jwtUtils;
|
|
private JwtUtils jwtUtils;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private IUserVciService userVciService;
|
|
|
|
+ @Resource
|
|
|
|
+ private VciInfoMapper vciInfoMapper;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
public Result AppCreateReport(APPReportCreateDTO dto) {
|
|
public Result AppCreateReport(APPReportCreateDTO dto) {
|
|
@@ -147,6 +154,14 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
|
|
if (BeanUtil.isEmpty(user)) {
|
|
if (BeanUtil.isEmpty(user)) {
|
|
return Result.fail("用户不存在").result(ResultCode.NO_DATA);
|
|
return Result.fail("用户不存在").result(ResultCode.NO_DATA);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ UserVci userVci = userVciService.lambdaQuery()
|
|
|
|
+ .eq(UserVci::getUserId, userId)
|
|
|
|
+ .eq(UserVci::getIsDefault, 1)
|
|
|
|
+ .one();
|
|
|
|
+
|
|
|
|
+ VciInfo vciInfo = vciInfoMapper.selectById(userVci.getVciInfoId());
|
|
|
|
+
|
|
AppRepairQueryPageVO vo = new AppRepairQueryPageVO();
|
|
AppRepairQueryPageVO vo = new AppRepairQueryPageVO();
|
|
//获取数据
|
|
//获取数据
|
|
Integer pageIndex = dto.getPageIndex();
|
|
Integer pageIndex = dto.getPageIndex();
|
|
@@ -154,7 +169,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
|
|
List<Repair> records = new ArrayList<>();
|
|
List<Repair> records = new ArrayList<>();
|
|
if (pageIndex == 0 && pageSize == 0) {
|
|
if (pageIndex == 0 && pageSize == 0) {
|
|
records = this.lambdaQuery()
|
|
records = this.lambdaQuery()
|
|
- .eq(StringUtils.isNotBlank(deviceSn),Repair::getSn, deviceSn)
|
|
|
|
|
|
+ .eq(Repair::getSn, vciInfo.getVciNum())
|
|
.orderByDesc(Repair::getCreateTime)
|
|
.orderByDesc(Repair::getCreateTime)
|
|
.list();
|
|
.list();
|
|
if (records.isEmpty()) {
|
|
if (records.isEmpty()) {
|
|
@@ -164,7 +179,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
|
|
} else {
|
|
} else {
|
|
//分页查询
|
|
//分页查询
|
|
Page<Repair> page = this.lambdaQuery()
|
|
Page<Repair> page = this.lambdaQuery()
|
|
- .eq(StringUtils.isNotBlank(deviceSn),Repair::getSn, deviceSn)
|
|
|
|
|
|
+ .eq(Repair::getSn, vciInfo.getVciNum())
|
|
.orderByDesc(Repair::getCreateTime)
|
|
.orderByDesc(Repair::getCreateTime)
|
|
.page(new Page<>(pageIndex, pageSize));
|
|
.page(new Page<>(pageIndex, pageSize));
|
|
|
|
|