rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '惠信/qms/develop' into qms/develop

This commit is contained in:
曹鹏飞 2026-05-13 19:17:54 +08:00
parent 8ee02f1e84 c0dc2f565c
commit 01465e849a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -2032,7 +2032,7 @@ public class QmsIssueTicketControllerService {
}
}
// 拼接领导姓名与审批意见
String approvalText = process.getLeaderApprovalResult() == 1 ? "同意" : "驳回";
String approvalText = process.getLeaderApprovalResult() == 0 ? "同意" : "驳回";
String leaderDisplay;
if (StrUtil.isNotBlank(process.getLeaderApprovalOpinion())) {
leaderDisplay = process.getLeaderUserName() + "（" + approvalText + "：" + process.getLeaderApprovalOpinion() + "）";

6
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
View File

@ -254,7 +254,7 @@ public class QmsIssueTicketProcessControllerService {
Short leaderApprovalResult = request.getApprovalStatus();
if (leaderApprovalResult == 0) {
if (leaderApprovalResult == 1) {
// 驳回：推送待办给处理人
Long sourceTypeId = dictionaryItemService.getIdByCode("MessageType", "InspectionTaskWorkOrder");
User handler = userService.getById(process.getHandlerUserId());
@ -262,7 +262,7 @@ public class QmsIssueTicketProcessControllerService {
.setTicketId(ticket.getId())
.setHandlerUserId(process.getHandlerUserId());
issueTicketToDoService.save(todoItem);
} else if (leaderApprovalResult == 1) {
} else if (leaderApprovalResult == 0) {
// 同意：检查同一工单下所有处理记录是否都已完成
Long issueTicketId = process.getIssueTicketId();
@ -270,7 +270,7 @@ public class QmsIssueTicketProcessControllerService {
long notCompleted = issueTicketProcessService.lambdaQuery()
.eq(QmsIssueTicketProcess::getIssueTicketId, issueTicketId)
.and(w -> w
.ne(true, QmsIssueTicketProcess::getLeaderApprovalResult, (short) 1)
.ne(true, QmsIssueTicketProcess::getLeaderApprovalResult, (short) 0)
.or()
.isNull(QmsIssueTicketProcess::getLeaderApprovalResult))
.and(w -> w

2
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
View File

@ -52,7 +52,7 @@ public class QmsIssueTicketProcessMeasureControllerService {
QmsIssueTicketProcess process = findProcessByTicketAndUser(request.getId(), currentUserId);
// 校验：领导已同意时不允许修改
if (process.getLeaderApprovalResult() != null && process.getLeaderApprovalResult() == 1) {
if (process.getLeaderApprovalResult() != null && process.getLeaderApprovalResult() == 0) {
throw new NflgException(STATE.BusinessError, "领导已审批同意，不允许修改");
}