修改了一下审批人为STRING

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/SpecimenOutboundController.java

@@ -30,6 +30,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
 import static cn.iocoder.yudao.module.museums.enums.ErrorCodeConstants.*;
 
 import cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo.*;
@@ -61,6 +62,7 @@ public class SpecimenOutboundController {
     @PreAuthorize("@ss.hasPermission('museums:specimen-outbound:approve')")
     public CommonResult<Boolean> approveSpecimenOutbound(@RequestBody SpecimenOutboundApprovalReqVO req) {
         Long operatorId = getLoginUserId();
+        String operator = getLoginUserNickname();
         LocalDateTime now = LocalDateTime.now();
         // 验证审批类型
         if (req.getStatus() == 1 || req.getStatus() == 2) {
@@ -68,14 +70,14 @@ public class SpecimenOutboundController {
             if (!permissionApi.hasAnyRoles(operatorId, "deputy_leader")) {
                 throw exception(USER_NOT_HAVE_THE_RIGHT_FIRST_INSTANCE);
             }
-            req.setApproveUsers(operatorId);
+            req.setApproveUsers(operator);
             req.setApprovalTime(now);
         } else if (req.getStatus() == 5 || req.getStatus() == 6) {
             // 二审逻辑
             if (!permissionApi.hasAnyRoles(operatorId, "leadership")) {
                 throw exception(USER_NOT_HAVE_THE_RIGHT_SECOND_INSTANCE);
             }
-            req.setTwoApproveUsers(operatorId);
+            req.setTwoApproveUsers(operator);
             req.setTwoApprovalTime(now);
         } else {
             throw exception(INVALID_APPROVAL_STATUS);
@@ -116,7 +118,7 @@ public class SpecimenOutboundController {
     @Operation(summary = "确认标本出库")
     @PreAuthorize("@ss.hasPermission('museums:specimen-outbound:confirm')")
     public CommonResult<Boolean> confirmOutbound(@Valid @RequestBody SpecimenOutboundConfirmReqVO req) {
-        specimenOutboundService.confirmOutbound(req.getId(), getLoginUserId());
+        specimenOutboundService.confirmOutbound(req.getId(), getLoginUserNickname());
         return success(true);
     }
 

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundApprovalReqVO.java

@@ -26,10 +26,10 @@ public class SpecimenOutboundApprovalReqVO {
     private String rejectionReasons ;
 
     @Schema(description = "一审批员", example = "100")
-    private Long approveUsers;
+    private String approveUsers;
 
     @Schema(description = "二审批员", example = "101")
-    private Long twoApproveUsers;
+    private String twoApproveUsers;
 
     @Schema(description = "一审时间")
     private LocalDateTime approvalTime;

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundEditRespVO.java

@@ -92,7 +92,7 @@ public class SpecimenOutboundEditRespVO {
 
     @Schema(description = "出库员")
     @ExcelProperty("出库员")
-    private Long operator;
+    private String operator;
 
     @Schema(description = "退还人")
     @ExcelProperty("退还人")
@@ -116,9 +116,9 @@ public class SpecimenOutboundEditRespVO {
 
     @Schema(description = "一审批员")
     @ExcelProperty("一审批员")
-    private Long approveUsers;
+    private String approveUsers;
 
     @Schema(description = "二审批员")
     @ExcelProperty("二审批员")
-    private Long twoApproveUsers;
+    private String twoApproveUsers;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundPageReqVO.java

@@ -70,7 +70,7 @@ public class SpecimenOutboundPageReqVO extends PageParam {
     private String rejectionReasons;
 
     @Schema(description = "出库员")
-    private Long operator;
+    private String operator;
 
     @Schema(description = "出库时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -95,8 +95,8 @@ public class SpecimenOutboundPageReqVO extends PageParam {
     private LocalDateTime[] twoApprovalTime;
 
     @Schema(description = "一审批员")
-    private Long approveUsers;
+    private String approveUsers;
 
     @Schema(description = "二审批员")
-    private Long twoApproveUsers;
+    private String twoApproveUsers;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundRespVO.java

@@ -95,7 +95,7 @@ public class SpecimenOutboundRespVO {
 
     @Schema(description = "出库员")
     @ExcelProperty("出库员")
-    private Long operator;
+    private String operator;
 
     @Schema(description = "退还人")
     @ExcelProperty("退还人")
@@ -119,9 +119,9 @@ public class SpecimenOutboundRespVO {
 
     @Schema(description = "一审批员")
     @ExcelProperty("一审批员")
-    private Long approveUsers;
+    private String approveUsers;
 
     @Schema(description = "二审批员")
     @ExcelProperty("二审批员")
-    private Long twoApproveUsers;
+    private String twoApproveUsers;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundReturnRespVO.java

@@ -91,7 +91,7 @@ public class SpecimenOutboundReturnRespVO {
 
     @Schema(description = "出库员")
     @ExcelProperty("出库员")
-    private Long operator;
+    private String operator;
 
     @Schema(description = "出库时间")
     @ExcelProperty("出库时间")
@@ -119,9 +119,9 @@ public class SpecimenOutboundReturnRespVO {
 
     @Schema(description = "一审批员")
     @ExcelProperty("一审批员")
-    private Long approveUsers;
+    private String approveUsers;
 
     @Schema(description = "二审批员")
     @ExcelProperty("二审批员")
-    private Long twoApproveUsers;
+    private String twoApproveUsers;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundWithInfoRespVO.java

@@ -75,7 +75,7 @@ public class SpecimenOutboundWithInfoRespVO {
 
     @Schema(description = "出库员")
     @ExcelProperty("出库员")
-    private Long operator;
+    private String operator;
 
     @Schema(description = "出库时间")
     @ExcelProperty("出库时间")
@@ -103,11 +103,11 @@ public class SpecimenOutboundWithInfoRespVO {
 
     @Schema(description = "一审批员")
     @ExcelProperty("一审批员")
-    private Long approveUsers;
+    private String approveUsers;
 
     @Schema(description = "二审批员")
     @ExcelProperty("二审批员")
-    private Long twoApproveUsers;
+    private String twoApproveUsers;
 
     @Schema(description = "回库备注信息")
     @ExcelProperty("回库备注信息")

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/dataobject/specimenoutbound/SpecimenOutboundDO.java

@@ -97,7 +97,7 @@ public class SpecimenOutboundDO extends BaseDO {
     /**
      * 出库员
      */
-    private Long operator;
+    private String operator;
     /**
      * 出库时间
      */
@@ -125,9 +125,9 @@ public class SpecimenOutboundDO extends BaseDO {
     /**
      * 一审批员
      */
-    private Long approveUsers;
+    private String approveUsers;
     /**
      * 二审批员
      */
-    private Long twoApproveUsers;
+    private String twoApproveUsers;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/service/specimenoutbound/SpecimenOutboundService.java

@@ -39,7 +39,7 @@ public interface SpecimenOutboundService {
      * @param operator 出库员ID
      * @return
      */
-    String confirmOutbound(Long id, Long operator);
+    String confirmOutbound(Long id, String operator);
 
     /**
      * 删除标本出库回库信息

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/service/specimenoutbound/SpecimenOutboundServiceImpl.java

@@ -118,7 +118,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
             specimenOutbound.setStatus(req.getStatus());
             specimenOutbound.setProcessInstanceId(req.getProcessInstanceId());
             specimenOutbound.setApprovalTime(req.getApprovalTime()); // 设置当前审批时间
-            specimenOutbound.setApproveUsers(getLoginUserId()); // 设置操作员 ID
+            specimenOutbound.setApproveUsers(getLoginUserNickname()); // 设置一审操作员
         }
 
         // 二审逻辑
@@ -132,7 +132,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
             specimenOutbound.setStatus(req.getStatus());
             specimenOutbound.setRejectionReasons(req.getRejectionReasons());
             specimenOutbound.setTwoApprovalTime(req.getTwoApprovalTime()); // 设置当前审批时间
-            specimenOutbound.setTwoApproveUsers(getLoginUserId()); // 设置二审操作员 ID
+            specimenOutbound.setTwoApproveUsers(getLoginUserNickname()); // 设置二审操作员
         }
         LogRecordContext.putVariable("rejectionReasons", req.getRejectionReasons());
         LogRecordContext.putVariable("processInstanceId", req.getProcessInstanceId());
@@ -190,7 +190,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
             bizNo = "{{#existingSpecimen.id}}", // 使用出库单 ID
             success = MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS,
             extra = "{{#existingSpecimen.infoId}}") // 使用标本信息 ID
-    public String confirmOutbound(Long id, Long operator) {
+    public String confirmOutbound(Long id, String operator) {
         // 校验存在
         validateSpecimenOutboundExists(id);
 
@@ -201,7 +201,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
             throw exception(ONLY_PASSED_SECOND_INSTANCE_OUTBOUND);
         }
         existingSpecimen.setStatus(3) // 更新状态为已出库（3）
-                .setOperator(operator) // 设置出库员ID
+                .setOperator(operator) // 设置出库员
                 .setOutgoingTime(LocalDateTime.now()); // 设置出库时间
 
         // 更新数据库