Browse Source

优化

master
God 2 years ago
parent
commit
57171d4ef9
  1. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java
  2. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java
  3. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingQuery.java
  4. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  5. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java
  6. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java
  7. 295
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java

@ -64,6 +64,10 @@ public class AppDeliveredApplyDto implements Dto {
@ApiModelProperty("车辆集合")
private List<AppCarListVo> carList;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoiceKey;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoice;
/* @ApiModelProperty("记录sid")
private String sid;

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java

@ -121,6 +121,8 @@ public class BusDeliveredApply extends BaseEntity {
private String orgSidPath;
@ApiModelProperty("是否开票(0开票,1不开票)")
private String isInvoicing;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoiceKey;
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoice;
}

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingQuery.java

@ -64,4 +64,5 @@ public class BusValcustFilingQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
private String menuUrl;
private String menuSid;
}

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -2533,6 +2533,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
String sid = resultBean.getData();
busDeliveredApply = fetchBySid(sid);
if ("1".equals(dto.getHasInvoiceKey())){
BusBillApplicationDetailsVo busBillApplicationDetailsVo = busBillApplicationService.fetchDetailByCkSid(sid);
if (busBillApplicationDetailsVo == null){
return rb.setMsg("未保存开票信息,无法提交");
}
}
String orgSidPath = "";
if (StringUtils.isNotBlank(busDeliveredApply.getOrgSidPath())) {
orgSidPath = busDeliveredApply.getOrgSidPath();

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java

@ -33,11 +33,21 @@ public interface InvoicedFeign {
@ResponseBody
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(@SpringQueryMap BillApplicationPageInfoQuery query);
@ApiOperation("手机端-初始化 出库开票/详情")
@GetMapping("/getInvoicedApply2")
@ResponseBody
public ResultBean<BillApplicationIInfoVo> getInvoicedApply2(@SpringQueryMap BillApplicationPageInfoQuery query);
@ApiOperation("移动端-保存开票申请")
@PostMapping("/saveInvoicedApplyInfo")
@ResponseBody
public ResultBean saveInvoicedApplyInfo(@Valid @RequestBody BillApplicationIInfoDto dto);
@ApiOperation("移动端-保存出库开票")
@PostMapping("/saveInvoicedApplyInfo2")
@ResponseBody
public ResultBean saveInvoicedApplyInfo2(@Valid @RequestBody BillApplicationIInfoDto dto);
@ApiOperation("提交")
@PostMapping("/submitInvoicedInfo")
@ResponseBody

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java

@ -33,11 +33,21 @@ public class InvoicedRest implements InvoicedFeign {
return invoicedService.getInvoicedApply(query);
}
@Override
public ResultBean<BillApplicationIInfoVo> getInvoicedApply2(BillApplicationPageInfoQuery query) {
return invoicedService.getInvoicedApply2(query);
}
@Override
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
return invoicedService.saveInvoicedApplyInfo(dto);
}
@Override
public ResultBean saveInvoicedApplyInfo2(BillApplicationIInfoDto dto) {
return invoicedService.saveInvoicedApplyInfo2(dto);
}
@Override
public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
return invoicedService.submitInvoicedInfo(dto);

295
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -1,9 +1,26 @@
package com.yxt.anrui.terminal.biz.autoservice.invoiced;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
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.busdeliveredapply.BusDeliveredApply;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
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.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.fin.api.finbillapplication.*;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@ -13,10 +30,11 @@ 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.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.ItemEditTextInfo;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.qkkpFlowListVo;
import com.yxt.anrui.terminal.api.autoservice.invoiced.*;
import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.*;
import com.yxt.common.base.utils.StringUtils;
@ -46,7 +64,16 @@ public class InvoicedService {
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BusBillApplicationFeign busBillApplicationFeign;
@Autowired
private BusDeliveredApplyFeign busDeliveredApplyFeign;
@Autowired
private BusDeliveredApplyDetailsFeign busDeliveredApplyDetailsFeign;
@Autowired
private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
@Autowired
private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(PagerQuery<BillApplicationPageQuery> pagerQuery) {
ResultBean<PagerVo<BillApplicationPageVo>> rb = ResultBean.fireFail();
@ -202,6 +229,155 @@ public class InvoicedService {
return rb.success().setData(vo);
}
public ResultBean<BillApplicationIInfoVo> getInvoicedApply2(BillApplicationPageInfoQuery query) {
ResultBean rb = ResultBean.fireFail();
//参数sid为出库sid
BillApplicationIInfoVo billApplicationIInfoVo = new BillApplicationIInfoVo();
BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(query.getSid()).getData();
BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(query.getSid()).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<VinListVo> vinListVos = new ArrayList<>();
List<BusBillVehicleVo> busBillVehicleVos = data.getBusBillVehicles();
for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
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);
}
}else {
billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId());
billApplicationIInfoVo.setOrgPath(busDeliveredApply.getOrgSidPath());
billApplicationIInfoVo.setSaleType(busDeliveredApply.getPaymentMethodKey());
billApplicationIInfoVo.setSellerDept(busDeliveredApply.getPaymentMethod());
billApplicationIInfoVo.setSellerName(busDeliveredApply.getStaffName());
//开票单位
ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderFeign.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData();
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
billApplicationIInfoVo.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName());
}
}
billApplicationIInfoVo.setName(appOrderDetailsVo.getName());
billApplicationIInfoVo.setContractId(busDeliveredApply.getContractNo());
billApplicationIInfoVo.setDate(DateUtil.today());
billApplicationIInfoVo.setUserSid(busDeliveredApply.getCreateBySid());
billApplicationIInfoVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName());
//车辆信息
List<VinListVo> vinListVos = new ArrayList<>();
List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(query.getSid()).getData();
for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) {
VinListVo vinListVo = new VinListVo();
vinListVo.setVin(busDeliveredApplyDetail.getVinNo());
vinListVo.setVinSid(busDeliveredApplyDetail.getVinSid());
//合格证状态
BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetail.getVinSid()).getData();
if (baseVehicleCertificate != null) {
vinListVo.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
vinListVo.setCertificateState(baseVehicleCertificate.getCertificateStateValue());
}
vinListVos.add(vinListVo);
}
billApplicationIInfoVo.setVinList(vinListVos);
}
return rb.success().setData(billApplicationIInfoVo);
}
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages");
@ -317,6 +493,121 @@ public class InvoicedService {
return resultBean;
}
public ResultBean saveInvoicedApplyInfo2(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;
}
public ResultBean agreeInvoicedInfo(InvoicedDto dto) {
ResultBean rb = ResultBean.fireFail();
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();

Loading…
Cancel
Save