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-06-15 17:13:40 +08:00
parent 15102dd510 12332aa04f
commit f0eee8e2aa
3 changed files with 92 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -652,7 +652,7 @@ public class QmsIssueTicketControllerService {
.setIncidentDescription(incidentDescription)
.setRemark(request.getRemark())
.setUnqualifiedQty(unqualifiedDetails.size())
.setStatus((short) 1)
.setStatus((short) 0)
.setCreateUserId(userId)
.setCreateUserName(userName)
.setCreateTime(now)
@ -661,6 +661,13 @@ public class QmsIssueTicketControllerService {
.setUpdateTime(now);
issueTicketService.save(entity);
QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
.setTicketId(entity.getId())
.setHandlerUserId(userId)
.setHasProcessed(false)
.setIsRead(false);
issueTicketToDoService.save(todoItem);
Set<Long> fileIds = new HashSet<>();
Set<Long> itemIds = unqualifiedDetails.stream()
.map(QmsPqcTaskRecordDetails::getInspectionPointItemId)

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

@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -86,12 +87,31 @@ public class QmsIssueTicketProcessControllerService {
Collectors.mapping(QmsIssueTicketProcessAddQO.HandlerItem::getTaskResultId, Collectors.toList())
));
List<Long> handlerUserIds = new ArrayList<>();
// 为每个处理人创建处理记录
for (Map.Entry<Long, List<Long>> entry : handlerToResultsMap.entrySet()) {
doAdd(request.getIssueTicketId(), entry.getKey(), entry.getValue());
handlerUserIds.add(entry.getKey());
}
if (Objects.equals(ticket.getSourceType(), (short) 3) && !Objects.equals(ticket.getStatus(), (short) 1)) {
if (Objects.equals(ticket.getSourceType(), (short) 3)) {
issueTicketToDoService.lambdaUpdate()
.eq(QmsIssueTicketToDo::getTicketId, ticket.getId())
.eq(QmsIssueTicketToDo::getHasProcessed, false)
.set(QmsIssueTicketToDo::getHasProcessed, true)
.update();
for (Long handlerUserId : handlerUserIds) {
QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
.setTicketId(ticket.getId())
.setHandlerUserId(handlerUserId)
.setHasProcessed(false)
.setIsRead(false);
issueTicketToDoService.save(todoItem);
}
if (!Objects.equals(ticket.getStatus(), (short) 1)) {
issueTicketService.lambdaUpdate()
.eq(QmsIssueTicket::getId, ticket.getId())
.set(QmsIssueTicket::getStatus, (short) 1)
@ -101,6 +121,7 @@ public class QmsIssueTicketProcessControllerService {
.update();
}
}
}
/**
* 同步新增工单处理并推送待办（供内部服务调用）
@ -293,43 +314,44 @@ public class QmsIssueTicketProcessControllerService {
VUtil.trueThrowBusinessError(Objects.isNull(request.getApprovalStatus()))
.throwMessage("提交时审批状态不能为空");
// 2. 驳回时校验：handlers和审批意见不能为空
// 2. 驳回时校验：审批意见不能为空
if (request.getApprovalStatus() == 1) {
VUtil.trueThrowBusinessError(request.getHandlers() == null || request.getHandlers().isEmpty())
.throwMessage("驳回时处理人列表不能为空");
VUtil.trueThrowBusinessError(StrUtil.isBlank(request.getApprovalOpinion()))
.throwMessage("驳回时审批意见不能为空");
}
Long processId = process.getId();
// 3. 保存数据：前端传入approvalStatus/approvalOpinion，数据库填入leaderApprovalResult/leaderApprovalOpinion
issueTicketProcessService.lambdaUpdate()
.eq(QmsIssueTicketProcess::getId, processId)
.set(request.getApprovalOpinion() != null,
QmsIssueTicketProcess::getLeaderApprovalOpinion, request.getApprovalOpinion())
.set(request.getApprovalStatus() != null,
QmsIssueTicketProcess::getLeaderApprovalResult, request.getApprovalStatus())
.set(QmsIssueTicketProcess::getLeaderUserId, currentUserId)
.set(QmsIssueTicketProcess::getLeaderUserName, UserUtil.getUserName())
.set(QmsIssueTicketProcess::getLeaderApprovalTime, now)
.update();
issueTicketToDoService.processed(ticket.getId());
Short leaderApprovalResult = request.getApprovalStatus();
if (leaderApprovalResult == 1) {
// 驳回：只驳回传入的handlers对应的处理记录
// 驳回：自动驳回当前领导部门下属的待审批处理记录
Long issueTicketId = ticket.getId();
List<Long> rejectUserIds = request.getHandlers().stream()
.map(QmsIssueTicketProcessDraftQO.RejectHandlerItem::getHandlerUserId)
List<QmsIssueTicketProcess> rejectProcesses = issueTicketProcessService.lambdaQuery()
.eq(QmsIssueTicketProcess::getIssueTicketId, issueTicketId)
.eq(QmsIssueTicketProcess::getApprovalStatus, (short) 0)
.isNull(QmsIssueTicketProcess::getLeaderApprovalResult)
.list()
.stream()
.filter(p -> isCurrentUserHeadOfHandlerDept(p.getHandlerUserId(), currentUserId))
.collect(Collectors.toList());
VUtil.trueThrowBusinessError(rejectProcesses.isEmpty())
.throwMessage("未找到当前领导可驳回的下属处理记录");
List<Long> rejectProcessIds = rejectProcesses.stream()
.map(QmsIssueTicketProcess::getId)
.collect(Collectors.toList());
List<Long> rejectUserIds = rejectProcesses.stream()
.map(QmsIssueTicketProcess::getHandlerUserId)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
// 更新指定处理人的记录：重置审批状态
issueTicketProcessService.lambdaUpdate()
.eq(QmsIssueTicketProcess::getIssueTicketId, issueTicketId)
.in(QmsIssueTicketProcess::getHandlerUserId, rejectUserIds)
.in(QmsIssueTicketProcess::getId, rejectProcessIds)
.set(QmsIssueTicketProcess::getApprovalStatus, null)
.set(QmsIssueTicketProcess::getApprovalTime, null)
.set(QmsIssueTicketProcess::getLeaderApprovalResult, null)
@ -352,10 +374,23 @@ public class QmsIssueTicketProcessControllerService {
for (Long userId : rejectUserIds) {
QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
.setTicketId(issueTicketId)
.setHandlerUserId(userId);
.setHandlerUserId(userId)
.setHasProcessed(false)
.setIsRead(false);
issueTicketToDoService.save(todoItem);
}
} else if (leaderApprovalResult == 0) {
// 同意：保存领导审批结果
issueTicketProcessService.lambdaUpdate()
.eq(QmsIssueTicketProcess::getId, processId)
.set(request.getApprovalOpinion() != null,
QmsIssueTicketProcess::getLeaderApprovalOpinion, request.getApprovalOpinion())
.set(QmsIssueTicketProcess::getLeaderApprovalResult, request.getApprovalStatus())
.set(QmsIssueTicketProcess::getLeaderUserId, currentUserId)
.set(QmsIssueTicketProcess::getLeaderUserName, UserUtil.getUserName())
.set(QmsIssueTicketProcess::getLeaderApprovalTime, now)
.update();
// 同意：检查同一工单下所有处理记录是否都已完成
Long issueTicketId = process.getIssueTicketId();
@ -444,6 +479,20 @@ public class QmsIssueTicketProcessControllerService {
}
}
private boolean isCurrentUserHeadOfHandlerDept(Long handlerUserId, Long currentUserId) {
if (handlerUserId == null || currentUserId == null) {
return false;
}
UserInterior handlerInterior = userInteriorService.lambdaQuery()
.eq(UserInterior::getUserId, handlerUserId)
.one();
if (handlerInterior == null || handlerInterior.getDeptId() == null) {
return false;
}
Department department = departmentService.getById(handlerInterior.getDeptId());
return department != null && currentUserId.equals(department.getHeadUserId());
}
/**
* PQC工单处理人提交
*/

9
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java
View File

@ -472,8 +472,13 @@ public class QmsPdiTaskRecordControllerService {
page.getRecords().forEach(vo -> {
if (StrUtil.isNotBlank(vo.getInspectionItemImage())) {
List<QmsPdiTaskRecordDetailVO.FileDetailVO> files = new ArrayList<>();
String[] imgIds = vo.getInspectionItemImage().split(",");
for (String imgId : imgIds) {
// String[] imgIds = vo.getInspectionItemImage().split(",");
List<Long> imgIds = Arrays.stream(vo.getInspectionItemImage().split(","))
.map(String::trim)
.filter(s -> !s.isEmpty())
.map(Long::parseLong)
.collect(Collectors.toList());
for (Long imgId : imgIds) {
FileUploadRecord fileUploadRecord = fileUploadRecordService.
lambdaQuery().
eq(FileUploadRecord::getId, imgId).one();