From 3006a22173c5cd5fde649d9b403a171d6ec30fab Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 5 May 2023 17:47:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/commoncontract/CommonContractService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index f045887fd1..df46fb7af0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2620,8 +2620,10 @@ public class CommonContractService extends MybatisBaseService qw = new QueryWrapper<>(); - qw.eq("staffSid",params.getStaffSid()); - qw.eq("orgSid",params.getDeptSid()); + ResultBean> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(),params.getOrgPath()); + if(!busList.getData().isEmpty()){ + qw.in("busSid",busList.getData()); + } if (StringUtils.isNotBlank(params.getCustomerName())){ qw.like("partyB",params.getCustomerName()); } From 7a7465cd77ae5467653ad8ccc4efa31b9bba04ea Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 6 May 2023 09:45:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesordermodel/BusSalesOrderModelService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index f8fc81332a..f31ee741f3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -746,7 +746,7 @@ public class BusSalesOrderModelService extends MybatisBaseService Date: Sat, 6 May 2023 11:06:53 +0800 Subject: [PATCH 3/4] =?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); } From 3e1e863546653c8e340dde009cb5d525b7181fe1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 6 May 2023 13:32:40 +0800 Subject: [PATCH 4/4] =?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 --- .../BusArrearsCarryVehicleApplyFeign.java | 4 ++-- .../BusArrearsCarryVehicleApplyPageVo.java | 8 ++++++-- .../BusArrearsCarryVehicleDetailsVo.java | 2 ++ .../BusArrearsCarryVehicleApplyMapper.xml | 4 +++- .../BusArrearsCarryVehicleApplyService.java | 2 +- .../com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index 5b30f18e1b..dec064b903 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -123,8 +123,8 @@ public interface BusArrearsCarryVehicleApplyFeign { @ResponseBody public ResultBean completeBy(@RequestBody CompleteByQuery query); - @ApiOperation(value = "办理（同意）") - @PostMapping("/InitiatorToAnswerInfo") + @ApiOperation(value = "跨事业部办理（同意）") + @PostMapping("/initiatorToAnswerInfo") @ResponseBody public ResultBean InitiatorToAnswerInfo(@Valid @RequestBody AppCompleteAdvanceArrearsDto query); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java index c1b0299cc3..4711440e14 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java @@ -5,8 +5,6 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - @Data public class BusArrearsCarryVehicleApplyPageVo implements Vo { @@ -42,4 +40,10 @@ public class BusArrearsCarryVehicleApplyPageVo implements Vo { @ApiModelProperty("申请人") private String applyName; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java index daad2ef8a0..845f4c8c21 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java @@ -41,6 +41,8 @@ public class BusArrearsCarryVehicleDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; + private String vinSid; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index e4d9ba2649..25a5b5ce47 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -23,7 +23,9 @@ DATE_FORMAT(bacva.createTime,'%Y-%m-%d') AS applyDate, - bacva.applyName + bacva.applyName, + bacva.procDefId, + bacva.procInstId FROM bus_arrears_carry_vehicle_apply bacva ${ew.sqlSegment} 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 79ddeaecbc..117ef07ad9 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 @@ -1613,7 +1613,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) { - baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid()); + baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVinSid()); baseVehicleTempstateDto.setVinNo(busArrearsCarryVehicleDetailsVo.getVinNo()); baseVehicleTempstateFeign.save(baseVehicleTempstateDto); } 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 7aa20ae8a3..7766a9bdc1 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 @@ -17,7 +17,7 @@ public enum ProcDefEnum { QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:1:1202504"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), // ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"), - ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"), + ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:2:1347504"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),