|
|
@@ -93,7 +93,7 @@ public class BillsController extends BladeController {
|
|
|
@ApiOperation(value = "分页", notes = "传入bills")
|
|
|
public R<IPage<Bills>> list(Bills bills, Query query) {
|
|
|
LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- lambdaQueryWrapper.select(Bills::getId, Bills::getBillNo, Bills::getBillType, Bills::getMasterBillNo,
|
|
|
+ /*lambdaQueryWrapper.select(Bills::getId, Bills::getBillNo, Bills::getBillType, Bills::getMasterBillNo,
|
|
|
Bills::getCorpCnName, Bills::getCorpId, Bills::getCorpEnName, Bills::getVesselCnName,
|
|
|
Bills::getVesselId, Bills::getVoyageNo, Bills::getMblno, Bills::getHblno, Bills::getEta, Bills::getEtd,
|
|
|
Bills::getPolEnName, Bills::getPolId, Bills::getPodEnName, Bills::getPodId, Bills::getLoadType, Bills::getPlaceReceiptName,
|
|
|
@@ -110,7 +110,7 @@ public class BillsController extends BladeController {
|
|
|
Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCarrierCnName, Bills::getCyCnName, Bills::getSrcType,
|
|
|
Bills::getSrcCnName, Bills::getBookingAgentCnName, Bills::getPodCnName, Bills::getPolCnName, Bills::getCorpSource,
|
|
|
Bills::getVesselEnName, Bills::getCarrierShortName, Bills::getCarrierEnName, Bills::getCyShortName, Bills::getCyEnName, Bills::getMpaymode, Bills::getHpaymode,
|
|
|
- Bills::getShortName, Bills::getPlaceDeliveryName, Bills::getDestinationName);
|
|
|
+ Bills::getShortName, Bills::getPlaceDeliveryName, Bills::getDestinationName);*/
|
|
|
lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
|
|
|
.eq(Bills::getTenantId, AuthUtil.getTenantId())
|
|
|
.and(i -> i.isNull(Bills::getMasterId).or()
|