From cdcef170ffe59ab233f60afbb69ef52cdc6fb74a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 11 Oct 2023 11:19:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 8 +- .../FinBillApplicationDetailsVo.java | 8 +- .../FinBillApplicationDto.java | 8 +- .../api/finbillfile/FinAttachTypeEnum.java | 6 +- .../FinBillApplicationService.java | 64 ++++++++++ .../biz/finbillfile/FinBillFileMapper.java | 9 ++ .../biz/finbillfile/FinBillFileService.java | 12 ++ .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../advanceInvoice/AdvanceInvoiceDto.java | 8 +- .../advanceInvoice/AdvanceInvoiceInfoVo.java | 8 +- .../AppBusAdvanceGinvoiceapplyService.java | 112 +++++++++++++++++- 11 files changed, 230 insertions(+), 15 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index aa52ecd55f..b6975cf16d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2169,13 +2169,13 @@ public class BaseVehicleOutService extends MybatisBaseService finBillVehicles; // 开票车辆信息 @ApiModelProperty("开票挂车信息") private List finBillTrailers; // 开票挂车信息 - @ApiModelProperty("附件") + @ApiModelProperty("欠款承诺书(欠款人、担保人同签)") private List fjApplicationAppendxs; + @ApiModelProperty("公司股东会对外担保决议(公司担保)") + private List pcgsgdhdwdbjy; + @ApiModelProperty("责任人担保承诺书") + private List pczrrdbcns; + @ApiModelProperty("资方信审截图") + private List pczfxsjt; @ApiModelProperty("证件") private List zjApplicationAppendxs; // 证件 @ApiModelProperty("车辆买卖合同附件信息") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index db7dba9ec8..848d4f2dbc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -165,8 +165,14 @@ public class FinBillApplicationDto implements Dto { private List cldjhtApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("证件") private List zjApplicationAppendxs = new ArrayList<>(); - @ApiModelProperty("附件") + @ApiModelProperty("欠款承诺书(欠款人、担保人同签)") private List fjApplicationAppendxs = new ArrayList<>(); + @ApiModelProperty("公司股东会对外担保决议(公司担保)") + private List pcgsgdhdwdbjy = new ArrayList<>(); + @ApiModelProperty("责任人担保承诺书") + private List pczrrdbcns = new ArrayList<>(); + @ApiModelProperty("资方信审截图") + private List pczfxsjt = new ArrayList<>(); @ApiModelProperty("欠款领票附件") private List arrearsCollectionAppendxs = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java index df543e8a89..745c041aec 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java @@ -13,7 +13,11 @@ public enum FinAttachTypeEnum { ZJ("004", "证件"), FJ("005", "附件"), QKLPFJ("006", "欠款领票附件"), - CLMMHT("007", "车辆买卖合同"); + CLMMHT("007", "车辆买卖合同"), + GSGDHDWDBJY("008", "公司股东会对外担保决议"), + ZRRDBCNS("009", "责任人担保承诺书"), + ZFXSJT("010", "资方信审截图"), + ; /** * 附件类型 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 01dc60661e..3fe24a17b7 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 @@ -758,6 +758,27 @@ public class FinBillApplicationService extends MybatisBaseService pcgsgdhdwdbjy = finBillFileService.fetchgsgdhdwdbjyBySid(sid); + for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) { + String fileUrl = pcgsgdhdwdb.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + pcgsgdhdwdb.setFileUrl(fileUrl); + } + List pczrrdbcns = finBillFileService.fetchzrrdbcnsBySid(sid); + for (FinBillFileVo pczrrdbcn : pczrrdbcns) { + String fileUrl = pczrrdbcn.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + pczrrdbcn.setFileUrl(fileUrl); + } + List pczfxsjt = finBillFileService.fetchzfxsjtBySid(sid); + for (FinBillFileVo pczfxs : pczfxsjt) { + String fileUrl = pczfxs.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + pczfxs.setFileUrl(fileUrl); + } List arrearsCollectionAppendxs = finBillFileService.fetchqklpfjBySid(sid); for (FinBillFileVo arrearsCollectionAppendx : arrearsCollectionAppendxs) { String fileUrl = arrearsCollectionAppendx.getFileUrl(); @@ -771,6 +792,9 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailers = dto.getFinBillTrailers(); List finBillVehicles = dto.getFinBillVehicles(); List fjApplicationAppendxs = dto.getFjApplicationAppendxs(); + List pcgsgdhdwdbjy = dto.getPcgsgdhdwdbjy(); + List pczrrdbcns = dto.getPczrrdbcns(); + List pczfxsjt = dto.getPczfxsjt(); if (StringUtils.isBlank(dtoSid)) {//新增 if ("是".equals(dto.getIsLQOrigInvoice())) { return rb.setMsg("请选择未领取发票原件的申请"); @@ -2180,6 +2207,42 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.GSGDHDWDBJY.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } + if (pczrrdbcns.size() > 0) { + for (FinBillFileDto finBillFileDto : pczrrdbcns) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.ZRRDBCNS.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } + if (pczfxsjt.size() > 0) { + for (FinBillFileDto finBillFileDto : pczfxsjt) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.ZFXSJT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } return rb.success().setMsg("保存成功").setData(finBillApplication.getSid()); } FinBillApplication finBillApplication = fetchBySid(dtoSid); @@ -3755,6 +3818,7 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java index d4a64f143f..06152d0e08 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java @@ -96,4 +96,13 @@ public interface FinBillFileMapper extends BaseMapper { List fetchclmmhtBySid(String sid); List fetchFileByBillSid(@Param("sid") String sid); + + @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '008'") + List fetchgsgdhdwdbjyBySid(String sid); + + @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '009'") + List fetchzrrdbcnsBySid(String sid); + + @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '010'") + List fetchzfxsjtBySid(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index 6aeb138e39..526bd24406 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java @@ -177,4 +177,16 @@ public class FinBillFileService extends MybatisBaseService fetchclmmhtBySid(String sid) { return baseMapper.fetchclmmhtBySid(sid); } + + public List fetchgsgdhdwdbjyBySid(String sid) { + return baseMapper.fetchgsgdhdwdbjyBySid(sid); + } + + public List fetchzrrdbcnsBySid(String sid) { + return baseMapper.fetchzrrdbcnsBySid(sid); + } + + public List fetchzfxsjtBySid(String sid) { + return baseMapper.fetchzfxsjtBySid(sid); + } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index f1d0249b5c..31e50489e6 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -14,7 +14,7 @@ public enum ProcDefEnum { ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"), - FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:4:4505004"), + FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:5:5665004"), QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:2:5100004"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:5:4975008"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"), diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java index 35afd35fbc..d751a287fe 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java @@ -53,8 +53,14 @@ public class AdvanceInvoiceDto implements Dto { private String remarks; @ApiModelProperty("欠款开票挂车信息") private List finBillTrailers; - @ApiModelProperty("附件") + @ApiModelProperty("欠款承诺书(欠款人、担保人同签)") private List fjApplicationAppendxs; + @ApiModelProperty("公司股东会对外担保决议(公司担保)") + private List gsgdhdwdbjy; + @ApiModelProperty("责任人担保承诺书") + private List zrrdbcns; + @ApiModelProperty("资方信审截图") + private List zfxsjt; @ApiModelProperty("证件") private List idCardImages; @ApiModelProperty("车辆买卖合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index 5f6a43492d..dc6edf4010 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -58,8 +58,14 @@ public class AdvanceInvoiceInfoVo implements Vo { private String reasonRemarks; @ApiModelProperty("欠款开票挂车信息") private List finBillTrailers; - @ApiModelProperty("附件") + @ApiModelProperty("欠款承诺书(欠款人、担保人同签)") private List fjApplicationAppendxs; + @ApiModelProperty("公司股东会对外担保决议(公司担保)") + private List gsgdhdwdbjy; + @ApiModelProperty("责任人担保承诺书") + private List zrrdbcns; + @ApiModelProperty("资方信审截图") + private List zfxsjt; @ApiModelProperty("证件") private List idCardImages; @ApiModelProperty("车辆买卖合同") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index dc72395782..9d4e239285 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -406,7 +406,7 @@ public class AppBusAdvanceGinvoiceapplyService { } } vo.setFinBillTrailers(finBillTrailerVos); - //附件信息 + //《欠款承诺书》(欠款人、担保人同签) List fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs(); List fj = new ArrayList<>(); if (fjApplicationAppendxs != null) { @@ -415,6 +415,33 @@ public class AppBusAdvanceGinvoiceapplyService { } } vo.setFjApplicationAppendxs(fj); + //《公司股东会对外担保决议》(公司担保) + List pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy(); + List gsgdhdwdbjy = new ArrayList<>(); + if (pcgsgdhdwdbjy != null) { + for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) { + gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl()); + } + } + vo.setGsgdhdwdbjy(gsgdhdwdbjy); + //《责任人担保承诺书》 + List pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns(); + List zrrdbcns = new ArrayList<>(); + if (pczrrdbcns != null) { + for (FinBillFileVo pczrrdbcn : pczrrdbcns) { + zrrdbcns.add(pczrrdbcn.getFileUrl()); + } + } + vo.setZrrdbcns(zrrdbcns); + //资方信审截图 + List pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt(); + List zfxsjt = new ArrayList<>(); + if (pczfxsjt != null) { + for (FinBillFileVo pczfxs : pczfxsjt) { + zfxsjt.add(pczfxs.getFileUrl()); + } + } + vo.setZfxsjt(zfxsjt); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); @@ -610,8 +637,14 @@ public class AppBusAdvanceGinvoiceapplyService { } finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); //附件信息 - List fjApplicationAppendxs = dto.getFjApplicationAppendxs();//证件 - List fj = new ArrayList<>();//证件 + List fjApplicationAppendxs = dto.getFjApplicationAppendxs(); + List gsgdhdwdbjy = dto.getGsgdhdwdbjy(); + List zrrdbcns = dto.getZrrdbcns(); + List zfxsjt = dto.getZfxsjt(); + List fj = new ArrayList<>(); + List pcgsgdhdwdbjy = new ArrayList<>(); + List pczrrdbcns = new ArrayList<>(); + List pczfxsjt = new ArrayList<>(); if (fjApplicationAppendxs != null) { for (String fjApplicationAppendx : fjApplicationAppendxs) { FinBillFileDto finBillFileDto = new FinBillFileDto(); @@ -619,7 +652,31 @@ public class AppBusAdvanceGinvoiceapplyService { fj.add(finBillFileDto); } } + if (gsgdhdwdbjy != null) { + for (String gsgdhdwdb : gsgdhdwdbjy) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(gsgdhdwdb); + pcgsgdhdwdbjy.add(finBillFileDto); + } + } + if (zrrdbcns != null) { + for (String zrrdbcn : zrrdbcns) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(zrrdbcn); + pczrrdbcns.add(finBillFileDto); + } + } + if (zfxsjt != null) { + for (String zfxs : zfxsjt) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(zfxs); + pczfxsjt.add(finBillFileDto); + } + } finBillApplicationDto.setFjApplicationAppendxs(fj); + finBillApplicationDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy); + finBillApplicationDto.setPczrrdbcns(pczrrdbcns); + finBillApplicationDto.setPczfxsjt(pczfxsjt); ResultBean resultBean = finBillApplicationFeign.saveQKLP(finBillApplicationDto); return resultBean; } @@ -1404,22 +1461,67 @@ public class AppBusAdvanceGinvoiceapplyService { } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); if (finBillApplicationDetailsVo != null) { - //附件信息 + //《欠款承诺书》(欠款人、担保人同签) List fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs(); + //《公司股东会对外担保决议》(公司担保) + List pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy(); + //《责任人担保承诺书》 + List pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns(); + //资方信审截图 + List pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt(); List fj = new ArrayList<>(); + List gsgdhdwdbjy = new ArrayList<>(); + List zrrdbcns = new ArrayList<>(); + List zfxsjt = new ArrayList<>(); List itemEditTextInfos = new ArrayList<>(); if (fjApplicationAppendxs != null) { for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) { fj.add(fjApplicationAppendx.getFileUrl()); } ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); - itemEditTextInfo.setTitle("附件"); + itemEditTextInfo.setTitle("《欠款承诺书》(欠款人、担保人同签)"); itemEditTextInfo.setType(1); itemEditTextInfo.setNullAble(false); itemEditTextInfo.setKey("fjApplicationAppendxs"); itemEditTextInfo.setFilesPath(fj); itemEditTextInfos.add(itemEditTextInfo); } + if (pcgsgdhdwdbjy != null) { + for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) { + gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl()); + } + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("《公司股东会对外担保决议》(公司担保)"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(false); + itemEditTextInfo.setKey("gsgdhdwdbjy"); + itemEditTextInfo.setFilesPath(gsgdhdwdbjy); + itemEditTextInfos.add(itemEditTextInfo); + } + if (pczrrdbcns != null) { + for (FinBillFileVo pczrrdbcn : pczrrdbcns) { + zrrdbcns.add(pczrrdbcn.getFileUrl()); + } + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("《责任人担保承诺书》"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(false); + itemEditTextInfo.setKey("zrrdbcns"); + itemEditTextInfo.setFilesPath(zrrdbcns); + itemEditTextInfos.add(itemEditTextInfo); + } + if (pczfxsjt != null) { + for (FinBillFileVo pczfxs : pczfxsjt) { + zfxsjt.add(pczfxs.getFileUrl()); + } + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("资方信审截图"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(false); + itemEditTextInfo.setKey("zfxsjt"); + itemEditTextInfo.setFilesPath(zfxsjt); + itemEditTextInfos.add(itemEditTextInfo); + } qkkpFlowListVo.setList(itemEditTextInfos); } return rb.success().setData(qkkpFlowListVo); From 810ed1e3acd6b6e5c50651b2cf51868baa083cf5 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 11 Oct 2023 15:08:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busdelivered/BusDeliveredFeign.java | 33 +- .../BusDeliveredFeignFallback.java | 20 +- .../api/busdelivered/BusDeliveredPageVo2.java | 46 + .../api/busdelivered/UnDeliverQuery.java | 2 +- .../api/busdelivered/VinListVo2.java | 22 + .../busdeliveredapply/BusDeliveredApply.java | 4 + .../BusDeliveredApplyFeign.java | 41 +- .../BusDeliveredApplyFeignFallback.java | 40 + .../DeliveredDetailsVo2.java | 119 +++ .../biz/busdelivered/BusDeliveredMapper.java | 13 +- .../biz/busdelivered/BusDeliveredMapper.xml | 68 +- .../biz/busdelivered/BusDeliveredRest.java | 22 +- .../biz/busdelivered/BusDeliveredService.java | 499 +++++++++- .../BusDeliveredApplyMapper.xml | 2 +- .../BusDeliveredApplyRest.java | 45 + .../BusDeliveredApplyService.java | 856 ++++++++++++++++-- .../bussalesorder/BusSalesOrderService.java | 6 +- .../BusSalesOrderVehicleMapper.java | 1 + .../BusSalesOrderVehicleMapper.xml | 13 + .../BusSalesOrderVehicleService.java | 4 + .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../retrieval/AppBusDeliveredApplyFeign.java | 66 +- .../AppBusDeliveredApplyFeignFallback.java | 60 +- .../api/autoservice/retrieval/CarListVo2.java | 24 + .../retrieval/DeliveredApplyDto2.java | 87 ++ .../retrieval/DeliveredApplyPageVo2.java | 32 + .../retrieval/DeliveredDetailsVoQk2.java | 112 +++ .../retrieval/DeliveredPageVo2.java | 39 + .../api/autoservice/retrieval/VinListVo2.java | 20 + .../flowable/SubmitRetrievalDto2.java | 19 + .../retrieval/AppBusDeliveredApplyRest.java | 61 +- .../AppBusDeliveredApplyService.java | 156 +++- 32 files changed, 2401 insertions(+), 133 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredPageVo2.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/VinListVo2.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredDetailsVo2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVo2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageVo2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVoQk2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo2.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto2.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java index c8fa9e2641..d1589a261e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.busdelivered; +import com.yxt.anrui.buscenter.api.busdeliveredapply.DeliveredDetailsVo2; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -68,12 +69,7 @@ public interface BusDeliveredFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("可欠款出库车辆列表") - @PostMapping("/unListPage") - @ResponseBody - public ResultBean> unListPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") + /* @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody BusDeliveredDto dto); @@ -86,7 +82,7 @@ public interface BusDeliveredFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);*/ @ApiOperation("移动端-获取待出库列表") @PostMapping("/getRetrievalNotList") @@ -112,4 +108,27 @@ public interface BusDeliveredFeign { @GetMapping("/selectByBusVinSid") @ResponseBody ResultBean selectByBusVinSid(@RequestParam("busVinSid") String busVinSid); + + /********************************欠款出库***********************************************/ + + @ApiOperation("PC可欠款出库车辆列表") + @PostMapping("/unListPage") + @ResponseBody + public ResultBean> unListPage(@RequestBody PagerQuery pq); + + @ApiOperation("欠款出库初始化") + @PostMapping("/qkGetRetrievalApplyInfo") + @ResponseBody + public ResultBean qkGetRetrievalApplyInfo(@RequestBody AppDeliveredDetailsQuery query); + + @ApiOperation("欠款出库补充车辆返回") + @PostMapping("/qkSelectInfo") + @ResponseBody + ResultBean> qkSelectInfo(@RequestBody DeliverDetailsQuery query); + + @ApiOperation("移动端-可欠款出库") + @PostMapping("/getRetrievalNotListQk") + @ResponseBody + public ResultBean> getRetrievalNotListQk(@RequestBody PagerQuery pq); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java index eb25ed6a99..89f8da09b2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.busdelivered; +import com.yxt.anrui.buscenter.api.busdeliveredapply.DeliveredDetailsVo2; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -60,7 +61,7 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign { return null; } - @Override + /*@Override public ResultBean save(BusDeliveredDto dto){ return ResultBean.fireFail().setMsg("接口anrui-buscenter/busdelivered/save无法访问"); } @@ -74,7 +75,7 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign { public ResultBean fetchDetailsBySid(String sid){ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-buscenter/busdelivered/fetchDetailsBySid无法访问"); - } + }*/ @Override public ResultBean> getRetrievalNotList(PagerQuery pq) { @@ -86,6 +87,11 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign { return null; } + @Override + public ResultBean qkGetRetrievalApplyInfo(AppDeliveredDetailsQuery query) { + return null; + } + @Override public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) { return null; @@ -100,4 +106,14 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign { public ResultBean selectByBusVinSid(String busVinSid) { return null; } + + @Override + public ResultBean> qkSelectInfo(DeliverDetailsQuery query) { + return null; + } + + @Override + public ResultBean> getRetrievalNotListQk(PagerQuery pq) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredPageVo2.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredPageVo2.java new file mode 100644 index 0000000000..99ecd0b53f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredPageVo2.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.buscenter.api.busdelivered; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/10/11 + **/ +@Data +public class BusDeliveredPageVo2 { + + @ApiModelProperty("列表sid") + private String sid; + + @ApiModelProperty("合同编号") + @JsonProperty("contractId") + private String contractNo; + + @ApiModelProperty("业务状态") + @JsonProperty("subscription") + private String subscription; + + @ApiModelProperty("业务状态") + @JsonProperty("subscriptionKey") + private String subscriptionKey; + + @ApiModelProperty("销售类型") + @JsonProperty("paymentMethod") + private String paymentMethod; + + @ApiModelProperty("销售类型") + @JsonProperty("paymentMethodKey") + private String paymentMethodKey; + + @ApiModelProperty("客户名称") + @JsonProperty("customerName") + private String name; + + @ApiModelProperty("车架号集合") + private List vinList; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverQuery.java index 05b9b73eb6..4c5e45cb3f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/UnDeliverQuery.java @@ -25,5 +25,5 @@ public class UnDeliverQuery implements Query { @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("已选择的车辆") - private List list = new ArrayList<>(); + private List vinSid = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/VinListVo2.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/VinListVo2.java new file mode 100644 index 0000000000..7fbc4d00a6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/VinListVo2.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.buscenter.api.busdelivered; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/10/11 + **/ +@Data +public class VinListVo2 { + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; + @ApiModelProperty("业务状态") + private String businessState; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java index 24ba590bd2..60f8a026d3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java @@ -127,4 +127,8 @@ public class BusDeliveredApply extends BaseEntity { private String hasInvoice; @ApiModelProperty("类型：0正常出库，1欠款出库") private int typeState; + + private String promiseFile; + private String danFile; + private String carFile; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 9cc84d2650..f53db8f4fd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -175,7 +175,7 @@ public interface BusDeliveredApplyFeign { ResultBean deliveredFinSelectByBusVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid); /*******************************************欠款出库相关****************************************************/ - @ApiOperation("欠款出库申请分页列表") + @ApiOperation("PC欠款出库申请分页列表") @PostMapping("/unListPage") @ResponseBody public ResultBean> unListPage(@RequestBody PagerQuery pq); @@ -190,4 +190,43 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean submitUnDeliveredApply(@Valid @RequestBody SubmitUnDeliveredApplyDto dto); + @ApiOperation(value = "办理（同意）") + @PostMapping("/qkComplete") + @ResponseBody + public ResultBean qkComplete(@Valid @RequestBody BusDeliveredApplyCompleteDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/qkGetPreviousNodesForReject") + ResultBean> qkGetPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/qkGetNextNodesForSubmit") + ResultBean> qkGetNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/qkReject") + @ResponseBody + public ResultBean qkReject(@Valid @RequestBody BusDeliveredApplyTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/qkRevokeProcess") + @ResponseBody + public ResultBean qkRevokeProcess(@Valid @RequestBody BusDeliveredApplyTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/qkBreakProcess") + @ResponseBody + public ResultBean qkBreakProcess(@Valid @RequestBody BusDeliveredApplyTaskQuery query); + + @ApiOperation("移动端出库申请详情") + @GetMapping("/qkGetRetrievalApplyDetails") + @ResponseBody + public ResultBean qkGetRetrievalApplyDetails(@RequestParam("sid") String sid); + + @ApiOperation("移动端欠款出库分页") + @PostMapping("/getRetrievalApplyListQk") + @ResponseBody + public ResultBean> getRetrievalApplyListQk(@RequestBody PagerQuery pagerQuery); + + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index b0f55cb123..28780c178c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -146,6 +146,46 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean qkComplete(BusDeliveredApplyCompleteDto query) { + return null; + } + + @Override + public ResultBean> qkGetPreviousNodesForReject(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> qkGetNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean qkReject(BusDeliveredApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean qkRevokeProcess(BusDeliveredApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean qkBreakProcess(BusDeliveredApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean qkGetRetrievalApplyDetails(String sid) { + return null; + } + + @Override + public ResultBean> getRetrievalApplyListQk(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredDetailsVo2.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredDetailsVo2.java new file mode 100644 index 0000000000..8e4bb5b42f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredDetailsVo2.java @@ -0,0 +1,119 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo; +import com.yxt.anrui.buscenter.api.busdelivered.DeliveredLeavesVo; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/10/11 + **/ +@Data +public class DeliveredDetailsVo2 { + + @ApiModelProperty("合同编号") + private String contractId; + //销售类型 + private String paymentMethod; + private String paymentMethodKey; + @ApiModelProperty("APP发起信息:部门-人员名") + private String publishInfo; + @ApiModelProperty("销售部门") + private String staffDeptSid; + private String staffDeptName; + @ApiModelProperty("发起日期") + private String createTime; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("客户电话") + private String mobile; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("APP单车中介人1") + private String distributorName; + @ApiModelProperty("APP单车中介人2") + private String distributorNameTwo; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("主车成交价") + private String price; + @ApiModelProperty("实际购车人数据字典") + private List buyerType = new ArrayList<>(); + @ApiModelProperty("购车人类型key") + private String typeKey; + @ApiModelProperty("购车人类型值") + private String type; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("贷款人sid") + private String loanSid; + @ApiModelProperty("贷款人电话") + private String loanMobile; + @ApiModelProperty("总备注") + private String remarks; + @ApiModelProperty("优惠包剩余") + private List discountLeave = new ArrayList<>(); + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("记录sid") + private String sid; + @ApiModelProperty("orgPath") + private String orgPath; + @ApiModelProperty("车辆集合") + private List carList; + @ApiModelProperty(value = "实例id") + private String procInstId; + @ApiModelProperty(value = "任务id") + private String taskId; + + @ApiModelProperty("销售专员sid") + private String pcStaffSid; + @ApiModelProperty("PC发起人") + private String pcApplyName; + @ApiModelProperty("PC发起人sid") + private String pcApplySid; + @ApiModelProperty("PC发起人部门") + private String pcApplyDept; + @ApiModelProperty("PC发起人部门sid") + private String pcApplyDeptSid; + @ApiModelProperty("PC中介人1") + private String pcDistributorName; + @ApiModelProperty("PC服务费1") + private String pcDistributorPrice; + @ApiModelProperty("PC中介人2") + private String pcDistributorNameTwo; + @ApiModelProperty("PC服务费2") + private String pcDistributorPriceTwo; + @ApiModelProperty("PC服务费合计1") + private String pcDistributorPriceAll; + @ApiModelProperty("PC服务费合计2") + private String pcDistributorPriceTwoAll; + + @ApiModelProperty("销售订单sid") + private String busSalesOrderSid; + @ApiModelProperty("环节key") + private String taskDefKey; + @ApiModelProperty("是否显示贷款人选择") + private boolean showLoanUser; + + @ApiModelProperty("责任人担保承诺书") + private List promiseList = new ArrayList<>(); + + @ApiModelProperty("担保承诺书") + private List danFileList = new ArrayList<>(); + + @ApiModelProperty("车辆登记合同") + private List carFileList = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java index 6c8b425e81..f95684acfe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java @@ -91,7 +91,7 @@ public interface BusDeliveredMapper extends BaseMapper { int updateStateByContractNo(@Param("contractNo") String contractNo, @Param("list") List vinSidList, @Param("state") int i); - IPage selectListsVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectListsVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); BusDelivered getState(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid); @@ -99,10 +99,13 @@ public interface BusDeliveredMapper extends BaseMapper { List selectByState(); - IPage selectListsVoNew(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + IPage selectListsVoNew(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage getRetrievalNotLists(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("name") String name); - IPage getRetrievalNotListNew(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("name") String name); + IPage getRetrievalNotLists(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); - IPage unListPage(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + IPage getRetrievalNotListNew(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + + IPage unListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage getRetrievalNotListQk(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index 2624eafeba..0699d82d1f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -369,6 +369,45 @@ order by bo.contractNo desc--> + + + @@ -377,6 +416,15 @@ select="vinLists" column="contractNo"> + + + + + + + +