From b96d0b32e6d742d2b47a2ccc22d58de88e934ec8 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 10 Oct 2023 16:42:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=BB=8F?= =?UTF-8?q?=E9=94=80=E5=95=86=E5=A4=87=E6=A1=88=E5=8A=A0=E7=AD=BE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/api/autoservice/distributor/DistributorFeign.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java index 7c4fdfa8e5..ee9ce6b502 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java @@ -166,7 +166,7 @@ public interface DistributorFeign { ResultBean getFlowOperateTitle(@Valid @SpringQueryMap DistributorFlowableQuery query); @ApiOperation(value = "加签") - @PostMapping(value = "/delegate") + @PutMapping(value = "/delegate") @ResponseBody public ResultBean delegate(@RequestBody AppDistributorDelegateQuery appDistributorDelegateQuery); From a9df6ddb8789cd55510300a308a2fc4db6686397 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 10 Oct 2023 17:50:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehiclestate/BaseVehicleState.java | 2 +- .../BaseVehicleStateEnum.java | 5 ++ .../BaseVehicleStateService.java | 12 +++- .../FinBillApplicationService.java | 65 ++++++++++++++++++- 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java index 3c6bdcf918..aca7f8f122 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java @@ -35,7 +35,7 @@ public class BaseVehicleState extends BaseEntity { @ApiModelProperty("开票申请状态：未发起过0，审批通过的为1，审批不通过为改为0，审批中的为2，驳回或撤回到发起人修改为0，默认为0，提交时需要判断是否已发起开票申请流程") private String invoiceApplyState; @ApiModelProperty("资方终审：0未通过，1通过，贷款资方终审通过时设置为1") - private String manageState; + private String manageState; @ApiModelProperty("包牌业务") private String packageBusiness; @ApiModelProperty("合同状态") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java index 716735e7fe..6bc2ea8452 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java @@ -91,6 +91,11 @@ public class BaseVehicleStateEnum { JFZB("21","家访准备"), JFKC("22","家访考察"), JFZLSH("23","家访资料审核"), + KPSQTJ("24","开票申请提交"), + KPSQZZ("25","开票申请终止"), + KPSQTG("26","开票申请通过"), + KPSQBH("27","开票申请驳回"), + KPSQCH("28","开票申请撤回"), ; private String typeKey; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index e0a18c6552..b1537e33da 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -107,7 +107,17 @@ public class BaseVehicleStateService extends MybatisBaseService baseVehicleStateDtos = new ArrayList<>(); - baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); List finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); + //修改车辆表状态 + List baseVehicleStateDtos = new ArrayList<>(); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData(); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQTG.getTypeKey()); + baseVehicleStateDtos.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开 BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); @@ -1157,6 +1165,17 @@ public class FinBillApplicationService extends MybatisBaseService map = BeanUtil.beanToMap(ufVo); //更新业务中的流程相关的参数 updateFlowFiled(map); + //修改车辆表状态 + List baseVehicleStateDtos = new ArrayList<>(); + List finBillVehicleVos = finBillVehicleService.fetchByMainSid(businessSid); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData(); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQBH.getTypeKey()); + baseVehicleStateDtos.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); finBillApplication = fetchBySid(businessSid); try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() @@ -1213,6 +1232,17 @@ public class FinBillApplicationService extends MybatisBaseService baseVehicleStateDtos = new ArrayList<>(); + List finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid()); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData(); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQCH.getTypeKey()); + baseVehicleStateDtos.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); return rb.success().setData(resultBean.getData()); } } @@ -1246,6 +1276,17 @@ public class FinBillApplicationService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //修改车辆表状态 + List baseVehicleStateDtos = new ArrayList<>(); + List finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid()); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData(); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQZZ.getTypeKey()); + baseVehicleStateDtos.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); finBillVehicleService.updateByMainSid(finBillApplication.getSid()); return rb.success().setData(resultBean.getData()); } else { @@ -1258,6 +1299,17 @@ public class FinBillApplicationService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //修改车辆表状态 + List baseVehicleStateDtos = new ArrayList<>(); + List finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid()); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData(); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQZZ.getTypeKey()); + baseVehicleStateDtos.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); finBillVehicleService.updateByMainSid(finBillApplication.getSid()); return rb.success().setData(resultBean.getData()); } @@ -1356,6 +1408,15 @@ public class FinBillApplicationService extends MybatisBaseService baseVehicleStateDtos = new ArrayList<>(); + for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleDto.getVehSid()).getData(); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQTJ.getTypeKey()); + baseVehicleStateDtos.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); //极光推送 finBillApplication = fetchBySid(businessSid); try { From 996d147eb15cd71062e98afd5a3c53960267c64e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 10 Oct 2023 18:13:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicleout/BaseVehicleOutService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 456c9a734b..aa52ecd55f 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 Date: Wed, 11 Oct 2023 11:19:40 +0800 Subject: [PATCH 4/4] =?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);