|
|
|
@ -31,15 +31,34 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.TrailerVo; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.TraliveredVo; |
|
|
|
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busbillfile.BusBillFileDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busbillfile.BusBillFileVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busdelivered.*; |
|
|
|
import com.yxt.anrui.buscenter.api.busdeliveredapply.*; |
|
|
|
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo; |
|
|
|
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; |
|
|
|
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; |
|
|
|
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; |
|
|
|
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserVo; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.invoiced.*; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.retrieval.*; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; |
|
|
|
@ -93,6 +112,10 @@ public class AppBusDeliveredApplyService { |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
@Autowired |
|
|
|
private BaseTrailerFeign baseTrailerFeign; |
|
|
|
@Autowired |
|
|
|
private BusBillApplicationFeign busBillApplicationFeign; |
|
|
|
@Autowired |
|
|
|
private BusSalesOrderFeign busSalesOrderFeign; |
|
|
|
|
|
|
|
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pagerQuery) { |
|
|
|
ResultBean<PagerVo<DeliveredPageVo>> rb = ResultBean.fireFail(); |
|
|
|
@ -137,10 +160,125 @@ public class AppBusDeliveredApplyService { |
|
|
|
return rb.success().setData(vo); |
|
|
|
}*/ |
|
|
|
|
|
|
|
public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { |
|
|
|
public ResultBean<String> saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { |
|
|
|
AppDeliveredApplyDto dto = new AppDeliveredApplyDto(); |
|
|
|
BeanUtil.copyProperties(deliveredApplyDto, dto); |
|
|
|
ResultBean resultBean = busDeliveredApplyFeign.saveRetrievalApplyInfo(dto); |
|
|
|
ResultBean<String> resultBean = busDeliveredApplyFeign.saveRetrievalApplyInfo(dto); |
|
|
|
return resultBean; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto billApplicationIInfoDto) { |
|
|
|
BusBillApplicationDto busBillApplicationDto = new BusBillApplicationDto(); |
|
|
|
BeanUtil.copyProperties(billApplicationIInfoDto, busBillApplicationDto, "carBuyContractImages"); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(billApplicationIInfoDto.getOrgPath()).getData(); |
|
|
|
busBillApplicationDto.setUseOrgSid(useOrgSid); |
|
|
|
busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid()); |
|
|
|
busBillApplicationDto.setTotalBillMoney(billApplicationIInfoDto.getInvoiceTotal()); |
|
|
|
busBillApplicationDto.setOrgSidPath(billApplicationIInfoDto.getOrgPath()); |
|
|
|
busBillApplicationDto.setSaleTypeValue(billApplicationIInfoDto.getSaleType()); |
|
|
|
busBillApplicationDto.setSaleDeptName(billApplicationIInfoDto.getSellerDept()); |
|
|
|
busBillApplicationDto.setStaffName(billApplicationIInfoDto.getSellerName()); |
|
|
|
busBillApplicationDto.setOpenTickUnitName(billApplicationIInfoDto.getInvoicingUnit()); |
|
|
|
busBillApplicationDto.setCustomerName(billApplicationIInfoDto.getName()); |
|
|
|
busBillApplicationDto.setOneBillMoney(billApplicationIInfoDto.getInvoiceMoney()); |
|
|
|
busBillApplicationDto.setOpenTickTypeKey(billApplicationIInfoDto.getOpenTickTypeKey()); |
|
|
|
busBillApplicationDto.setOpenTickTypeValue(billApplicationIInfoDto.getOpenTickTypeValue()); |
|
|
|
busBillApplicationDto.setOpenTickSid(billApplicationIInfoDto.getOpenTickSid()); |
|
|
|
busBillApplicationDto.setOpenTickName(billApplicationIInfoDto.getOpenTickName()); |
|
|
|
busBillApplicationDto.setBillStateKey(billApplicationIInfoDto.getInvoiceStateKey()); |
|
|
|
busBillApplicationDto.setBillStateValue(billApplicationIInfoDto.getInvoiceState()); |
|
|
|
busBillApplicationDto.setContractNo(billApplicationIInfoDto.getContractId()); |
|
|
|
busBillApplicationDto.setApplyDate(billApplicationIInfoDto.getDate()); |
|
|
|
busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid()); |
|
|
|
busBillApplicationDto.setNodeState(billApplicationIInfoDto.getNodeState()); |
|
|
|
busBillApplicationDto.setBillNo(billApplicationIInfoDto.getBillNo()); |
|
|
|
String publishInfo = billApplicationIInfoDto.getPublishInfo(); |
|
|
|
String[] split = publishInfo.split("-"); |
|
|
|
busBillApplicationDto.setDeptName(split[0]); |
|
|
|
busBillApplicationDto.setCreateByName(split[1]); |
|
|
|
//开票车辆信息
|
|
|
|
List<VinListDto> vinList = billApplicationIInfoDto.getVinList(); |
|
|
|
List<BusBillVehicleDto> busBillVehicleDtos = new ArrayList<>(); |
|
|
|
for (VinListDto vinListDto : vinList) { |
|
|
|
if (StringUtils.isBlank(vinListDto.getInvoiceInfo())) { |
|
|
|
return new ResultBean().fail().setMsg("开票信息不能为空"); |
|
|
|
} |
|
|
|
BusBillVehicleDto busBillVehicleDto = new BusBillVehicleDto(); |
|
|
|
busBillVehicleDto.setVinNo(vinListDto.getVin()); |
|
|
|
busBillVehicleDto.setVehSid(vinListDto.getVinSid()); |
|
|
|
busBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey()); |
|
|
|
busBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState()); |
|
|
|
busBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey()); |
|
|
|
busBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType()); |
|
|
|
busBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid()); |
|
|
|
busBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); |
|
|
|
busBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); |
|
|
|
busBillVehicleDtos.add(busBillVehicleDto); |
|
|
|
} |
|
|
|
busBillApplicationDto.setBusBillVehicles(busBillVehicleDtos); |
|
|
|
//开票挂车信息
|
|
|
|
List<FinBillTrailerDto> finBillTrailers = billApplicationIInfoDto.getFinBillTrailers(); |
|
|
|
List<BusBillTrailerDto> busBillTrailerDtos = new ArrayList<>(); |
|
|
|
if (finBillTrailers != null && finBillTrailers.size() > 0) { |
|
|
|
for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) { |
|
|
|
BusBillTrailerDto busBillTrailerDto = new BusBillTrailerDto(); |
|
|
|
BeanUtil.copyProperties(finBillTrailerDto, busBillTrailerDto); |
|
|
|
busBillTrailerDtos.add(busBillTrailerDto); |
|
|
|
} |
|
|
|
} |
|
|
|
busBillApplicationDto.setBusBillTrailers(busBillTrailerDtos); |
|
|
|
//附件信息
|
|
|
|
List<String> appCarBuyContractImages = billApplicationIInfoDto.getCarBuyContractImages();//车辆买卖合同
|
|
|
|
List<String> customerInvoiceApplyImages = billApplicationIInfoDto.getCustomerInvoiceApplyImages();//客户开票申请书
|
|
|
|
List<String> invoiceApplyConfirmImages = billApplicationIInfoDto.getInvoiceApplyConfirmImages();//开票信息确认书
|
|
|
|
List<String> registerContractImages = billApplicationIInfoDto.getRegisterContractImages();//车辆登记合同
|
|
|
|
List<String> idCardImages = billApplicationIInfoDto.getIdCardImages();//证件
|
|
|
|
List<BusBillFileDto> carBuyContractImages = new ArrayList<>(); // 车辆买卖合同
|
|
|
|
List<BusBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
|
|
|
|
List<BusBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
|
|
|
|
List<BusBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
|
|
|
|
List<BusBillFileDto> idCardImagesPC = new ArrayList<>();//证件
|
|
|
|
if (appCarBuyContractImages != null) { |
|
|
|
for (String appCarBuyContractImage : appCarBuyContractImages) { |
|
|
|
BusBillFileDto busBillFileDto = new BusBillFileDto(); |
|
|
|
busBillFileDto.setFileUrl(appCarBuyContractImage); |
|
|
|
carBuyContractImages.add(busBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (customerInvoiceApplyImages != null) { |
|
|
|
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { |
|
|
|
BusBillFileDto busBillFileDto = new BusBillFileDto(); |
|
|
|
busBillFileDto.setFileUrl(customerInvoiceApplyImage); |
|
|
|
khkpsqsApplicationAppendxs.add(busBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (invoiceApplyConfirmImages != null) { |
|
|
|
for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { |
|
|
|
BusBillFileDto busBillFileDto = new BusBillFileDto(); |
|
|
|
busBillFileDto.setFileUrl(invoiceApplyConfirmImage); |
|
|
|
kpxxqrsApplicationAppendxs.add(busBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (registerContractImages != null) { |
|
|
|
for (String registerContractImage : registerContractImages) { |
|
|
|
BusBillFileDto busBillFileDto = new BusBillFileDto(); |
|
|
|
busBillFileDto.setFileUrl(registerContractImage); |
|
|
|
cldjhtApplicationAppendxs.add(busBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
if (idCardImages != null) { |
|
|
|
for (String idCardImage : idCardImages) { |
|
|
|
BusBillFileDto busBillFileDto = new BusBillFileDto(); |
|
|
|
busBillFileDto.setFileUrl(idCardImage); |
|
|
|
idCardImagesPC.add(busBillFileDto); |
|
|
|
} |
|
|
|
} |
|
|
|
busBillApplicationDto.setCarBuyContractImages(carBuyContractImages); |
|
|
|
busBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); |
|
|
|
busBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); |
|
|
|
busBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); |
|
|
|
busBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); |
|
|
|
ResultBean resultBean = busBillApplicationFeign.save(busBillApplicationDto); |
|
|
|
return resultBean; |
|
|
|
} |
|
|
|
|
|
|
|
@ -164,6 +302,117 @@ public class AppBusDeliveredApplyService { |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(String sid) { |
|
|
|
//参数sid为出库sid
|
|
|
|
BillApplicationIInfoVo billApplicationIInfoVo = new BillApplicationIInfoVo(); |
|
|
|
BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(sid).getData(); |
|
|
|
if (data != null) { |
|
|
|
billApplicationIInfoVo.setProcInsId(data.getProcInstSid()); |
|
|
|
billApplicationIInfoVo.setInvoiceTotal(data.getTotalBillMoney()); |
|
|
|
billApplicationIInfoVo.setOrgPath(data.getOrgSidPath()); |
|
|
|
billApplicationIInfoVo.setSaleType(data.getSaleTypeValue()); |
|
|
|
billApplicationIInfoVo.setSellerDept(data.getSaleDeptName()); |
|
|
|
billApplicationIInfoVo.setSellerName(data.getStaffName()); |
|
|
|
billApplicationIInfoVo.setInvoicingUnit(data.getOpenTickUnitName()); |
|
|
|
billApplicationIInfoVo.setName(data.getCustomerName()); |
|
|
|
billApplicationIInfoVo.setInvoiceMoney(data.getOneBillMoney()); |
|
|
|
billApplicationIInfoVo.setOpenTickTypeKey(data.getOpenTickTypeKey()); |
|
|
|
billApplicationIInfoVo.setOpenTickTypeValue(data.getOpenTickTypeValue()); |
|
|
|
billApplicationIInfoVo.setOpenTickSid(data.getOpenTickSid()); |
|
|
|
billApplicationIInfoVo.setOpenTickName(data.getOpenTickName()); |
|
|
|
billApplicationIInfoVo.setInvoiceStateKey(data.getBillStateKey()); |
|
|
|
billApplicationIInfoVo.setInvoiceState(data.getBillStateValue()); |
|
|
|
billApplicationIInfoVo.setContractId(data.getContractNo()); |
|
|
|
billApplicationIInfoVo.setDate(data.getApplyDate()); |
|
|
|
billApplicationIInfoVo.setUserSid(data.getCreateBySid()); |
|
|
|
billApplicationIInfoVo.setPublishInfo(data.getDeptName() + "-" + data.getCreateByName()); |
|
|
|
//根据合同查询销售订单
|
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(data.getContractNo()).getData(); |
|
|
|
billApplicationIInfoVo.setBusSalesOrderSid(busSalesOrder.getSid()); |
|
|
|
//车辆信息
|
|
|
|
List<com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo> vinListVos = new ArrayList<>(); |
|
|
|
List<BusBillVehicleVo> busBillVehicleVos = data.getBusBillVehicles(); |
|
|
|
for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { |
|
|
|
com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo vinListVo = new VinListVo(); |
|
|
|
vinListVo.setVin(busBillVehicleVo.getVinNo()); |
|
|
|
vinListVo.setVinSid(busBillVehicleVo.getVehSid()); |
|
|
|
vinListVo.setCertificateStateKey(busBillVehicleVo.getCertificateStateKey()); |
|
|
|
vinListVo.setCertificateState(busBillVehicleVo.getCertificateStateValue()); |
|
|
|
vinListVo.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); |
|
|
|
vinListVo.setInvoiceType(busBillVehicleVo.getBillTypeValue()); |
|
|
|
vinListVo.setOpenTickSid(busBillVehicleVo.getOpenTickSid()); |
|
|
|
vinListVo.setInvoiceName(busBillVehicleVo.getOpenTickName()); |
|
|
|
vinListVo.setInvoiceInfo(busBillVehicleVo.getOpenTickRemarks()); |
|
|
|
vinListVo.setZcHgzImages(busBillVehicleVo.getCertificatePhoto()); |
|
|
|
vinListVos.add(vinListVo); |
|
|
|
} |
|
|
|
billApplicationIInfoVo.setVinList(vinListVos); |
|
|
|
//挂车信息
|
|
|
|
List<BusBillTrailerVo> busBillTrailers = data.getBusBillTrailers(); |
|
|
|
List<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>(); |
|
|
|
if (busBillTrailers != null && busBillTrailers.size() > 0) { |
|
|
|
for (BusBillTrailerVo busBillTrailerVo : busBillTrailers) { |
|
|
|
FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); |
|
|
|
BeanUtil.copyProperties(busBillTrailerVo, finBillTrailerVo); |
|
|
|
List<String> hgzImageUrl = busBillTrailerVo.getHgzImageUrl(); |
|
|
|
finBillTrailerVo.setFiles(hgzImageUrl); |
|
|
|
finBillTrailerVo.setOneBillMoney(busBillTrailerVo.getOneBillMoney()); |
|
|
|
finBillTrailerVos.add(finBillTrailerVo); |
|
|
|
} |
|
|
|
} |
|
|
|
billApplicationIInfoVo.setFinBillTrailers(finBillTrailerVos); |
|
|
|
//附件信息
|
|
|
|
List<BusBillFileVo> carBuyContractImages = data.getCarBuyContractImages(); |
|
|
|
List<BusBillFileVo> khkpsqsApplicationAppendxs = data.getKhkpsqsApplicationAppendxs(); |
|
|
|
List<BusBillFileVo> kpxxqrsApplicationAppendxs = data.getKpxxqrsApplicationAppendxs(); |
|
|
|
List<BusBillFileVo> cldjhtApplicationAppendxs = data.getCldjhtApplicationAppendxs(); |
|
|
|
List<BusBillFileVo> zjApplicationAppendxs = data.getZjApplicationAppendxs(); |
|
|
|
List<String> appCarBuyContractImages = new ArrayList<>();//客户开票申请书
|
|
|
|
List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
|
|
|
|
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
|
|
|
|
List<String> registerContractImages = new ArrayList<>();//车辆登记合同
|
|
|
|
List<String> idCardImages = new ArrayList<>(); |
|
|
|
if (carBuyContractImages.size() > 0) { |
|
|
|
for (BusBillFileVo carBuyContractImage : carBuyContractImages) { |
|
|
|
appCarBuyContractImages.add(carBuyContractImage.getFileUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (zjApplicationAppendxs.size() > 0) { |
|
|
|
for (BusBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { |
|
|
|
idCardImages.add(zjApplicationAppendx.getFileUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (khkpsqsApplicationAppendxs.size() > 0) { |
|
|
|
for (BusBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { |
|
|
|
customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (kpxxqrsApplicationAppendxs.size() > 0) { |
|
|
|
for (BusBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { |
|
|
|
invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (cldjhtApplicationAppendxs.size() > 0) { |
|
|
|
for (BusBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { |
|
|
|
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); |
|
|
|
} |
|
|
|
} |
|
|
|
billApplicationIInfoVo.setCarBuyContractImages(appCarBuyContractImages); |
|
|
|
billApplicationIInfoVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); |
|
|
|
billApplicationIInfoVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); |
|
|
|
billApplicationIInfoVo.setRegisterContractImages(registerContractImages); |
|
|
|
billApplicationIInfoVo.setIdCardImages(idCardImages); |
|
|
|
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(data.getContractNo()).getData(); |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { |
|
|
|
billApplicationIInfoVo.setIsCanEdit(false); |
|
|
|
billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); |
|
|
|
} else { |
|
|
|
billApplicationIInfoVo.setIsCanEdit(true); |
|
|
|
} |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean deleteRetrievalInfo(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String[] sids = {sid}; |
|
|
|
@ -429,7 +678,7 @@ public class AppBusDeliveredApplyService { |
|
|
|
String topPrice = baseVehinstallmodelDetailsVo.getTopPrice(); |
|
|
|
configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2)); |
|
|
|
String installNameKey = baseVehinstallmodelDetailsVo.getInstallNameKey(); |
|
|
|
if("08".equals(installNameKey)){ |
|
|
|
if ("08".equals(installNameKey)) { |
|
|
|
//车辆功能
|
|
|
|
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); |
|
|
|
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); |
|
|
|
@ -443,7 +692,7 @@ public class AppBusDeliveredApplyService { |
|
|
|
configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1)); |
|
|
|
configVoList.add(getConfigValueSpanSize("冷机品牌", baseVehinstallmodelDetailsVo.getCoolerBrand(), 1)); |
|
|
|
configVoList.add(getConfigValueSpanSize("冷机型号", baseVehinstallmodelDetailsVo.getCoolerModel(), 1)); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
//车辆功能
|
|
|
|
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); |
|
|
|
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); |
|
|
|
|
God
2 years ago