parent
9e2682981d
commit
25f84d0511
|
|
@ -3288,7 +3288,7 @@ public class QmsIssueTicketControllerService {
|
||||||
boolean creatorCanShut = isCreator && isCompletedStatus;
|
boolean creatorCanShut = isCreator && isCompletedStatus;
|
||||||
|
|
||||||
vo.setIsReview(responsibleCanReview || handlerCanReview || leaderCanReview);
|
vo.setIsReview(responsibleCanReview || handlerCanReview || leaderCanReview);
|
||||||
vo.setIsDispatch(responsibleCanDispatch || creatorCanDispatch);
|
vo.setIsDispatch((responsibleCanDispatch && !leaderCanReview) || creatorCanDispatch);
|
||||||
vo.setIsEdit(handlerCanEdit);
|
vo.setIsEdit(handlerCanEdit);
|
||||||
vo.setIsShut(creatorCanShut);
|
vo.setIsShut(creatorCanShut);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,12 +61,6 @@ public class QmsPqcTaskRecordControllerService {
|
||||||
@Resource
|
@Resource
|
||||||
private IQmsIssueTicketService issueTicketService;
|
private IQmsIssueTicketService issueTicketService;
|
||||||
|
|
||||||
@Resource
|
|
||||||
private IQmsIssueTicketToDoService issueTicketToDoService;
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private IQmsIssueTicketProcessService issueTicketProcessService;
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private IUserService userService;
|
private IUserService userService;
|
||||||
|
|
||||||
|
|
@ -1570,12 +1564,6 @@ public class QmsPqcTaskRecordControllerService {
|
||||||
|
|
||||||
issueTicketService.save(ticket);
|
issueTicketService.save(ticket);
|
||||||
|
|
||||||
QmsIssueTicketProcess ticketProcess = new QmsIssueTicketProcess()
|
|
||||||
.setIssueTicketId(ticket.getId())
|
|
||||||
.setHandlerUserId(taskRecord.getReviewerId())
|
|
||||||
.setHandlerUserName(taskRecord.getReviewerName());
|
|
||||||
issueTicketProcessService.save(ticketProcess);
|
|
||||||
|
|
||||||
// 2. 任务总体合格时,仅生成工单,不创建重检任务
|
// 2. 任务总体合格时,仅生成工单,不创建重检任务
|
||||||
if (!Boolean.FALSE.equals(taskRecord.getEnable())) {
|
if (!Boolean.FALSE.equals(taskRecord.getEnable())) {
|
||||||
return ticket.getId();
|
return ticket.getId();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue