From 3e1e863546653c8e340dde009cb5d525b7181fe1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 6 May 2023 13:32:40 +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 --- .../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"),