diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 86216952..bfc8622b 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -174,8 +174,8 @@ public class QmsIssueTicketControllerService { * 发起巡检工单 * 1. 校验工单存在且来源类型为巡检(sourceType=2) * 2. 校验负责人存在 - * 3. 更新工单状态为处理中(status=1) - * 4. 设置审批人ID和姓名 + * 3. 保持工单待流转(status=0) + * 4. 设置负责人ID和姓名 */ @Transactional(rollbackFor = Exception.class) public void dispatch(@Valid QmsIssueTicketDispatchQO request) { @@ -234,10 +234,10 @@ public class QmsIssueTicketControllerService { } } - // 6. 更新工单状态和审批人信息 + // 6. 设置负责人信息,未分派处理人前保持待流转 issueTicketService.lambdaUpdate() .eq(QmsIssueTicket::getId, request.getId()) - .set(QmsIssueTicket::getStatus, (short) 1) // 状态:1=处理中 + .set(QmsIssueTicket::getStatus, (short) 0) .set(QmsIssueTicket::getApprovalUserId, request.getHandlerUserId()) .set(QmsIssueTicket::getApprovalUserName, handlerUser.getUserName()) .set(QmsIssueTicket::getApprovalTime, LocalDateTime.now()) @@ -1054,7 +1054,7 @@ public class QmsIssueTicketControllerService { /** * 新增巡检工单并发布 * 1. 创建工单(来源类型固定为2-巡检) - * 2. 直接设置为处理中状态(status=1) + * 2. 未分派处理人前保持待流转(status=0) * 3. 设置负责人为审批人 */ @Transactional(rollbackFor = Exception.class) @@ -1120,7 +1120,7 @@ public class QmsIssueTicketControllerService { // 4. 自动生成工单编号 String ticketNo = basdeSerialNumberControllerService.generateSerialNumber(37); - // 5. 创建工单实体(直接设置为处理中状态) + // 5. 创建工单实体,未分派处理人前保持待流转 QmsIssueTicket entity = new QmsIssueTicket() .setSourceType((short) 2) .setTicketNo(ticketNo) @@ -1138,7 +1138,7 @@ public class QmsIssueTicketControllerService { : StrUtil.join(",", request.getImages().stream().map(FileUploadVO::getId).toList()) ) .setRemark(request.getRemark()) - .setStatus((short) 1) // 直接设置为处理中 + .setStatus((short) 0) .setApprovalUserId(request.getHandlerUserId()) .setApprovalUserName(handlerUser.getUserName()) .setApprovalTime(now)