diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AssignmentTicketRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AssignmentTicketRequest.java index 8bb65316..da038f46 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AssignmentTicketRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AssignmentTicketRequest.java @@ -2,7 +2,6 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.List; @@ -14,13 +13,13 @@ public class AssignmentTicketRequest { @NotNull private Integer ticketId; - //紧急程度,0:非紧急;1:普通;2:紧急 - @NotNull - private Byte urgency; - - //问题类型 - @NotBlank - private String question; +// //紧急程度,0:非紧急;1:普通;2:紧急 +// @NotNull +// private Byte urgency; +// +// //问题类型 +// @NotBlank +// private String question; //备注 private String remark; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SolutionMeasuresSaveRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SolutionMeasuresSaveRequest.java index e115a948..e7ac7d11 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SolutionMeasuresSaveRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SolutionMeasuresSaveRequest.java @@ -18,6 +18,14 @@ public class SolutionMeasuresSaveRequest { @NotNull private Integer ticketId; + //紧急程度,0:非紧急;1:普通;2:紧急 + @NotNull + private Byte urgency; + + //问题类型 + @NotBlank + private String question; + /** * 根本原因 */ 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 cc8ec236..45bab86d 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 @@ -144,8 +144,8 @@ public class TicketServiceImpl extends ServiceImpl impleme List tickerMangagers = adminUserService.getTickerMangagers(); VUtils.trueThrowBusinessError(tickerMangagers.stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))) .throwMessage("你无权分派工单"); - ticket.setUrgency(TicketUrgency.findByValue(request.getUrgency()).getState()); - ticket.setQuestion(request.getQuestion()); +// ticket.setUrgency(TicketUrgency.findByValue(request.getUrgency()).getState()); +// ticket.setQuestion(request.getQuestion()); ticket.setState(TicketState.Processing.getState()); ticket.setRemark(request.getRemark()); ticket.setHandle(StrUtil.join(",", request.getUserIds())); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java index aa09ea00..6ea8e414 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java @@ -111,6 +111,8 @@ public class TicketSolutionServiceImpl extends ServiceImpl()