diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index cd1e089b87..7901244e17 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -267,5 +267,5 @@ public interface CommonContractFeign { @ApiOperation("获取合同中部分信息") @PostMapping("/getModelMap") @ResponseBody - ResultBean> getModelMap(Map map); + ResultBean> getModelMap(@RequestBody Map map); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl index 63d3d961de..837d2ef6a4 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl @@ -1280,7 +1280,7 @@ - + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl index 71066e4952..bdb8bd4adb 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl @@ -1224,7 +1224,7 @@ - + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index 72eac2fd97..2153aff0bf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -686,6 +686,44 @@ public class BusBillApplicationService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + filemap.put("year", year); + filemap.put("month", month); + filemap.put("day", day); + if (finCompanyInvoicingDetailsVo != null) { + filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 + filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//开票名称 + filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号 + filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号 + filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址 + }else{ + CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid()); + if (crmCustomerTemp != null) { + filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称 + filemap.put("customerName", crmCustomerTemp.getName());//开票名称 + filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + filemap.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址 + } + } + filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型 + filemap.put("createOrgName", ""); + remarks = "数量" + finBillVehicles.size() + "台,单台成交价: 元。"; + filemap.put("remarks", remarks); + filemap.put("busSid",busSalesOrder.getSid()); + filemap.put("contractNo",busSalesOrder.getContractNo()); + ResultBean> mapResultBean = commonContractFeign.getModelMap(filemap); + checkMap = mapResultBean.getData(); } try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl index 63d3d961de..837d2ef6a4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl @@ -1280,7 +1280,7 @@ - + diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl index 63d3d961de..837d2ef6a4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl +++ b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/dai_existingvehicles_black.ftl @@ -1280,7 +1280,7 @@ - +