Compare commits

..

No commits in common. "1a3af0ae7e4fc4e4de325d41ace77511693e15f2" and "5fed496eea87183c18662ee9b2c266df41cc7c1e" have entirely different histories.

2 changed files with 7 additions and 11 deletions

View File

@ -93,11 +93,14 @@ public class TicketController extends ControllerBase {
@Resource
private UniPushService uniPushService;
@Resource
private ShengWangService shengWangService;
// @Resource
// private ITicketCallService ticketCallService;
//
// @Resource
// private ITicketCallJoinService ticketCallJoinService;
@Resource
private ITicketSolutionAuditService ticketSolutionAuditService;
private ShengWangService shengWangService;
/**
* 搜索设备
@ -248,9 +251,7 @@ 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()))
.setCanReopen(Objects.equals(ticket.getState(), TicketState.ProcessingCompleted.getState())
&& !ticketSolutionAuditService.lambdaQuery().eq(TicketSolutionAudit::getTicketId, ticket.getId()).exists());
.setEvaluate(getTicketEvaluate(ticket.getId()));
return ApiResult.success(vo);
}

View File

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