|
|
@@ -117,6 +117,7 @@ public class BillsController extends BladeController {
|
|
|
.like(Bills::getVesselEnName, bills.getVesselCnName()))
|
|
|
.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getVoyageNo, bills.getVoyageNo())
|
|
|
.like(ObjectUtils.isNotNull(bills.getReceivingAndShipping()), Bills::getReceivingAndShipping, bills.getReceivingAndShipping())
|
|
|
+ .like(ObjectUtils.isNotNull(bills.getCommodityDescr()), Bills::getCommodityDescr, bills.getCommodityDescr())
|
|
|
.and(ObjectUtils.isNotNull(bills.getCorpCnName()), i -> i.like(Bills::getCorpCnName, bills.getCorpCnName()).or()
|
|
|
.like(Bills::getCorpEnName, bills.getCorpCnName()))
|
|
|
.and(ObjectUtils.isNotNull(bills.getCorpAttnName()), i -> i.like(Bills::getCorpAttnName, bills.getCorpAttnName()).or()
|
|
|
@@ -682,6 +683,7 @@ public class BillsController extends BladeController {
|
|
|
.like(ObjectUtils.isNotNull(bills.getBookingNo()), Bills::getBookingNo, bills.getBookingNo())
|
|
|
.like(ObjectUtils.isNotNull(bills.getCreateUserName()), Bills::getCreateUserName, bills.getCreateUserName())
|
|
|
.like(ObjectUtils.isNotNull(bills.getExtendedData()), Bills::getExtendedData, bills.getExtendedData())
|
|
|
+ .like(ObjectUtils.isNotNull(bills.getCommodityDescr()), Bills::getCommodityDescr, bills.getCommodityDescr())
|
|
|
.and(ObjectUtils.isNotNull(bills.getVesselCnName()), i -> i.like(Bills::getVesselCnName, bills.getVesselCnName()).or()
|
|
|
.like(Bills::getVesselEnName, bills.getVesselCnName()))
|
|
|
.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getVoyageNo, bills.getVoyageNo())
|