feat(is): 优化检验任务和样品库存相关功能

- 在检验任务中添加负责人昵称字段- 移除样品库存中的操作人和最后更新时间字段
- 更新相关实体类和接口以适应这些变更

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=删除）
      */

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;
 
     /**
      * 备注

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;
+
 
 }

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;
 
     /**
      * 备注

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;
     }
 

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
         <where>
             t.del_flag = 0
             <if test="bo.taskNo != null and bo.taskNo != ''">