1

src/main/java/com/fdkankan/sale/service/IRepairService.java

@@ -41,7 +41,7 @@ public interface IRepairService extends IService<Repair> {
 
     List<Repair> getBySnCode(String snCode);
 
-    String getLastRepairId(String cameraSnCode, String repairId);
+    String getLastRepairId(Repair repair);
 
     void updateWarrantyType(String repairId, Integer warrantyType);
 

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -80,7 +80,7 @@ public class RepairInfoService {
         RepairTestVo repairTestVo = repairTestService.getPassVoByRepairId(repairId);
         RepairComment comment = repairCommentService.getByRepairId(repairId);
         List<Fault> faultList = faultService.getByRepairId(repairId);
-        String lastRepairId = repairService.getLastRepairId(repair.getCameraSnCode(),repair.getRepairId());
+        String lastRepairId = repairService.getLastRepairId(repair);
         RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRepairId(repairId);
 
         List<RepairRegisterVo> repairRegisterVoList = repairRegisterService.getVoListByRepairId(repairId);

src/main/java/com/fdkankan/sale/service/impl/RepairServiceImpl.java

@@ -151,11 +151,12 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
     }
 
     @Override
-    public String getLastRepairId(String cameraSnCode, String repairId) {
+    public String getLastRepairId(Repair repair) {
 
         LambdaQueryWrapper<Repair> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Repair::getCameraSnCode,cameraSnCode);
-        wrapper.notIn(Repair::getRepairId,Arrays.asList(repairId));
+        wrapper.eq(Repair::getCameraSnCode,repair.getCameraSnCode());
+        wrapper.lt(Repair::getCreateTime,repair.getCreateTime());
+        wrapper.notIn(Repair::getRepairId,Arrays.asList(repair.getRepairId()));
         wrapper.orderByAsc(Repair::getCreateTime);
         List<Repair> list  =  this.list(wrapper);
         if(list.isEmpty()){