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

pqc工单完成修改

This commit is contained in:
yf001217 2026-06-15 14:21:21 +08:00
parent 4f2bd1e44c
commit e6aa5a0c25
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,12 @@ public class QmsIssueTicketControllerService {
.set(QmsIssueTicket::getUpdateTime, now) .set(QmsIssueTicket::getUpdateTime, now)
.update(); .update();
issueTicketToDoService.processed(ticket.getId()); issueTicketToDoService.lambdaUpdate()
.eq(QmsIssueTicketToDo::getTicketId, ticket.getId())
.eq(QmsIssueTicketToDo::getHandlerUserId, ticket.getCreateUserId())
.eq(QmsIssueTicketToDo::getHasProcessed, false)
.set(QmsIssueTicketToDo::getHasProcessed, true)
.update();
// 5. 按处理人分组合并不合格项ID // 5. 按处理人分组合并不合格项ID
Map<Long, List<String>> userTaskMap = new LinkedHashMap<>(); Map<Long, List<String>> userTaskMap = new LinkedHashMap<>();
@ -1493,7 +1498,9 @@ public class QmsIssueTicketControllerService {
QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo() QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
.setTicketId(issueTicketId) .setTicketId(issueTicketId)
.setHandlerUserId(handlerUserId); .setHandlerUserId(handlerUserId)
.setHasProcessed(false)
.setIsRead(false);
issueTicketToDoService.save(todoItem); issueTicketToDoService.save(todoItem);
} }

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

@ -480,16 +480,26 @@ public class QmsIssueTicketProcessControllerService {
public void submitPqcHandler(QmsIssueTicketProcessDraftQO request, QmsIssueTicket ticket, public void submitPqcHandler(QmsIssueTicketProcessDraftQO request, QmsIssueTicket ticket,
QmsIssueTicketProcess process, LocalDateTime now, QmsIssueTicketProcess process, LocalDateTime now,
Long currentUserId, String currentUserName) { Long currentUserId, String currentUserName) {
// 1. 保存数据（调用draftUnified）
issueTicketProcessMeasureControllerService.draftUnified(request);
QmsIssueTicketProcess latestProcess = issueTicketProcessService.getById(process.getId());
Short approvalStatus = request.getApprovalStatus() != null Short approvalStatus = request.getApprovalStatus() != null
? request.getApprovalStatus() ? request.getApprovalStatus()
: latestProcess.getApprovalStatus(); : process.getApprovalStatus();
VUtil.trueThrowBusinessError(approvalStatus == null).throwMessage("提交时审批状态不能为空"); VUtil.trueThrowBusinessError(approvalStatus == null).throwMessage("提交时审批状态不能为空");
VUtil.trueThrowBusinessError(approvalStatus != 0 && approvalStatus != 1) VUtil.trueThrowBusinessError(approvalStatus != 0 && approvalStatus != 1)
.throwMessage("不支持的审批状态"); .throwMessage("不支持的审批状态");
if (approvalStatus == 0) {
// 1. 保存数据（调用draftUnified）
issueTicketProcessMeasureControllerService.draftUnified(request);
} else {
issueTicketProcessService.lambdaUpdate()
.eq(QmsIssueTicketProcess::getId, process.getId())
.set(QmsIssueTicketProcess::getApprovalStatus, approvalStatus)
.set(request.getApprovalOpinion() != null, QmsIssueTicketProcess::getApprovalOpinion, request.getApprovalOpinion())
.set(QmsIssueTicketProcess::getApprovalUserId, currentUserId)
.set(QmsIssueTicketProcess::getApprovalUserName, currentUserName)
.update();
}
// 2. 写入审批时间 // 2. 写入审批时间
issueTicketProcessService.lambdaUpdate() issueTicketProcessService.lambdaUpdate()
.eq(QmsIssueTicketProcess::getId, process.getId()) .eq(QmsIssueTicketProcess::getId, process.getId())