Commit e0276d75 by HlQ

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

1 parent 277228ac
...@@ -126,4 +126,7 @@ public class RepairRecDTO extends BaseDTO { ...@@ -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 \ No newline at end of file
...@@ -95,6 +95,8 @@ public class RepairRecServiceImpl extends MPJBaseServiceImpl<RepairRecMapper, Re ...@@ -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);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!