工单详情接口修改
This commit is contained in:
parent
7a4bcb01b0
commit
24f9701bda
|
|
@ -169,6 +169,11 @@ public class QmsIssueTicketControllerService {
|
||||||
String currentUserName = UserUtil.getUserName();
|
String currentUserName = UserUtil.getUserName();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
|
// 校验不能分配给自己
|
||||||
|
if (request.getHandlerUserIds().contains(currentUserId)) {
|
||||||
|
throw new NflgException(STATE.BusinessError, "不能将工单分配给自己");
|
||||||
|
}
|
||||||
|
|
||||||
// 1. 校验工单存在
|
// 1. 校验工单存在
|
||||||
QmsIssueTicket ticket = issueTicketService.getById(request.getId());
|
QmsIssueTicket ticket = issueTicketService.getById(request.getId());
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在");
|
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在");
|
||||||
|
|
@ -869,6 +874,13 @@ public class QmsIssueTicketControllerService {
|
||||||
String userName = UserUtil.getUserName();
|
String userName = UserUtil.getUserName();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
|
// 校验不能分配给自己
|
||||||
|
boolean containsSelf = request.getHandlers().stream()
|
||||||
|
.anyMatch(h -> userId.equals(h.getHandlerUserId()));
|
||||||
|
if (containsSelf) {
|
||||||
|
throw new NflgException(STATE.BusinessError, "不能将工单分配给自己");
|
||||||
|
}
|
||||||
|
|
||||||
// 查询任务记录
|
// 查询任务记录
|
||||||
QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(request.getTaskRecordId());
|
QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(request.getTaskRecordId());
|
||||||
if (Objects.isNull(taskRecord)) {
|
if (Objects.isNull(taskRecord)) {
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,15 @@ public class QmsIssueTicketProcessControllerService {
|
||||||
* 新增工单处理(同步,供 Controller 直接调用)
|
* 新增工单处理(同步,供 Controller 直接调用)
|
||||||
*/
|
*/
|
||||||
public void add(QmsIssueTicketProcessAddQO request) {
|
public void add(QmsIssueTicketProcessAddQO request) {
|
||||||
|
Long currentUserId = UserUtil.getUserId();
|
||||||
|
|
||||||
|
// 校验不能分配给自己
|
||||||
|
boolean containsSelf = request.getHandlers().stream()
|
||||||
|
.anyMatch(h -> currentUserId.equals(h.getHandlerUserId()));
|
||||||
|
if (containsSelf) {
|
||||||
|
throw new NflgException(STATE.BusinessError, "不能将工单分配给自己");
|
||||||
|
}
|
||||||
|
|
||||||
// 校验工单是否存在
|
// 校验工单是否存在
|
||||||
QmsIssueTicket ticket = issueTicketService.getById(request.getIssueTicketId());
|
QmsIssueTicket ticket = issueTicketService.getById(request.getIssueTicketId());
|
||||||
if (ticket == null) {
|
if (ticket == null) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue