From c375ef3f643651d9a944c23b814a6a349d07e787 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Fri, 26 Jun 2026 15:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QmsIssueTicketController.java | 6 ++-- .../QmsIssueTicketControllerService.java | 20 ++++------- .../common/pojo/qo/QmsIssueTicketAddQO.java | 36 ++----------------- 3 files changed, 12 insertions(+), 50 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java index f6d23865..1b2063eb 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java @@ -31,7 +31,7 @@ public class QmsIssueTicketController extends BaseController { private QmsIssueTicketControllerService issueTicketControllerService; /** - * 新增质量问题工单 + * 新增巡检工单 * 工单编号自动生成，来源类型固定为2（巡检） */ @PostMapping("add") @@ -71,8 +71,8 @@ public class QmsIssueTicketController extends BaseController { } /** - * 新增巡检工单并发布 - * 一步完成：创建工单 + 设置负责人 + 状态改为处理中 + * 新增巡检工单并设置负责人 + * 一步完成：创建工单 + 设置负责人 */ @PostMapping("addAndDispatch") public ApiResult addAndDispatch(@Valid @RequestBody QmsIssueTicketAddAndDispatchQO request) { 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 eb0f9fe6..63a9c286 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 @@ -1009,7 +1009,7 @@ public class QmsIssueTicketControllerService { } /** - * 新增质量问题工单 + * 新增巡检工单 * 工单编号自动生成，来源类型固定为2（巡检），状态默认为0（待流转） */ @Transactional(rollbackFor = Exception.class) @@ -1018,13 +1018,12 @@ public class QmsIssueTicketControllerService { String userName = UserUtil.getUserName(); LocalDateTime now = LocalDateTime.now(); - // 校验 ticketTitle + projectNo 不能重复 + // 校验工单标题不能重复 boolean exists = issueTicketService.lambdaQuery() .eq(QmsIssueTicket::getTicketTitle, request.getTicketTitle()) - .eq(QmsIssueTicket::getProjectNo, request.getProjectNo()) .exists(); if (exists) { - throw new NflgException(STATE.BusinessError, "已存在相同标题和工程编号的工单，请勿重复创建"); + throw new NflgException(STATE.BusinessError, "工单已存在"); } // 自动生成工单编号 @@ -1036,13 +1035,7 @@ public class QmsIssueTicketControllerService { .setTicketNo(ticketNo) .setTicketTitle(request.getTicketTitle()) .setProjectNo(request.getProjectNo()) - .setIncidentType(request.getIncidentType()) - .setExceptionCode(request.getExceptionCode()) - .setImpactQuantity(request.getImpactQuantity()) .setIncidentLocation(request.getIncidentLocation()) - .setIncidentDescription(request.getIncidentDescription()) - .setIncidentReason(request.getIncidentReason()) - .setIncidentConsequence(request.getIncidentConsequence()) .setImageIds(request.getImages() == null ? "" : StrUtil.join(",", request.getImages().stream().map(FileUploadVO::getId).toList()) @@ -1059,7 +1052,7 @@ public class QmsIssueTicketControllerService { } /** - * 新增巡检工单并发布 + * 新增巡检工单并设置负责人 * 1. 创建工单（来源类型固定为2-巡检） * 2. 未分派处理人前保持待流转（status=0） * 3. 设置负责人为审批人 @@ -1070,13 +1063,12 @@ public class QmsIssueTicketControllerService { String userName = UserUtil.getUserName(); LocalDateTime now = LocalDateTime.now(); - // 校验 ticketTitle + projectNo 不能重复 + // 校验工单标题不能重复 boolean exists = issueTicketService.lambdaQuery() .eq(QmsIssueTicket::getTicketTitle, request.getTicketTitle()) - .eq(QmsIssueTicket::getProjectNo, request.getProjectNo()) .exists(); if (exists) { - throw new NflgException(STATE.BusinessError, "已存在相同标题和工程编号的工单，请勿重复创建"); + throw new NflgException(STATE.BusinessError, "工单已存在"); } // 1. 校验负责人存在 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java index fab695fa..241c849e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java @@ -2,13 +2,12 @@ package com.nflg.wms.common.pojo.qo; import com.nflg.wms.common.pojo.vo.FileUploadVO; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.List; /** - * 质量问题工单 新增参数 + * 巡检工单新增参数 */ @Data public class QmsIssueTicketAddQO { @@ -22,44 +21,15 @@ public class QmsIssueTicketAddQO { /** * 工程编号 */ + @NotBlank(message = "工程编号不能为空") private String projectNo; - /** - * 事故类型：0=一般，1=较严重，2=严重 - */ - @NotNull(message = "事故类型不能为空") - private Short incidentType; - - /** - * 异常代码 - */ - private String exceptionCode; - - /** - * 影响数量 - */ - private String impactQuantity; - /** * 事件地点 */ + @NotBlank(message = "事件地点不能为空") private String incidentLocation; - /** - * 事件描述 - */ - private String incidentDescription; - - /** - * 事件原因 - */ - private String incidentReason; - - /** - * 事件后果 - */ - private String incidentConsequence; - /** * 图片列表 */