[add] 设备返修添加设备编号和设备名称字段

src/main/java/vion/dto/RepairRecDTO.java

@@ -126,4 +126,7 @@ public class RepairRecDTO extends BaseDTO {
     private Date shipDateStart;
     private Date shipDateStart;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date shipDateEnd;
     private Date shipDateEnd;
+
+    private String deviceName;
+    private String deviceNo;
 }
 }
\ No newline at end of file

src/main/java/vion/service/impl/RepairRecServiceImpl.java

@@ -95,6 +95,8 @@ public class RepairRecServiceImpl extends MPJBaseServiceImpl<RepairRecMapper, Re
                 .leftJoin(RRepairDevice.class, on -> on.eq(RRepairDevice::getRId, RepairRec::getId).eq(RRepairDevice::getRType, 2))
                 .leftJoin(RRepairDevice.class, on -> on.eq(RRepairDevice::getRId, RepairRec::getId).eq(RRepairDevice::getRType, 2))
                 .between(RepairRec::getCreateTime, dto.getCreateTimeStart(), dto.getCreateTimeEnd())
                 .between(RepairRec::getCreateTime, dto.getCreateTimeStart(), dto.getCreateTimeEnd())
                 .between(ArrayUtil.isAllNotNull(dto.getShipDateStart(), dto.getShipDateEnd()), SparePart::getShipDate, dto.getShipDateStart(), dto.getShipDateEnd())
                 .between(ArrayUtil.isAllNotNull(dto.getShipDateStart(), dto.getShipDateEnd()), SparePart::getShipDate, dto.getShipDateStart(), dto.getShipDateEnd())
+                .like(StrUtil.isNotBlank(dto.getDeviceName()), RRepairDevice::getDeviceName, dto.getDeviceName())
+                .like(StrUtil.isNotBlank(dto.getDeviceNo()), RRepairDevice::getDeviceNo, dto.getDeviceNo())
                 .orderByDesc(RepairRec::getCreateTime);
                 .orderByDesc(RepairRec::getCreateTime);
         return this.selectJoinList(RepairRecVO.class, wrapper);
         return this.selectJoinList(RepairRecVO.class, wrapper);
     }
     }