From 9a31e0eafe35ae31a891acf6e4e363c14c9a8d8d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 6 Jun 2023 16:30:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8ac2d95d19..0d010b1cb8 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 @@ -33,7 +33,7 @@ public enum ProcDefEnum { BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"), BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"), - BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:6:1602504"), + BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:9:1632516"), BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), From 1b618e10339eac54ff3fc7a4b38642ae74bdb929 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 6 Jun 2023 16:37:18 +0800 Subject: [PATCH 2/3] 1 --- .../buscenter/api/bustransferrecords/BusTransferRecordEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java index 769c616bc7..63238a0d9b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java @@ -14,7 +14,7 @@ public enum BusTransferRecordEnum { private final String code; private final String remarks; - ScmTransferRecordEnum(String code, String remarks) { + BusTransferRecordEnum(String code, String remarks) { this.code = code; this.remarks = remarks; } From 555eef107ebbade138b4d1600b9953b216dd1f0d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 6 Jun 2023 16:54:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=A4=E8=BD=A6=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bushandover/BusHandoverFeign.java | 2 +- .../biz/bushandover/BusHandoverService.java | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java index d5f17ea82b..d8899e9a21 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverFeign.java @@ -52,7 +52,7 @@ public interface BusHandoverFeign { @ApiOperation("办理查看回显") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); @ApiOperation("上传照片") @PostMapping("/uploadPicture") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index b69106efa2..a4fc137498 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -787,10 +787,10 @@ public class BusHandoverService extends MybatisBaseService 0) { - sb.append("发票、"); + sb.append("发票").append("、"); } if (prepareVehicle.getCertificateState() > 0) { - sb.append("合格证、"); + sb.append("合格证").append("、"); } if (prepareVehicle.getOnBoardDataState() > 0) { BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData(); @@ -798,15 +798,11 @@ public class BusHandoverService extends MybatisBaseService 0) { List informations = data.getInformations(); - String keyNum = ""; for (BusVehicleInformationVo information : informations) { - keyNum = information.getVehicleKeyNum(); - } - if (Integer.parseInt(data.getIsFuelVehicle()) > 0) { - //0是燃气车 1不是燃气车 - sb.append(keyNum + "把车钥匙、一致性证书、申请表、保修手册、说明书、环保清单、驾驶员卡、"); - } else { - sb.append(keyNum + "把车钥匙、一致性证书、申请表、保修手册、说明书、环保清单、驾驶员卡、气瓶产品质量证书（燃气车）、"); + sb.append(information.getVehicleHandoverData()); + if (StringUtils.isNotBlank(information.getVehicleHandoverData())) { + sb.append("、"); + } } } }