From 20bb9b761a685e6c5ee3a9231726510b63cbfa2e Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Tue, 28 Apr 2026 18:34:46 +0800 Subject: [PATCH] =?UTF-8?q?pdi=E6=A3=80=E9=AA=8C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=20=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsPdiDetectionRulesControllerService.java | 4 ++-- .../QmsPdiStatusItemControllerService.java | 16 ++++++++-------- .../pojo/dto/QmsPdiStatusItemExportDTO.java | 8 ++++---- .../common/pojo/vo/QmsPdiStatusItemGroupVO.java | 8 ++++---- .../entity/QmsPdiDetectionRulesStatusItem.java | 8 ++++---- .../QmsPdiDetectionRulesStatusItemMapper.xml | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java index fd3a0908..dda6ad64 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java @@ -228,8 +228,8 @@ public class QmsPdiDetectionRulesControllerService { .setInspectionImage(item.getInspectionImage()) .setStatus(item.getStatus()) .setSort(item.getSort()) - .setSetBy(operator) - .setSetTime(now)) + .setCreateBy(operator) + .setCreateTime(now)) .collect(java.util.stream.Collectors.toList()); statusItemService.saveBatch(newStatusItems); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java index 959aed00..810fdd06 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java @@ -84,8 +84,8 @@ public class QmsPdiStatusItemControllerService { .setInspectionImage(request.getInspectionImage()) .setStatus(request.getStatus()) .setSort(1) // 新数据sort=1 - .setSetBy(operator) - .setSetTime(now); + .setCreateBy(operator) + .setCreateTime(now); statusItemService.save(entity); markMaintained(request.getDetectionRulesId()); } @@ -104,8 +104,8 @@ public class QmsPdiStatusItemControllerService { String operator = UserUtil.getUserName(); var updateChain = statusItemService.lambdaUpdate() .eq(QmsPdiDetectionRulesStatusItem::getId, request.getId()) - .set(QmsPdiDetectionRulesStatusItem::getSetBy, operator) - .set(QmsPdiDetectionRulesStatusItem::getSetTime, LocalDateTime.now()); + .set(QmsPdiDetectionRulesStatusItem::getCreateBy, operator) + .set(QmsPdiDetectionRulesStatusItem::getCreateTime, LocalDateTime.now()); if (StrUtil.isNotBlank(request.getComponentsDes())) { updateChain.set(QmsPdiDetectionRulesStatusItem::getComponentsDes, request.getComponentsDes()); } @@ -201,8 +201,8 @@ public class QmsPdiStatusItemControllerService { .setInspectionImage(dto.getInspectionImage()) .setSort(dto.getSort()) .setStatus(status) - .setSetBy(operator) - .setSetTime(now); + .setCreateBy(operator) + .setCreateTime(now); }) .collect(Collectors.toList()); if (CollectionUtil.isEmpty(entities)) { @@ -254,8 +254,8 @@ public class QmsPdiStatusItemControllerService { vo.setInspectionImage(item.getInspectionImage()); vo.setStatus(item.getStatus()); vo.setSort(item.getSort()); - vo.setSetBy(item.getSetBy()); - vo.setSetTime(item.getSetTime()); + vo.setCreateBy(item.getCreateBy()); + vo.setCreateTime(item.getCreateTime()); return vo; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsPdiStatusItemExportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsPdiStatusItemExportDTO.java index 210ceb73..d27b8809 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsPdiStatusItemExportDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsPdiStatusItemExportDTO.java @@ -25,9 +25,9 @@ public class QmsPdiStatusItemExportDTO { @ExcelColumn("状态") private String statusName; - @ExcelColumn("设置人") - private String setBy; + @ExcelColumn("创建人") + private String createBy; - @ExcelColumn("设置时间") - private LocalDateTime setTime; + @ExcelColumn("创建时间") + private LocalDateTime createTime; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java index 0e8d5351..ecdfbf42 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java @@ -63,13 +63,13 @@ public class QmsPdiStatusItemGroupVO { private Integer sort; /** - * 设置人 + * 创建人 */ - private String setBy; + private String createBy; /** - * 设置时间 + * 创建时间 */ - private LocalDateTime setTime; + private LocalDateTime createTime; } } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiDetectionRulesStatusItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiDetectionRulesStatusItem.java index 5d4b06aa..688f1cfe 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiDetectionRulesStatusItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiDetectionRulesStatusItem.java @@ -57,12 +57,12 @@ public class QmsPdiDetectionRulesStatusItem implements Serializable { private Integer sort; /** - * 设置人 + * 创建人 */ - private String setBy; + private String createBy; /** - * 设置时间 + * 创建时间 */ - private LocalDateTime setTime; + private LocalDateTime createTime; } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsPdiDetectionRulesStatusItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiDetectionRulesStatusItemMapper.xml index 710297a7..f84d6b84 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiDetectionRulesStatusItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiDetectionRulesStatusItemMapper.xml @@ -9,8 +9,8 @@ s.inspection_content, s.inspection_image, CASE s.status WHEN 0 THEN '静态' WHEN 1 THEN '动态' WHEN 2 THEN '特殊' ELSE '' END AS status_name, - s.set_by, - s.set_time + s.create_by, + s.create_time FROM qms_pdi_detection_rules_status_item s WHERE s.detection_rules_id = #{detectionRulesId} AND s.status IN