|
|
|
@ -3,6 +3,7 @@ package com.yxt.anrui.fin.biz.finvehicleinvoice; |
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; |
|
|
|
@ -221,45 +222,42 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi |
|
|
|
qw.like("v.contractNo", query.getContractNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCustomerName())) { |
|
|
|
qw.like("v.customerName", query.getCustomerName()); |
|
|
|
qw.like("customerName", query.getCustomerName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("v.VIN", query.getVinNo()); |
|
|
|
qw.like("VIN", query.getVinNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getTransferState())) { |
|
|
|
qw.eq("v.transferState", query.getTransferState()); |
|
|
|
qw.eq("transferState", query.getTransferState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillingState())) { |
|
|
|
qw.eq("v.billingState", query.getBillingState()); |
|
|
|
qw.eq("billingState", query.getBillingState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getTransferStateKey())) { |
|
|
|
qw.eq("v.transferStateKey", query.getTransferStateKey()); |
|
|
|
qw.eq("transferStateKey", query.getTransferStateKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillingStateKey())) { |
|
|
|
qw.eq("v.billingStateKey", query.getBillingStateKey()); |
|
|
|
qw.eq("billingStateKey", query.getBillingStateKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getInvoicingName())) { |
|
|
|
qw.like("v.invoicingName", query.getInvoicingName()); |
|
|
|
qw.like("invoicingName", query.getInvoicingName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getInvoiceCode())) { |
|
|
|
qw.like("v.invoiceCode", query.getInvoiceCode()); |
|
|
|
qw.like("invoiceCode", query.getInvoiceCode()); |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (v.invoiceDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.invoiceDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
|
|
|
|
List<FinVehicleInvoiceExportVo> records = baseMapper.selByExcel(qw); |
|
|
|
records.removeAll(Collections.singleton(null)); |
|
|
|
if (!records.isEmpty()) { |
|
|
|
int id = 1; |
|
|
|
for (FinVehicleInvoiceExportVo invoiceExportVo : records) { |
|
|
|
invoiceExportVo.setRankNo(id); |
|
|
|
id = id + 1; |
|
|
|
} |
|
|
|
} |
|
|
|
return records; |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
List<FinVehicleInvoiceExportVo> invoiceExportVoList = baseMapper.selByExcel(qw); |
|
|
|
int id = 1; |
|
|
|
for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { |
|
|
|
invoiceExportVo.setRankNo(id); |
|
|
|
id = id + 1; |
|
|
|
} |
|
|
|
return invoiceExportVoList; |
|
|
|
} |
|
|
|
|
|
|
|
public FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid) { |
|
|
|
@ -409,7 +407,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi |
|
|
|
public ResultBean<VehicleInvoiceVo> selectByVinSids(String vinSid) { |
|
|
|
ResultBean<VehicleInvoiceVo> rb = ResultBean.fireFail(); |
|
|
|
VehicleInvoiceVo vehicleInvoiceVo = baseMapper.selectByVinSids(vinSid); |
|
|
|
if (StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())) { |
|
|
|
if(StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())){ |
|
|
|
List<String> filePathList = Arrays.asList(vehicleInvoiceVo.getFilePath().split(",")); |
|
|
|
vehicleInvoiceVo.setInvoiceImages(filePathList); |
|
|
|
} |
|
|
|
@ -437,8 +435,15 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); |
|
|
|
for (String sid : sids) { |
|
|
|
FinVehicleInvoice finVehicleInvoice = fetchBySid(sid); |
|
|
|
if (CertificState.TransferState.TRANSTATE_WJS.getCode().equals(finVehicleInvoice.getTransferStateKey()) && "002".equals(finVehicleInvoice.getBillingStateKey()) && "是".equals(finVehicleInvoice.getIsTakeTicket())) { |
|
|
|
String vehicleSid = finVehicleInvoice.getVehicleSid(); |
|
|
|
if (CertificState.TransferState.TRANSTATE_WJS.getCode().equals(finVehicleInvoice.getTransferStateKey()) && "002".equals(finVehicleInvoice.getBillingStateKey()) && "是".equals(finVehicleInvoice.getIsTakeTicket())){ |
|
|
|
String vehicleSid = ""; |
|
|
|
if ("主车".equals(finVehicleInvoice.getVehicleType())){ |
|
|
|
vehicleSid = finVehicleInvoice.getVehicleSid(); |
|
|
|
}else if ("挂车".equals(finVehicleInvoice.getVehicleType())){ |
|
|
|
String gcSid = finVehicleInvoice.getVehicleSid(); |
|
|
|
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchBySid(gcSid).getData(); |
|
|
|
vehicleSid = baseTrailerDetailsVo.getVehSid(); |
|
|
|
} |
|
|
|
BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.selNewComSaleByVehSid(vehicleSid).getData(); |
|
|
|
if (busSalesOrderDetailsVo == null) { |
|
|
|
return rb.setMsg("暂无销售订单，不可移交"); |
|
|
|
|
dimengzhe
2 years ago