From f1139e5d446f0a808d48a7dea329072d04c3a9b6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 6 May 2023 11:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/GetNodeQuery.java | 3 - .../BusArrearsCarryVehicleApplyService.java | 75 ++++++++------- ...AppBusArrearsCarryVehicleApplyService.java | 93 ++++++++++--------- 3 files changed, 89 insertions(+), 82 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java index 0a5236d73a..44023a44c3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java @@ -15,7 +15,4 @@ public class GetNodeQuery implements Query { private String taskDefKey; private String businessSid; - -// @ApiModelProperty(value = "分支字段及业务字段") -// private Map formVariables; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 5890160aac..79ddeaecbc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -602,6 +602,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carContract = query.getCarContract(); - if (carContract.isEmpty()) { - return rb.setMsg("请上传车辆买卖合同"); - } else { - String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - busArrearsCarryVehicleApply.setCarContractFile(carContractImages); - } - List guaranteeLetter = query.getGuaranteeLetter(); - if (guaranteeLetter.isEmpty()) { - return rb.setMsg("请上传欠款提车担保承诺书"); - } else { - String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages); - } - List gdLetter = query.getGdLetter(); - if (!gdLetter.isEmpty()) { - String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages); - } - List zjlLetter = query.getZjlLetter(); - if (zjlLetter.isEmpty()) { - return rb.setMsg("请上传总经理担保书"); - } else { - String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages); + + if ("Activity_0tieuz3".equals(query.getTaskDefKey())) { + //销售内勤审批 + List carContract = query.getCarContract(); + if (carContract.isEmpty()) { + return rb.setMsg("请上传车辆买卖合同"); + } else { + String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setCarContractFile(carContractImages); + } + List guaranteeLetter = query.getGuaranteeLetter(); + if (guaranteeLetter.isEmpty()) { + return rb.setMsg("请上传欠款提车担保承诺书"); + } else { + String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages); + } + List gdLetter = query.getGdLetter(); + if (!gdLetter.isEmpty()) { + String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages); + } + List zjlLetter = query.getZjlLetter(); + if (zjlLetter.isEmpty()) { + return rb.setMsg("请上传总经理担保书"); + } else { + String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages); + } } - List fileList = query.getFileList(); - if (fileList.isEmpty()) { - return rb.setMsg("请上传其他附件"); - } else { - String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - busArrearsCarryVehicleApply.setOtherFile(fileLists); + if("Activity_0ynxtyz".equals(query.getTaskDefKey())){ + //销售经理信审截图 + List fileList = query.getFileList(); + if (fileList.isEmpty()) { + return rb.setMsg("请上传其他附件"); + } else { + String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setOtherFile(fileLists); + } } baseMapper.updateById(busArrearsCarryVehicleApply); BusinessVariables bv = new BusinessVariables(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index 410e148db7..58f28b3352 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -301,49 +301,56 @@ public class AppBusArrearsCarryVehicleApplyService { AdvanceArrearsInfoVo advanceArrearsInfoVo = details.getData(); if (advanceArrearsInfoVo != null) { ArrearVo arrearVo = new ArrearVo(); - arrearVo.setTitle("车辆买卖合同（欠款）"); - arrearVo.setType(1); - arrearVo.setKey("carContract"); - arrearVo.setNullAble(false); - List carContract = advanceArrearsInfoVo.getCarContract(); - arrearVo.setFilesPath(carContract); - list.add(arrearVo); - //================================================= - arrearVo = new ArrearVo(); - arrearVo.setTitle("欠款提车担保承诺书"); - arrearVo.setType(1); - arrearVo.setKey("guaranteeLetter"); - arrearVo.setNullAble(false); - List guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter(); - arrearVo.setFilesPath(guaranteeLetter); - list.add(arrearVo); - //================================================= - arrearVo = new ArrearVo(); - arrearVo.setTitle("股东会对外担保决议"); - arrearVo.setType(1); - arrearVo.setKey("gdLetter"); - arrearVo.setNullAble(true); - List gdLetter = advanceArrearsInfoVo.getGdLetter(); - arrearVo.setFilesPath(gdLetter); - list.add(arrearVo); - //================================================= - arrearVo = new ArrearVo(); - arrearVo.setTitle("总经理担保书"); - arrearVo.setType(1); - arrearVo.setKey("zjlLetter"); - arrearVo.setNullAble(false); - List zjlLetter = advanceArrearsInfoVo.getZjlLetter(); - arrearVo.setFilesPath(zjlLetter); - list.add(arrearVo); - arrearVo = new ArrearVo(); - arrearVo.setTitle("其他附件"); - arrearVo.setType(1); - arrearVo.setKey("fileList"); - arrearVo.setNullAble(false); - List fileList = advanceArrearsInfoVo.getFileList(); - arrearVo.setFilesPath(fileList); - list.add(arrearVo); - arrearsVo.setList(list); + if ("Activity_0tieuz3".equals(query.getTaskDefKey())) { + //销售内勤审批 + arrearVo.setTitle("车辆买卖合同（欠款）"); + arrearVo.setType(1); + arrearVo.setKey("carContract"); + arrearVo.setNullAble(false); + List carContract = advanceArrearsInfoVo.getCarContract(); + arrearVo.setFilesPath(carContract); + list.add(arrearVo); + //================================================= + arrearVo = new ArrearVo(); + arrearVo.setTitle("欠款提车担保承诺书"); + arrearVo.setType(1); + arrearVo.setKey("guaranteeLetter"); + arrearVo.setNullAble(false); + List guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter(); + arrearVo.setFilesPath(guaranteeLetter); + list.add(arrearVo); + //================================================= + arrearVo = new ArrearVo(); + arrearVo.setTitle("股东会对外担保决议"); + arrearVo.setType(1); + arrearVo.setKey("gdLetter"); + arrearVo.setNullAble(true); + List gdLetter = advanceArrearsInfoVo.getGdLetter(); + arrearVo.setFilesPath(gdLetter); + list.add(arrearVo); + //================================================= + arrearVo = new ArrearVo(); + arrearVo.setTitle("总经理担保书"); + arrearVo.setType(1); + arrearVo.setKey("zjlLetter"); + arrearVo.setNullAble(false); + List zjlLetter = advanceArrearsInfoVo.getZjlLetter(); + arrearVo.setFilesPath(zjlLetter); + list.add(arrearVo); + } + if ("Activity_0ynxtyz".equals(query.getTaskDefKey())) { + //销售经理信审截图 + arrearVo = new ArrearVo(); + arrearVo.setTitle("其他附件"); + arrearVo.setType(1); + arrearVo.setKey("fileList"); + arrearVo.setNullAble(false); + List fileList = advanceArrearsInfoVo.getFileList(); + arrearVo.setFilesPath(fileList); + list.add(arrearVo); + arrearsVo.setList(list); + } + } return rb.success().setData(arrearsVo); }