From 2ebf0e08ac2f1db030d5a34c9b388a65fd709270 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 28 Dec 2022 13:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ShopOrderReleaseServiceImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java index fc14904b..c1e68fc5 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java @@ -131,6 +131,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService { //工单List List shopOrderList; List shopOrderReleaseList = new ArrayList(); + StringBuffer message = new StringBuffer(); try { CommonsMultipartFile multipartFile = new CommonsMultipartFile(fileItem); shopOrderList = ExcelUtils.readExcel(fileType, shopOrderReleaseDto.class, multipartFile, null); @@ -154,12 +155,18 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService { return R.failed("此工单编号不存在:" + orderReleaseDto.getShopOrder()); } } - Boolean result = this.changerouterRevision(shopOrderReleaseList, new StringBuffer(), "A"); - return R.ok(result); + Boolean result = this.changerouterRevision(shopOrderReleaseList, message, "A"); + if (result){ + message.insert(0, "更新成功"); + return R.ok(message.toString()); + }else { + message.insert(0, "已是最新版本："); + return R.failed(message.toString()); + } } } catch (Exception e) { - e.printStackTrace(); - return R.failed(e.getMessage()); + message.append(e.getMessage()); + return R.failed(message.toString()); } }