|
@@ -187,7 +187,7 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
|
|
|
* @param truckNo 车牌号关键字(模糊匹配)
|
|
* @param truckNo 车牌号关键字(模糊匹配)
|
|
|
* @return 车辆列表(按车牌号分组去重,最多返回100条)
|
|
* @return 车辆列表(按车牌号分组去重,最多返回100条)
|
|
|
*/
|
|
*/
|
|
|
- public List<KwtWaybillOrder> selectTruckListForSelect(String truckNo) {
|
|
|
|
|
|
|
+ public List<KwtWaybillOrder> selectTruckListForSelect(String truckNo,Long entId) {
|
|
|
LambdaQueryWrapper<KwtWaybillOrder> wrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
|
|
LambdaQueryWrapper<KwtWaybillOrder> wrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
|
|
|
.select(KwtWaybillOrder::getTruckId,
|
|
.select(KwtWaybillOrder::getTruckId,
|
|
|
KwtWaybillOrder::getTruckNo,
|
|
KwtWaybillOrder::getTruckNo,
|
|
@@ -196,6 +196,7 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
|
|
|
KwtWaybillOrder::getDriverPhone,
|
|
KwtWaybillOrder::getDriverPhone,
|
|
|
KwtWaybillOrder::getStatus)
|
|
KwtWaybillOrder::getStatus)
|
|
|
.eq(KwtWaybillOrder::getDelFlag, 0)
|
|
.eq(KwtWaybillOrder::getDelFlag, 0)
|
|
|
|
|
+ .eq(KwtWaybillOrder::getEntId,entId)
|
|
|
.like(StringUtils.isNotBlank(truckNo), KwtWaybillOrder::getTruckNo, truckNo)
|
|
.like(StringUtils.isNotBlank(truckNo), KwtWaybillOrder::getTruckNo, truckNo)
|
|
|
.groupBy(KwtWaybillOrder::getTruckNo)
|
|
.groupBy(KwtWaybillOrder::getTruckNo)
|
|
|
.orderByDesc(KwtWaybillOrder::getUpdateTime)
|
|
.orderByDesc(KwtWaybillOrder::getUpdateTime)
|