Compare commits
No commits in common. "1a3af0ae7e4fc4e4de325d41ace77511693e15f2" and "5fed496eea87183c18662ee9b2c266df41cc7c1e" have entirely different histories.
1a3af0ae7e
...
5fed496eea
|
|
@ -93,11 +93,14 @@ public class TicketController extends ControllerBase {
|
||||||
@Resource
|
@Resource
|
||||||
private UniPushService uniPushService;
|
private UniPushService uniPushService;
|
||||||
|
|
||||||
@Resource
|
// @Resource
|
||||||
private ShengWangService shengWangService;
|
// private ITicketCallService ticketCallService;
|
||||||
|
//
|
||||||
|
// @Resource
|
||||||
|
// private ITicketCallJoinService ticketCallJoinService;
|
||||||
|
|
||||||
@Resource
|
@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())))
|
.setCompanyName(StrUtil.join(",",companys.stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList())))
|
||||||
.setHandle(handle)
|
.setHandle(handle)
|
||||||
.setSolution(ticket.getReason())
|
.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);
|
return ApiResult.success(vo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -132,9 +132,4 @@ public class TicketInfoVO {
|
||||||
* 当前用户是否可发送消息
|
* 当前用户是否可发送消息
|
||||||
*/
|
*/
|
||||||
private Boolean canSendMessage;
|
private Boolean canSendMessage;
|
||||||
|
|
||||||
/**
|
|
||||||
* 是否可以重启议题
|
|
||||||
*/
|
|
||||||
private Boolean canReopen;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue