소스 검색

诊断报告中根据用户绑定的默认的vci进行搜索和客户端用户如果没有绑定维修厂,则查询的时间不做处理

bmmx 1 년 전
부모
커밋
c55932d696
2개의 변경된 파일17개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 3
      src/main/java/com/om/service/impl/DistributorServiceImpl.java
  2. 17 2
      src/main/java/com/om/service/impl/RepairServiceImpl.java

+ 0 - 3
src/main/java/com/om/service/impl/DistributorServiceImpl.java

@@ -166,9 +166,6 @@ public class DistributorServiceImpl extends ServiceImpl<DistributorMapper, Distr
         Integer distributorId = user.getDistributorId();
         //根据id查询维修厂
         Distributor distributor = this.getById(distributorId);
-        if (BeanUtil.isEmpty(distributor)){
-            throw new BadReqException("该维修厂信息不存在");
-        }
 
         APpDistributorVO aPpDistributorVO = BeanUtil.copyProperties(distributor, APpDistributorVO.class);
         return Result.ok(aPpDistributorVO);

+ 17 - 2
src/main/java/com/om/service/impl/RepairServiceImpl.java

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