diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 7be4f6fbba..f4ee8c02e3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -521,8 +521,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto); if (!resultBean1.getSuccess()) { return rb.setMsg("验车业务模块的数据推送失败!"); @@ -569,14 +567,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService { @@ -144,11 +145,9 @@ public class BusBillApplicationService extends MybatisBaseService map = new HashMap<>(); Map carMap = new HashMap<>(); Map filemap = new HashMap<>(); @@ -782,7 +778,7 @@ public class BusBillApplicationService extends MybatisBaseService map) { String ftl = "dai_existingvehicles_black"; @@ -843,4 +839,257 @@ public class BusBillApplicationService extends MybatisBaseService filesList = new ArrayList<>(); + //根据合同号查询销售订单数据 + BusSalesOrder busSalesOrder = baseMapper.selectByContract(contractNo); + SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData(); + if ("1".equals(busSalesOrder.getPayTypeKey()) || ("2".equals(busSalesOrder.getPayTypeKey()) && StringUtils.isNotBlank(loanSolutions.getTypeKey()))) { + List finBillVehicles = dto.getFinBillVehicles(); + BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid()); + BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid()); + //按开票名称sid分组 + Map> groupedByOpenTickSid = finBillVehicles.stream() + .collect(Collectors.groupingBy(BusBillVehicleDto::getOpenTickSid)); + //遍历分组并组装每组的数据 + groupedByOpenTickSid.forEach((openTickSid, sameOpenTickSidList) -> { + Map map = new HashMap<>(); + Map carMap = new HashMap<>(); + Map filemap = new HashMap<>(); + Map checkMap = new HashMap<>(); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(openTickSid).getData(); + if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) { + BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0); + //生成开票申请书 + if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } + map.put("contractNo", busSalesOrder.getContractNo()); + List list = new ArrayList<>(); + + BillFileVo billFileVo = new BillFileVo(); + if (busSalesOrderModel != null) { + billFileVo.setCarName(busSalesOrderModel.getModelName()); + billFileVo.setNum(String.valueOf(sameOpenTickSidList.size())); + billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); + } + if (loanSolutions != null) { + if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) { + billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount()); + } + } + billFileVo.setType(finBillVehicleDto.getBillTypeValue());//开票类型 + list.add(billFileVo); + + List lllList = new ArrayList<>(); + sameOpenTickSidList.forEach(v -> { + List finBillTrailers = dto.getFinBillTrailers(); + finBillTrailers.removeAll(Collections.singleton(null)); + finBillTrailers = finBillTrailers.stream().filter(vv -> vv.getVinNo().contains(v.getVinNo())).collect(Collectors.toList()); + lllList.addAll(finBillTrailers); + }); + Map carNameMap = new HashMap<>(); + if (!lllList.isEmpty()) { + for (int i = 0; i < lllList.size(); i++) { + BusBillTrailerDto finBillTrailerDto = lllList.get(i); + billFileVo = new BillFileVo(); + BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo()); + if (baseTrailer != null) { + BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid()); + if (baseTrailerModel != null) { + String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue(); + if (carNameMap.containsKey(carName)) { + carNameMap.put(carName, Integer.parseInt(carNameMap.get(carName).toString()) + 1); + continue; + } else { + billFileVo.setType(busSalesOrder.getBillingType()); + if (loanSolutions != null) { + if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) { + billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount()); + } + } + billFileVo.setCarName(carName); + if (busSalesOrderModel != null) { + billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); + } + carNameMap.put(carName, 1); + list.add(billFileVo); + } + } + } + } + } + if (!list.isEmpty()) { + for (int i = 0; i < list.size(); i++) { + BillFileVo billFileVo1 = list.get(i); + String carName = billFileVo1.getCarName(); + if (carNameMap.containsKey(carName)) { + billFileVo1.setNum(carNameMap.get(carName).toString()); + } + } + } + map.put("list", list); + map.put("name", finBillVehicleDto.getOpenTickName()); + String date = DateUtil.today(); + List dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + if (!"02".equals(finBillVehicleDto.getBillTypeKey())) { + if (finCompanyInvoicingDetailsVo != null) { + //生成车辆登记合同 + if (busSalesOrder != null) { + carMap.put("Yf", busSalesOrder.getCustomerName()); + carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 + } + carMap.put("contractNo", "D" + map.get("contractNo")); + if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } + carMap.put("date", date); + List carContractListVos = new ArrayList<>(); + for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) { + CarContractListVo carContractListVo = new CarContractListVo(); + BaseVehicle baseVehicle = baseMapper.selectByVinSid(salesOrderVehicle.getVehSid()); + carContractListVo.setBrand(baseVehicle.getModelName()); + carContractListVo.setVinNo(baseVehicle.getVinNo()); + carContractListVo.setEnginNo(baseVehicle.getEngineNo()); + carContractListVos.add(carContractListVo); + } + carMap.put("carLists", carContractListVos); + } + } + } + if (loanSolutions != null) { + if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) { + String remarks = ""; + String date = DateUtil.today(); + List 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());//开票类型 + remarks = "数量" + finBillVehicles.size() + "台，单台成交价： 元。"; + filemap.put("remarks", remarks); + filemap.put("busSid", busSalesOrder.getSid()); + ResultBean> mapResultBean = commonContractFeign.getModelMap(filemap); + checkMap = mapResultBean.getData(); + //生成新车空白合同 + checkMap.put("totalPrice", ""); + checkMap.put("priceRemarks", ""); + checkMap.put("depositTotal", ""); + checkMap.put("createOrgName", ""); + checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey()); + } + } + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(1, 2, + 1000, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + + if (!map.isEmpty()) { + Future future1 = pool.submit(() -> { + return getInvoiceApplyFile(map); + }); + if (StringUtils.isNotBlank(future1.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); + filesList.add(file); + } + } + if (!carMap.isEmpty()) { + Future future2 = pool.submit(() -> { + return getCarFile(carMap); + }); + if (StringUtils.isNotBlank(future2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); + filesList.add(file); + } + } + if("1".equals(busSalesOrder.getPayTypeKey())){ + Map finalCheckMap = checkMap; + if (!finalCheckMap.isEmpty()) { + Future future3 = pool.submit(() -> { + return blackFile(finalCheckMap); + }); + if (StringUtils.isNotBlank(future3.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future3.get()); + filesList.add(file); + } + } + } + + + } catch (Exception e) { + e.printStackTrace(); + log.error("生成文件失败：==========================" + e.getMessage()); + } + + }); + if (filesList.size() > 0) { + String typeName = contractNo + "开票附件.pdf"; + try { + File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); + } catch (Exception e) { + e.printStackTrace(); + } + System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName); + fileUrl = typeName; + } + } + if(StringUtils.isNotBlank(fileUrl)){ + BusBillApplication finBillApplication = fetchBySid(dto.getSid()); + finBillApplication.setFileUrl(fileUrl); + baseMapper.updateById(finBillApplication); + } + return fileUrl; + } + + public void createContractNo(BusBillApplicationDto dto){ + /* try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(1, 2, + 1000, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + String fileUrl = getFileUrl(dto); + }); + } catch (Exception e) { + e.printStackTrace(); + log.error("生成文件失败：==========================" + e.getMessage()); + }*/ + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java index 89aeaafcf8..6fc7e7f946 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java @@ -76,6 +76,10 @@ public class BillApplicationIInfoVoss { private String billNo; @ApiModelProperty("是否可以编辑开票价") private Boolean isCanEdit; + @ApiModelProperty("不可修改类型和名称") + private Boolean noEditInvoiceTypeAndName; + @ApiModelProperty("不可修改开票金额") + private Boolean noEditInvoiceMoney; @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillFileVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillFileVo.java index bf834c1b92..57d347e3a3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillFileVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillFileVo.java @@ -20,4 +20,5 @@ public class BillFileVo { private String openPrice; @ApiModelProperty("发票类型") private String type; + private String vinNo; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java index 014fd5a086..5d025c613a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java @@ -118,4 +118,6 @@ public interface FinBillApplicationMapper extends BaseMapper BaseVehicle selectByVinSid(String vehSid); CrmCustomerTemp selectByCustomerSid(String openTickSid); + + BaseVehicle selectVinNoByVinSid(String vehSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 64e8eccd78..49c7665c5e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -219,4 +219,8 @@ + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index b81bb6c8c5..d39952a9ae 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -84,6 +84,7 @@ import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApply; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; @@ -110,6 +111,12 @@ import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerFeign; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFile; +import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo; +import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; @@ -125,6 +132,7 @@ import com.yxt.messagecenter.api.message.*; import com.yxt.messagecenter.api.messagelist.MessageList; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -139,6 +147,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; +import static java.util.Collections.singletonList; import static java.util.Comparator.comparing; /** @@ -212,6 +221,12 @@ public class FinBillApplicationService extends MybatisBaseService list = new ArrayList<>(); - + //====================================主车开始 BillFileVo billFileVo = new BillFileVo(); if (busSalesOrderModel != null) { billFileVo.setCarName(busSalesOrderModel.getModelName()); billFileVo.setNum(String.valueOf(sameOpenTickSidList.size())); billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); } - if (loanSolutions != null) { + /* if (loanSolutions != null) { if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) { billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount()); } - } + }*/ + billFileVo.setOpenPrice(dto.getOneBillMoney()); billFileVo.setType(finBillVehicleDto.getBillTypeValue());//开票类型 - list.add(billFileVo); - + List vinNoString = new ArrayList<>(); List lllList = new ArrayList<>(); + BillFileVo finalBillFileVo = billFileVo; sameOpenTickSidList.forEach(v -> { + //车架号 + BaseVehicle baseVehicle = baseMapper.selectVinNoByVinSid(v.getVehSid()); + /* if(baseVehicle != null){ + vinNoString.add(baseVehicle.getVinNo()); + }*/ List finBillTrailers = dto.getFinBillTrailers(); finBillTrailers.removeAll(Collections.singleton(null)); finBillTrailers = finBillTrailers.stream().filter(vv -> vv.getVinNo().contains(v.getVinNo())).collect(Collectors.toList()); lllList.addAll(finBillTrailers); + /* String vinNo = String.join(",",vinNoString); + billFileVo.setVinNo(vinNo);*/ + list.add(finalBillFileVo); }); + + //==========================主车结束 Map carNameMap = new HashMap<>(); if (!lllList.isEmpty()) { for (int i = 0; i < lllList.size(); i++) { + List trailerVinString = new ArrayList<>(); FinBillTrailerDto finBillTrailerDto = lllList.get(i); billFileVo = new BillFileVo(); BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo()); @@ -751,36 +778,42 @@ public class FinBillApplicationService extends MybatisBaseService ssList = castList(carNameMap.get(carName),String.class); + String trailerVinNo = String.join(",",ssList); + billFileVo1.setOpenPrice(Arrays.asList(carName.split("#")).get(1)); + billFileVo1.setCarName(Arrays.asList(carName.split("#")).get(0)); + billFileVo1.setVinNo(trailerVinNo); } } - } + }*/ map.put("list", list); map.put("name", finBillVehicleDto.getOpenTickName()); String date = DateUtil.today(); @@ -791,7 +824,8 @@ public class FinBillApplicationService 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());//户籍地址 + + if("1".equals(busSalesOrder.getPayTypeKey())){ + if (loanSolutions != null) { + if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) { + String remarks = ""; + String date = DateUtil.today(); + List 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());//开票类型 + remarks = "数量" + finBillVehicles.size() + "台，单台成交价： 元。"; + filemap.put("remarks", remarks); + filemap.put("busSid", busSalesOrder.getSid()); + ResultBean> mapResultBean = commonContractFeign.getModelMap(filemap); + checkMap = mapResultBean.getData(); + //生成新车空白合同 + checkMap.put("totalPrice", ""); + checkMap.put("priceRemarks", ""); + checkMap.put("depositTotal", ""); + checkMap.put("createOrgName", ""); + checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey()); } - filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型 - remarks = "数量" + finBillVehicles.size() + "台，单台成交价： 元。"; - filemap.put("remarks", remarks); - filemap.put("busSid", busSalesOrder.getSid()); - ResultBean> mapResultBean = commonContractFeign.getModelMap(filemap); - checkMap = mapResultBean.getData(); - //生成新车空白合同 - checkMap.put("totalPrice", ""); - checkMap.put("priceRemarks", ""); - checkMap.put("depositTotal", ""); - checkMap.put("createOrgName", ""); - checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey()); } } try { @@ -916,7 +953,11 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); String contractNo = entity.getContractNo(); - BigDecimal oneBillMoney = entity.getOneBillMoney(); + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); + SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData(); + BigDecimal oneBillMoney; + /*if ("2".equals(entity.getSaleTypeKey())){ + oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()); + entity.setOneBillMoney(oneBillMoney); + entity.setTotalBillMoney(oneBillMoney.multiply(new BigDecimal(finBillVehicleVos.size()))); + entity.setOpenTickTypeKey(busSalesOrder.getBillingTypeKey()); + entity.setOpenTickTypeValue(busSalesOrder.getBillingType()); + }else { + oneBillMoney = entity.getOneBillMoney(); + if (oneBillMoney != null) { + entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size()))); + } + }*/ + oneBillMoney = entity.getOneBillMoney(); if (oneBillMoney != null) { entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size()))); } FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); BeanUtil.copyProperties(entity, vo); - BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); vo.setBusSalesOrderSid(busSalesOrder.getSid()); if (finBillVehicleVos != null) { for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { @@ -1027,6 +1078,29 @@ public class FinBillApplicationService extends MybatisBaseService clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); finBillVehicleVo.setCertificatePhoto(clhgeImages); } + /*BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractNo, finBillVehicleVo.getVehSid()).getData(); + if ("2".equals(entity.getSaleTypeKey())){ + if ("01".equals(busSalesOrder.getFinancePlan())){//担保 + String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData(); + LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData(); + finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey()); + finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType()); + if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){ + finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName()); + }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){ + finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()); + } + }else if ("02".equals(busSalesOrder.getFinancePlan())){//非担保 + LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData(); + finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey()); + finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType()); + if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){ + finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName()); + }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){ + finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()); + } + } + }*/ } } vo.setFinBillVehicles(finBillVehicleVos); @@ -2338,11 +2412,9 @@ public class FinBillApplicationService extends MybatisBaseService 0) { @@ -5084,14 +5157,36 @@ public class FinBillApplicationService extends MybatisBaseService selectByContractNo(String contractId, List vins) { ResultBean rb = ResultBean.fireFail(); - BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss(); + BillApplicationIInfoVoss billApplicationIInfoVoss; BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId); + SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData(); billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId); - if ("1".equals(busSalesOrder.getPayTypeKey())) { + BigDecimal oneBillMoney; + if ("2".equals(busSalesOrder.getPayTypeKey())){ + oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()); + billApplicationIInfoVoss.setInvoiceMoney(oneBillMoney.toString()); + billApplicationIInfoVoss.setInvoiceTotal(oneBillMoney.multiply(new BigDecimal(vins.size())).toString()); + billApplicationIInfoVoss.setOpenTickTypeKey(busSalesOrder.getBillingTypeKey()); + billApplicationIInfoVoss.setOpenTickTypeValue(busSalesOrder.getBillingType()); + billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(true); + billApplicationIInfoVoss.setNoEditInvoiceMoney(true); + }else { + oneBillMoney = busSalesOrder.getOneBillMoney(); + if (oneBillMoney != null) { + billApplicationIInfoVoss.setInvoiceMoney(oneBillMoney.toString()); + billApplicationIInfoVoss.setInvoiceTotal(oneBillMoney.multiply(new BigDecimal(vins.size())).toString()); + billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(false); + billApplicationIInfoVoss.setNoEditInvoiceMoney(true); + }else { + billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(false); + billApplicationIInfoVoss.setNoEditInvoiceMoney(false); + } + } + /*if ("1".equals(busSalesOrder.getPayTypeKey())) { billApplicationIInfoVoss.setIsCanEdit(true); } else { billApplicationIInfoVoss.setIsCanEdit(false); - } + }*/ //开票单位 if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); @@ -5102,7 +5197,7 @@ public class FinBillApplicationService extends MybatisBaseService vinListVos = new ArrayList<>(); List pcSelBillGcVos = new ArrayList<>(); for (int i = 0; i < vins.size(); i++) { - VinListVos vinListVos1 = new VinListVos(); + VinListVos vinListVos1; vinListVos1 = baseMapper.selectByBus(contractId, vins.get(i)); //主车合格证照片 BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vins.get(i)).getData(); @@ -5121,6 +5216,30 @@ public class FinBillApplicationService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + String fileUrl = getFileUrl(dto); + }); + } catch (Exception e) { + e.printStackTrace(); + log.error("生成文件失败：==========================" + e.getMessage()); + }*/ + } + + public List castList(Object obj, Class clazz){ + List result = new ArrayList<>(); + if(obj instanceof List){ + for (Object o : (List) obj){ + result.add(clazz.cast(o)); + } + return result; + } + return new ArrayList<>(); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/invoiceApply.ftl b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/invoiceApply.ftl index b0c8d38a94..9ed854be92 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/ftl/invoiceApply.ftl +++ b/anrui-fin/anrui-fin-biz/src/main/resources/ftl/invoiceApply.ftl @@ -998,7 +998,7 @@ - 数量 + 车架号 @@ -1194,7 +1194,7 @@ - ${car.num!} + ${car.vinNo!} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index cd09974591..be0f4db9a5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -222,4 +222,9 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/selIsCompanyBuy") @ResponseBody ResultBean selIsCompanyBuy(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid); + + @ApiOperation("根据销售订单sid和贷款人sid查询家访考察sid") + @PostMapping("/selSaleOrderSidAndBorrSid") + @ResponseBody + ResultBean selSaleOrderSidAndBorrSid(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index fb016b494f..15a245df93 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -215,4 +215,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean selIsCompanyBuy(String orderSid, String borrowerSid) { return null; } + + @Override + public ResultBean selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java index dccfa1112f..691595baf9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java @@ -27,4 +27,9 @@ public class LoanNoGuaranteeCreditReviewFallback implements LoanNoGuaranteeCredi public ResultBean rePush(String salesOrderSid) { return null; } + + @Override + public ResultBean selByBorrSid(String borrowerSid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java index f14f6c936f..5c65100214 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java @@ -41,4 +41,7 @@ public interface LoanNoGuaranteeCreditReviewFeign { @PostMapping("/rePush") public ResultBean rePush(@RequestParam("salesOrderSid") String salesOrderSid); + @ApiOperation("根据贷款人sid查询") + @PostMapping("/selByBorrSid") + ResultBean selByBorrSid(@RequestParam("borrowerSid") String borrowerSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java index 4f506be9e6..9d36639b88 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java @@ -658,6 +658,7 @@ public class LoanCustomerRecordService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } return rb.success().setData(resultBean.getData()); } else { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index ad85e307e2..a8e11b3385 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -95,4 +95,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper selIsCompanyBuy(String orderSid, String borrowerSid) { return loanHomevisitInvestigateService.selIsCompanyBuy(orderSid,borrowerSid); } + + @Override + public ResultBean selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { + return loanHomevisitInvestigateService.selSaleOrderSidAndBorrSid(orderSid,borrowerSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 0ef0dcf7bb..8c11a93a4c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -2111,4 +2111,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { + ResultBean rb = ResultBean.fireFail(); + String sid = baseMapper.selSaleOrderSidAndBorrSid(orderSid,borrowerSid); + return rb.success().setData(sid); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java index d0f27b249a..6cc4c348d9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview; +import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; import org.apache.ibatis.annotations.Mapper; @@ -25,4 +26,7 @@ public interface LoanNoGuaranteeCreditReviewMapper extends BaseMapper selByBorrSid(String borrowerSid) { + return loanNoGuaranteeCreditReviewService.selByBorrSid(borrowerSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java index d4e6963a1f..82bf6fe139 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java @@ -324,4 +324,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService selByBorrSid(String borrowerSid) { + ResultBean rb = ResultBean.fireFail(); + LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = baseMapper.selByBorrSid(borrowerSid); + return rb.success().setData(loanNoGuaranteeCreditReviewDetailsVo); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 219f135849..cc974981e8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -213,6 +213,17 @@ public class InvoicedService { } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); + /*if ("2".equals(finBillApplicationDetailsVo.getSaleTypeKey())){ + vo.setNoEditInvoiceTypeAndName(true); + vo.setNoEditInvoiceMoney(true); + }else if ("1".equals(finBillApplicationDetailsVo.getSaleTypeKey())){ + vo.setNoEditInvoiceTypeAndName(false); + if (finBillApplicationDetailsVo.getOneBillMoney() != null){ + vo.setNoEditInvoiceMoney(true); + }else { + vo.setNoEditInvoiceMoney(false); + } + }*/ vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid()); vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney()); vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java index 0dd5ae1b2f..80aabbab04 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java @@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -76,7 +77,7 @@ public class AsServiceSubjectRest{ } @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); asServiceSubjectService.delBySids(sids);