From b8bdcedced0155dd88081446b3ed7f76c01d8ad4 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Tue, 22 Nov 2022 11:44:57 +0800 Subject: [PATCH] =?UTF-8?q?bpm=E6=8E=A5=E5=8F=A3=E6=89=93=E5=BC=80?= =?UTF-8?q?=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 --- .../controller/AbnormalBillController.java | 6 +++--- .../service/impl/AbnormalBillServiceImpl.java | 4 ++-- .../mesnac/meapi/mapper/RouterMapper.java | 3 +++ .../mesnac/meapi/service/RouterService.java | 2 ++ .../meapi/service/impl/RouterServiceImpl.java | 5 +++++ meapi/src/main/resources/mapper/RouterMapper.xml | 16 ++++++++++++++++ 6 files changed, 31 insertions(+), 5 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 620c4864..7a5be772 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -373,13 +373,13 @@ public class AbnormalBillController { AbnormalRouterDto abnormalRouterDto = new AbnormalRouterDto(); abnormalRouterDto.setSite(site); abnormalRouterDto.setItem(routerBpmVO.getItem()); - List abnormalRouterDtoList = routerService.selectDisrouter(abnormalRouterDto); + List abnormalRouterDtoList = routerService.selectAllDisRouter(abnormalRouterDto); ArrayList routerBpmVOs = new ArrayList<>(); for (AbnormalRouterDto routerDto : abnormalRouterDtoList) { RouterBpmVO bpmVO = new RouterBpmVO(); bpmVO.setAbnormalNo(routerDto.getAbnormalNo()); bpmVO.setRouter(routerDto.getRouter()); - bpmVO.setRouterType(routerDto.getRouterType()); + bpmVO.setRouterType("C"); bpmVO.setItemDescription(routerDto.getItemDescription()); bpmVO.setItemRevision(routerDto.getRouterRevision()); bpmVO.setPbDescription(routerDto.getPbDescription()); @@ -387,7 +387,7 @@ public class AbnormalBillController { bpmVO.setPbDescription(routerDto.getPbDescription()); bpmVO.setItem(routerDto.getItem()); bpmVO.setShopOrder(routerBpmVO.getShopOrder()); - bpmVO.setSite(routerDto.getSite()); + bpmVO.setSite(site); bpmVO.setRouterBo(routerDto.getRouterBo()); RouterStep routerStep = new RouterStep(); routerStep.setRouterBo(routerDto.getRouterBo()); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index ae1cb9b4..96ceba00 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -595,9 +595,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl { RouterStep findRepairOperation(@Param("site") String site, @Param("routerBo") String routerBo, @Param("stepId") String stepId); List selectDisrouter(@Param("abnormalRouterDto")AbnormalRouterDto abnormalRouterDto); + + List selectAllDisRouter(@Param("abnormalRouterDto")AbnormalRouterDto abnormalRouterDto); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java index a0d01499..000e2bb6 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java @@ -49,6 +49,8 @@ public interface RouterService extends IService { List selectDisrouter(AbnormalRouterDto abnormalRouterDto); + List selectAllDisRouter(AbnormalRouterDto abnormalRouterDto); + /** * 放置图片 * @param disRouter diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java index b25e7bc4..3ef073c7 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java @@ -281,6 +281,11 @@ public class RouterServiceImpl extends ServiceImpl impleme return routerMapper.selectDisrouter(abnormalRouterDto); } + @Override + public List selectAllDisRouter(AbnormalRouterDto abnormalRouterDto) { + return routerMapper.selectAllDisRouter(abnormalRouterDto); + } + @Override public void fileUpload(DisRouter disRouter,String routerBo,String stepId) { String user = CommonMethods.getUser(); diff --git a/meapi/src/main/resources/mapper/RouterMapper.xml b/meapi/src/main/resources/mapper/RouterMapper.xml index 4585f085..e6a68cf3 100644 --- a/meapi/src/main/resources/mapper/RouterMapper.xml +++ b/meapi/src/main/resources/mapper/RouterMapper.xml @@ -702,5 +702,21 @@ AND I.ITEM IS NOT NULL +