From e8dbe61a3d7ff83b08a4246cedd4017e92ce6fcc Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Sun, 14 Jun 2026 16:24:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsIssueTicketControllerService.java | 25 +++++++++++--- .../pojo/vo/QmsInspectionTicketDetailVO.java | 5 +++ .../pojo/vo/QmsPdiTicketMyDetailVO.java | 5 +++ .../pojo/vo/QmsPqcTicketMyDetailVO.java | 33 +++++++++++++++++++ 4 files changed, 63 insertions(+), 5 deletions(-) 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 b2e6221f..25df9292 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 @@ -2142,6 +2142,7 @@ public class QmsIssueTicketControllerService { for (QmsIssueTicketProcessMeasure measure : measures) { QmsPdiTicketMyDetailVO.MeasureVO measureVO = new QmsPdiTicketMyDetailVO.MeasureVO(); measureVO.setId(measure.getId()); + measureVO.setHandlerUserId(process.getHandlerUserId()); measureVO.setMeasureTypeId(measure.getMeasureTypeId()); measureVO.setMeasureContent(measure.getMeasureContent()); measureVO.setChargeUser(measure.getChargeUser()); @@ -2194,6 +2195,7 @@ public class QmsIssueTicketControllerService { for (QmsIssueTicketProcessMeasure m : processMeasures) { QmsPdiTicketMyDetailVO.MeasureVO mvo = new QmsPdiTicketMyDetailVO.MeasureVO(); mvo.setId(m.getId()); + mvo.setHandlerUserId(process.getHandlerUserId()); mvo.setMeasureTypeId(m.getMeasureTypeId()); mvo.setMeasureContent(m.getMeasureContent()); mvo.setChargeUser(m.getChargeUser()); @@ -2518,6 +2520,12 @@ public class QmsIssueTicketControllerService { if (CollectionUtil.isNotEmpty(processes)) { Long temporaryTypeIdAll = dictionaryItemService.getId("工单解决措施", "临时纠正措施"); Long permanentTypeIdAll = dictionaryItemService.getId("工单解决措施", "永久纠正措施"); + Map processHandlerUserIdMap = new HashMap<>(); + for (QmsIssueTicketProcess p : processes) { + if (p.getId() != null) { + processHandlerUserIdMap.put(p.getId(), p.getHandlerUserId()); + } + } List processIdsAll = processes.stream() .map(QmsIssueTicketProcess::getId) .filter(Objects::nonNull) @@ -2528,7 +2536,7 @@ public class QmsIssueTicketControllerService { .in(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, processIdsAll) .eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, temporaryTypeIdAll) .list(); - vo.setTemporaryMeasures(convertToMeasureVO(temporaryMeasuresAll)); + vo.setTemporaryMeasures(convertToMeasureVO(temporaryMeasuresAll, processHandlerUserIdMap)); } if (permanentTypeIdAll != null && CollectionUtil.isNotEmpty(processIdsAll)) { @@ -2536,7 +2544,7 @@ public class QmsIssueTicketControllerService { .in(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, processIdsAll) .eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, permanentTypeIdAll) .list(); - vo.setPermanentMeasures(convertToMeasureVO(permanentMeasuresAll)); + vo.setPermanentMeasures(convertToMeasureVO(permanentMeasuresAll, processHandlerUserIdMap)); } } @@ -2550,7 +2558,9 @@ public class QmsIssueTicketControllerService { .eq(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, process.getId()) .eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, temporaryTypeId) .list(); - vo.setTemporaryMeasures(convertToMeasureVO(temporaryMeasures)); + Map processHandlerUserIdMap = new HashMap<>(); + processHandlerUserIdMap.put(process.getId(), process.getHandlerUserId()); + vo.setTemporaryMeasures(convertToMeasureVO(temporaryMeasures, processHandlerUserIdMap)); } if (permanentTypeId != null) { @@ -2558,7 +2568,9 @@ public class QmsIssueTicketControllerService { .eq(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, process.getId()) .eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, permanentTypeId) .list(); - vo.setPermanentMeasures(convertToMeasureVO(permanentMeasures)); + Map processHandlerUserIdMap = new HashMap<>(); + processHandlerUserIdMap.put(process.getId(), process.getHandlerUserId()); + vo.setPermanentMeasures(convertToMeasureVO(permanentMeasures, processHandlerUserIdMap)); } } @@ -2798,7 +2810,8 @@ public class QmsIssueTicketControllerService { /** * 转换措施列表 */ - private List convertToMeasureVO(List measures) { + private List convertToMeasureVO(List measures, + Map processHandlerUserIdMap) { if (CollectionUtil.isEmpty(measures)) { return new ArrayList<>(); } @@ -2806,6 +2819,7 @@ public class QmsIssueTicketControllerService { .map(m -> { QmsPqcTicketMyDetailVO.MeasureVO vo = new QmsPqcTicketMyDetailVO.MeasureVO(); vo.setId(m.getId()); + vo.setHandlerUserId(processHandlerUserIdMap.get(m.getIssueTicketProcessId())); vo.setMeasureTypeId(m.getMeasureTypeId()); vo.setMeasureContent(m.getMeasureContent()); vo.setChargeUser(m.getChargeUser()); @@ -3083,6 +3097,7 @@ public class QmsIssueTicketControllerService { for (QmsIssueTicketProcessMeasure measure : measures) { QmsInspectionTicketDetailVO.MeasureVO measureVO = new QmsInspectionTicketDetailVO.MeasureVO(); measureVO.setId(measure.getId()); + measureVO.setHandlerUserId(p.getHandlerUserId()); measureVO.setMeasureTypeId(measure.getMeasureTypeId()); measureVO.setMeasureContent(measure.getMeasureContent()); measureVO.setChargeUser(measure.getChargeUser()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionTicketDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionTicketDetailVO.java index 43cf5c76..e63a52ec 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionTicketDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionTicketDetailVO.java @@ -219,6 +219,11 @@ public class QmsInspectionTicketDetailVO { */ private Long id; + /** + * 处理人ID + */ + private Long handlerUserId; + /** * 措施类型ID，关联字典项表 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java index 6fa2a4a8..7359cd0e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java @@ -302,6 +302,11 @@ public class QmsPdiTicketMyDetailVO { private Long id; + /** + * 处理人ID + */ + private Long handlerUserId; + /** * 措施类型ID */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTicketMyDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTicketMyDetailVO.java index 285842fc..73f3d815 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTicketMyDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTicketMyDetailVO.java @@ -188,12 +188,45 @@ public class QmsPqcTicketMyDetailVO { */ @Data public static class MeasureVO { + + /** + * 处理方案明细ID + */ private Long id; + + /** + * 处理人ID + */ + private Long handlerUserId; + + /** + * 措施类型ID + */ private Long measureTypeId; + + /** + * 措施内容 + */ private String measureContent; + + /** + * 负责人 + */ private String chargeUser; + + /** + * 计划日期 + */ private LocalDate planDate; + + /** + * 确认日期 + */ private LocalDate confirmDate; + + /** + * 备注 + */ private String remark; }