Merge branch 'feature/bug-800' into test

nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java

@@ -93,15 +93,12 @@ public class TicketController extends ControllerBase {
     @Resource
     private UniPushService uniPushService;
 
-//    @Resource
-//    private ITicketCallService ticketCallService;
-//
-//    @Resource
-//    private ITicketCallJoinService ticketCallJoinService;
-
     @Resource
     private ShengWangService shengWangService;
 
+    @Resource
+    private ITicketSolutionAuditService ticketSolutionAuditService;
+
     /**
      * 搜索设备
      * @param request 搜索条件
@@ -251,7 +248,9 @@ public class TicketController extends ControllerBase {
                 .setCompanyName(StrUtil.join(",",companys.stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList())))
                 .setHandle(handle)
                 .setSolution(ticket.getReason())
-                .setEvaluate(getTicketEvaluate(ticket.getId()));
+                .setEvaluate(getTicketEvaluate(ticket.getId()))
+                .setCanReopen(Objects.equals(ticket.getState(), TicketState.ProcessingCompleted.getState())
+                        && !ticketSolutionAuditService.lambdaQuery().eq(TicketSolutionAudit::getTicketId, ticket.getId()).exists());
         return ApiResult.success(vo);
     }
 

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java

@@ -132,4 +132,9 @@ public class TicketInfoVO {
      * 当前用户是否可发送消息
      */
     private Boolean canSendMessage;
+
+    /**
+     * 是否可以重启议题
+     */
+    private Boolean canReopen;
 }