From 6a710cc641449059a315ac6038615d0fa17649c4 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 15 Aug 2025 13:57:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(is):=20=E4=BC=98=E5=8C=96=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=92=8C=E6=A0=B7=E5=93=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在检验任务中添加负责人昵称字段- 移除样品库存中的操作人和最后更新时间字段 - 更新相关实体类和接口以适应这些变更 --- .../com/klp/mes/is/domain/IsSampleInventory.java | 9 +-------- .../klp/mes/is/domain/bo/IsSampleInventoryBo.java | 10 +--------- .../klp/mes/is/domain/vo/IsInspectionTaskVo.java | 7 +++++++ .../klp/mes/is/domain/vo/IsSampleInventoryVo.java | 14 ++------------ .../service/impl/IsSampleInventoryServiceImpl.java | 2 -- .../resources/mapper/is/IsInspectionTaskMapper.xml | 2 ++ 6 files changed, 13 insertions(+), 31 deletions(-) diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/IsSampleInventory.java b/klp-mes/src/main/java/com/klp/mes/is/domain/IsSampleInventory.java index abf535bc..2c01fa5e 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/IsSampleInventory.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/IsSampleInventory.java @@ -50,14 +50,7 @@ public class IsSampleInventory extends BaseEntity { * 状态 */ private String status; - /** - * 操作人（用户ID） - */ - private Long operatorId; - /** - * 最后更新时间 - */ - private Date lastUpdate; + /** * 删除标志（0=正常，1=删除） */ diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java index 09c8d423..729612ce 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java @@ -57,16 +57,8 @@ public class IsSampleInventoryBo extends BaseEntity { */ private String status; - /** - * 操作人（用户ID） - */ - private Long operatorId; - /** - * 最后更新时间 - */ - @DateTimeFormat("yyyy-MM-dd") - private Date lastUpdate; + /** * 备注 diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java index 62389971..2f2fff01 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java @@ -100,5 +100,12 @@ public class IsInspectionTaskVo { @ExcelProperty(value = "关联委托单号") private String commissionNo; + //NickName + /** + * 负责人昵称 + */ + @ExcelProperty(value = "负责人昵称") + private String nickName; + } diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java index d778c4fc..bd927fe4 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java @@ -68,19 +68,9 @@ public class IsSampleInventoryVo { @ExcelProperty(value = "状态") private String status; - /** - * 操作人（用户ID） - */ - @ExcelProperty(value = "操作人", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "用=户ID") - private Long operatorId; - /** - * 最后更新时间 - */ - @DateTimeFormat("yyyy-MM-dd") - @ExcelProperty(value = "最后更新时间") - private Date lastUpdate; + + /** * 备注 diff --git a/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsSampleInventoryServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsSampleInventoryServiceImpl.java index 9ad5ffa4..f6386b82 100644 --- a/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsSampleInventoryServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsSampleInventoryServiceImpl.java @@ -66,8 +66,6 @@ public class IsSampleInventoryServiceImpl implements IIsSampleInventoryService { lqw.eq(bo.getStorageTime() != null, IsSampleInventory::getStorageTime, bo.getStorageTime()); lqw.eq(bo.getExpirationDate() != null, IsSampleInventory::getExpirationDate, bo.getExpirationDate()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IsSampleInventory::getStatus, bo.getStatus()); - lqw.eq(bo.getOperatorId() != null, IsSampleInventory::getOperatorId, bo.getOperatorId()); - lqw.eq(bo.getLastUpdate() != null, IsSampleInventory::getLastUpdate, bo.getLastUpdate()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml b/klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml index 653ec31a..b4eb40b8 100644 --- a/klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml @@ -29,6 +29,7 @@ t.commission_id, c.commission_no, t.assigned_to, + u.nick_name AS assigned_to_name, t.start_time, t.end_time, t.result, @@ -43,6 +44,7 @@ t.remark FROM is_inspection_task t LEFT JOIN is_inspection_commission c ON t.commission_id = c.commission_id AND c.del_flag = 0 + LEFT JOIN sys_user u ON t.assigned_to = u.user_id AND u.del_flag = 0 t.del_flag = 0