|
|
@ -2707,13 +2707,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
} |
|
|
|
record.setSaleTypeKey(busSalesOrder.getPayTypeKey()); |
|
|
|
record.setSaleTypeValue(busSalesOrder.getPayType()); |
|
|
|
BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery(); |
|
|
|
busVehicleQKKPQuery.setContractNo(record.getContractNo()); |
|
|
|
List<BusVehicleQKKPVo> busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData(); |
|
|
|
if (busVehicleQKKPVos != null) { |
|
|
|
if (busVehicleQKKPVos.size() != 0) { |
|
|
|
recordsNew.add(record); |
|
|
|
} |
|
|
|
Boolean aBoolean = busSalesOrderVehicleFeign.appVehicleQKKPList2(record.getContractNo()).getData(); |
|
|
|
if (aBoolean){ |
|
|
|
recordsNew.add(record); |
|
|
|
} |
|
|
|
} |
|
|
|
pagging.setRecords(recordsNew); |
|
|
|