|
|
|
@ -294,6 +294,61 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
return baseMapper.selectByOrderSid(saleOrderSid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(BusVehicleQKKPQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>(); |
|
|
|
qw.eq("bso.contractNo", query.getContractNo()); |
|
|
|
if (query.getVinSids() != null) { |
|
|
|
if (query.getVinSids().size() > 0) { |
|
|
|
qw.notIn("bsov.linkSid", query.getVinSids()); |
|
|
|
} |
|
|
|
} |
|
|
|
List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList2(qw); |
|
|
|
List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>(); |
|
|
|
if (busVehicleQKKPVos != null && busVehicleQKKPVos.size() > 0) { |
|
|
|
for (BusVehicleQKKPVo record : busVehicleQKKPVos) { |
|
|
|
//判断相同车辆是否存在已提交的申请
|
|
|
|
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData(); |
|
|
|
if (finBillVehicleDetailsVo != null) { |
|
|
|
busVehicleQKKPVos.remove(record); |
|
|
|
if (busVehicleQKKPVos.size() == 0){ |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
String vehSid = record.getVehSid(); |
|
|
|
if (StringUtils.isNotBlank(vehSid)){ |
|
|
|
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData(); |
|
|
|
if (busArrearsCarryVehicleApply != null){ |
|
|
|
busVehicleQKKPVos.remove(record); |
|
|
|
if (busVehicleQKKPVos.size() == 0){ |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vehSid).getData(); |
|
|
|
if (baseVehicleCertificateVo != null) { |
|
|
|
record.setCertificateState(baseVehicleCertificateVo.getCertificateState()); |
|
|
|
record.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); |
|
|
|
List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); |
|
|
|
record.setZcHgzImages(stringList); |
|
|
|
} |
|
|
|
TraliveredVo traliveredVo = baseTrailerFeign.trailerList(vehSid, query.getContractNo()).getData(); |
|
|
|
List<TrailerVo> trailerVos = traliveredVo.getList(); |
|
|
|
if (trailerVos != null && trailerVos.size() > 0) { |
|
|
|
for (TrailerVo trailerVo : trailerVos) { |
|
|
|
BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo(); |
|
|
|
busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo()); |
|
|
|
busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); |
|
|
|
busVehicleQKKPTrailerVo.setOneBillMoney(trailerVo.getDealPrice()); |
|
|
|
busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo); |
|
|
|
record.setTrailers(busVehicleQKKPTrailerVos); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success().setData(busVehicleQKKPVos); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(BusVehicleQKKPQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>(); |
|
|
|
@ -369,7 +424,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("bv.linkNo", query.getVinNo()); |
|
|
|
} |
|
|
|
//查询已提交申请的欠款提车车辆
|
|
|
|
/* //查询已提交申请的欠款提车车辆
|
|
|
|
ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); |
|
|
|
if (!resultBean.getData().isEmpty()) { |
|
|
|
resultBean.getData().removeAll(Collections.singleton(null)); |
|
|
|
@ -384,7 +439,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
if (!listResultBean.getData().isEmpty()) { |
|
|
|
listResultBean.getData().removeAll(Collections.singleton(null)); |
|
|
|
qw.notIn("bv.sid", listResultBean.getData()); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
List<QCarVo> list = baseMapper.getCanUseCars(qw); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
if (!list.isEmpty()) { |
|
|
|
@ -435,7 +490,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
qw.like("bv.linkNo", params.getVinNo()); |
|
|
|
} |
|
|
|
//查询已提交申请的欠款提车车辆
|
|
|
|
ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); |
|
|
|
/* ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); |
|
|
|
if (!resultBean.getData().isEmpty()) { |
|
|
|
resultBean.getData().removeAll(Collections.singleton(null)); |
|
|
|
List<String> vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList()); |
|
|
|
@ -449,7 +504,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
if (!listResultBean.getData().isEmpty()) { |
|
|
|
listResultBean.getData().removeAll(Collections.singleton(null)); |
|
|
|
qw.notIn("bv.sid", listResultBean.getData()); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
List<QCarVo> list = pagging.getRecords(); |
|
|
|
@ -517,20 +572,4 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
|
|
|
|
return baseMapper.selectOneByVehSidAndOrderSid(vehSid,orderSid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
Boolean i = false; |
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(contractNo); |
|
|
|
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(busSalesOrder.getSid()); |
|
|
|
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { |
|
|
|
String sid = busSalesOrderVehicle.getSid(); |
|
|
|
BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectOneQKKPByBusSid(sid).getData(); |
|
|
|
if (baseVehicleState != null){ |
|
|
|
i = true; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success().setData(i); |
|
|
|
} |
|
|
|
} |
fanzongzhe
2 years ago