From 1e30e82316a4dfb5f11e2c9eae0e2bc35f1653b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 13 Feb 2025 14:51:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cfs/controller/TiketController.java | 12 ++++++++++- .../mobilebroken/common/pojo/vo/AreaVO.java | 3 ++- .../repository/service/ITicketService.java | 2 ++ .../service/impl/TicketServiceImpl.java | 20 ++++++++++++++++--- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java index 9540fc93..ddacaf25 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java @@ -269,7 +269,6 @@ public class TiketController extends ControllerBase { /** * 撤销工单 - * * @param id 工单编号 **/ @GetMapping("revokedTicket") @@ -278,6 +277,17 @@ public class TiketController extends ControllerBase { return ApiResult.success(); } + /** + * 重启工单 + * + * @param id 工单编号 + **/ + @GetMapping + public ApiResult reopenTicket(@Valid @RequestParam @NotNull Integer id) { + ticketService.reopen(id); + return ApiResult.success(); + } + /** * 获取工单评价数据 **/ diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaVO.java index e3eb605b..32f27e6f 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaVO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.experimental.Accessors; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @Data @@ -35,5 +36,5 @@ public class AreaVO { private LocalDateTime updateTime; //下级区域 - private List children; + private List children = new ArrayList<>(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java index b8fd4307..36cccdc1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java @@ -41,4 +41,6 @@ public interface ITicketService extends IService { List getNonemergency(int days); void revoked(Integer id); + + void reopen(Integer id); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java index a93d5996..60e5bc3b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java @@ -138,7 +138,7 @@ public class TicketServiceImpl extends ServiceImpl impleme public List getEmergencys(int days) { return lambdaQuery() .eq(Ticket::getState, TicketState.Processing.getState()) - .eq(Ticket::getUrgency, TicketUrgency.URGENCY.getState().byteValue()) + .eq(Ticket::getUrgency, TicketUrgency.URGENCY.getState()) .ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days)) .list(); } @@ -147,7 +147,7 @@ public class TicketServiceImpl extends ServiceImpl impleme public List getGenerals(int days) { return lambdaQuery() .eq(Ticket::getState, TicketState.Processing.getState()) - .eq(Ticket::getUrgency, TicketUrgency.GENERAL.getState().byteValue()) + .eq(Ticket::getUrgency, TicketUrgency.GENERAL.getState()) .ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days)) .list(); } @@ -156,7 +156,7 @@ public class TicketServiceImpl extends ServiceImpl impleme public List getNonemergency(int days) { return lambdaQuery() .eq(Ticket::getState, TicketState.Processing.getState()) - .eq(Ticket::getUrgency, TicketUrgency.NONEMERGENCY.getState().byteValue()) + .eq(Ticket::getUrgency, TicketUrgency.NONEMERGENCY.getState()) .ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days)) .list(); } @@ -167,6 +167,20 @@ public class TicketServiceImpl extends ServiceImpl impleme .set(Ticket::getState, TicketState.Revoked.getState()) .set(Ticket::getUpdateTime, LocalDateTime.now()) .eq(Ticket::getId, id) + .and(c -> c + .eq(Ticket::getState, TicketState.PendingProcessing.getState()) + .or() + .eq(Ticket::getState, TicketState.Processing.getState())) + .update(); + } + + @Override + public void reopen(Integer id) { + lambdaUpdate() + .set(Ticket::getState, TicketState.Processing.getState()) + .set(Ticket::getUpdateTime, LocalDateTime.now()) + .eq(Ticket::getId, id) + .eq(Ticket::getState, TicketState.ProcessingCompleted.getState()) .update(); } }