From 1db4659c42242b430908b2e71d3bfedb232f54d9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 9 Oct 2023 15:53:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractDto.java | 2 +- .../FinBillApplicationDetailsVo.java | 2 + .../FinBillApplicationFeign.java | 5 ++ .../FinBillApplicationFeignFallback.java | 5 ++ .../api/finbillapplication/PcSelBillGcVo.java | 14 ++++ .../PcSelBillVinNoPageVo.java | 64 +++++++++++++++++ .../PcSelBillVinNoQuery.java | 63 +++++++++++++++++ .../FinBillApplicationMapper.java | 3 + .../FinBillApplicationMapper.xml | 31 +++++++++ .../FinBillApplicationRest.java | 7 ++ .../FinBillApplicationService.java | 68 +++++++++++++++++++ .../LoanHomevisitPrepService.java | 4 +- .../autoservice/invoiced/InvoicedService.java | 17 ++++- 13 files changed, 281 insertions(+), 4 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java index 1a68c165b5..07c28d5d94 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java @@ -60,7 +60,7 @@ public class BusSalesOrderLoancontractDto implements Dto { @ApiModelProperty("台数") private Integer vehCount; @ApiModelProperty("消贷合同编号") - private String loanCotractNo; + private String loanContractNo; @ApiModelProperty("资方合同号") private String bankContractNo; @ApiModelProperty("资方名称") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java index e81b2be615..eb680caee8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java @@ -158,6 +158,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple private String orgSidPath; @ApiModelProperty("是否显示价值客户") private Boolean showValueCustomer; + @ApiModelProperty("是否为单独新增") + private String showBtnStr; @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index 1abb596a19..cb41eb0bdb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -67,6 +67,11 @@ public interface FinBillApplicationFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("开票申请选择车辆") + @PostMapping("/getSelectVinsList") + @ResponseBody + public ResultBean> getSelectVinsList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("欠款开票分页列表") @PostMapping("/listPageQK") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index 0765725a00..8dfe14c2e4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -60,6 +60,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign return rb.setMsg("接口anrui-fin/finbillapplication/listPage无法访问"); } + @Override + public ResultBean> getSelectVinsList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> listPageQK(PagerQuery pq) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java new file mode 100644 index 0000000000..fa45e531cf --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PcSelBillGcVo implements Vo { + + @ApiModelProperty("主车车架号") + private String vinNo; + @ApiModelProperty("挂车车架号") + private String gcVinNo; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java new file mode 100644 index 0000000000..dc5a318ef6 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class PcSelBillVinNoPageVo implements Vo { + + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("发起人sid") + private String userSid; + @ApiModelProperty("发起人名称") + private String userName; + @ApiModelProperty("发起人部门sid") + private String deptSid; + @ApiModelProperty("发起人部门名称") + private String deptName; + @ApiModelProperty("发起日期") + private String applyDate; + @ApiModelProperty("销售订单sid") + private String busSalesOrderSid; + @ApiModelProperty("单台开票金额") + private String kpMoney; + @ApiModelProperty("销售类型key") + private String saleTypeKey; + @ApiModelProperty("销售类型") + private String saleType; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("销售人员sid") + private String staffSid; + @ApiModelProperty("销售人员") + private String sellerName; + @ApiModelProperty("销售部门sid") + private String staffDeptSid; + @ApiModelProperty("销售部门") + private String sellerDept; + @ApiModelProperty("开票单位") + private String invoicingUnit; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("合格证状态key") + private String certificateStateKey; + @ApiModelProperty("合格证状态value") + private String certificateState; + @ApiModelProperty("主车合格证图片") + private List zcHgzImages; + + @ApiModelProperty("挂车信息") + private List finBillTrailers; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java new file mode 100644 index 0000000000..1d7f4d2a24 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbillapplication; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerDto.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto
+ * Description: 开票挂车信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class PcSelBillVinNoQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("合同号") + private String contractId; + @ApiModelProperty("已选车架号") + private List vins; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("车架号") + private String vinNo; +} \ No newline at end of file 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 7d47bac467..c1a3be6e3b 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 @@ -60,6 +60,8 @@ public interface FinBillApplicationMapper extends BaseMapper IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage getSelectVinsList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from fin_bill_application") @@ -82,4 +84,5 @@ public interface FinBillApplicationMapper extends BaseMapper @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}") void updateZZ(String businessSid); + } \ 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 69b62e476c..c6a40e22a3 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 @@ -93,4 +93,35 @@ where qkkpBillNo = #{qkkpBillNo} ORDER BY createTime DESC LIMIT 1 + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java index 1bb4bc8497..047b94b9a7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java @@ -76,6 +76,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { return rb.success().setData(pv); } + @Override + public ResultBean> getSelectVinsList(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finBillApplicationService.getSelectVinsList(pq); + return rb.success().setData(pv); + } + @Override public ResultBean> listPageQK(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); 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 7c1f424da9..5fa31ecc42 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 @@ -388,6 +388,74 @@ public class FinBillApplicationService extends MybatisBaseService getSelectVinsList(PagerQuery pq) { + PcSelBillVinNoQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("bo.payTypeKey", "2"); + qw.eq("bs.busState", "401"); + qw.eq("bs.finState", "1"); + qw.eq("bs.carryInvoiceState", "0"); + qw.eq("bs.invoiceApplyState", "0"); + qw.eq("bo.useOrgSid", useOrgSid); + if (StringUtils.isNotBlank(query.getContractId())) { + qw.eq("bo.contractNo", query.getContractId()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("bo.customerName", query.getName()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.eq("bv.linkNo", query.getVinNo()); + } + if (query.getVins() != null && query.getVins().size() > 0) { + qw.notIn("bv.linkNo", query.getVins()); + } + //移动端条件 + if (StringUtils.isNotBlank(query.getName())) { + qw.and(wrapper -> wrapper.like("bo.contractNo", query.getName()).or().like("bo.customerName", query.getName())); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getSelectVinsList(page, qw); + for (PcSelBillVinNoPageVo record : pagging.getRecords()) { + //开票单位 + if (StringUtils.isNotBlank(record.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, record.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + record.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName()); + } + } + //主车合格证照片 + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(record.getVinSid()).getData(); + if (baseVehicleCertificateVo != null) { + List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + record.setZcHgzImages(clhgeImages); + } + //挂车信息 + TraliveredVo data = baseTrailerFeign.trailerList(record.getVinSid(), record.getContractId()).getData(); + List list = data.getList(); + List pcSelBillGcVos = new ArrayList<>(); + if (list != null && list.size() > 0){ + for (TrailerVo trailerVo : list) { + PcSelBillGcVo pcSelBillGcVo = new PcSelBillGcVo(); + pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo()); + pcSelBillGcVo.setVinNo(data.getVinNo()); + pcSelBillGcVos.add(pcSelBillGcVo); + } + } + record.setFinBillTrailers(pcSelBillGcVos); + record.setUserSid(query.getUserSid()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + record.setUserName(sysUserVo.getName()); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); + record.setDeptSid(sysOrganizationVo.getSid()); + record.setDeptName(sysOrganizationVo.getName()); + record.setApplyDate(DateUtil.formatDate(new Date())); + record.setUseOrgSid(useOrgSid); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean saveOrUpdateDto(FinBillApplicationDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index 0ed3f2c9e5..65df92309a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -243,7 +243,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService> getSelectVinsList(PagerQuery pagerQuery) { - return null; + ResultBean> rb = ResultBean.fireFail(); + SelBillVinNoQuery params = pagerQuery.getParams(); + FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery(); + finBillApplicationQuery.setCreateBySid(params.getUserSid()); + finBillApplicationQuery.setName(params.getName()); + finBillApplicationQuery.setOrgPath(params.getOrgPath()); + //finBillApplicationQuery.setType(params.getType()); + //finBillApplicationQuery.setMenuSid(params.getMenuSid()); + PagerQuery pcq = new PagerQuery<>(); + pcq.setParams(finBillApplicationQuery); + ResultBean> resultBean = finBillApplicationFeign.listPage(pcq); + List records = resultBean.getData().getRecords(); + List billApplicationPageVos = new ArrayList<>(); + PagerVo v = new PagerVo<>(); + v.setRecords(billApplicationPageVos); + return rb.success().setData(v); } public ResultBean getInvoicedApply(BillApplicationPageInfoQuery query) {