出库操作2.0

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

@@ -90,10 +90,14 @@ public class SpecimenOutboundEditRespVO {
     @ExcelProperty("二审驳回原因")
     private String rejectionReasons;
 
-    @Schema(description = "出库员")
+    @Schema(description = "出库确认员A")
-    @ExcelProperty("出库员")
+    @ExcelProperty("出库确认员A")
     private String operator;
 
+    @Schema(description = "出库确认员B")
+    @ExcelProperty("出库确认员B")
+    private String twoOperator;
+
     @Schema(description = "退还人")
     @ExcelProperty("退还人")
     private String returner;

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

@@ -68,8 +68,11 @@ public class SpecimenOutboundPageReqVO extends PageParam {
     @Schema(description = "二审驳回原因", example = "27504")
     private String rejectionReasons;
 
-    @Schema(description = "出库员")
+    @Schema(description = "出库确认员A")
-    private String operator;
+    private Long operator;
+
+    @Schema(description = "出库确认员B")
+    private Long twoOperator;
 
     @Schema(description = "出库时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

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

@@ -92,7 +92,11 @@ public class SpecimenOutboundRespVO {
 
     @Schema(description = "出库员")
     @ExcelProperty("出库员")
-    private String operator;
+    private Long operator;
+
+    @Schema(description = "出库确认员B")
+    @ExcelProperty("出库确认员B")
+    private Long twoOperator;
 
     @Schema(description = "退还人")
     @ExcelProperty("退还人")

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

@@ -70,10 +70,14 @@ public class SpecimenOutboundWithInfoRespVO {
     @ExcelProperty("二审审批建议")
     private String rejectionReasons;
 
-    @Schema(description = "出库员")
+    @Schema(description = "出库确认员A")
-    @ExcelProperty("出库员")
+    @ExcelProperty("出库确认员A")
     private String operator;
 
+    @Schema(description = "出库确认员B")
+    @ExcelProperty("出库确认员B")
+    private String twoOperator;
+
     @Schema(description = "出库时间")
     @ExcelProperty("出库时间")
     private LocalDateTime outgoingTime;

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

@@ -455,9 +455,12 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
 
         // 获取出库员昵称并设置到返回对象
         String operatorNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getOperator());
+        String twoOperatorNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getTwoOperator());
         String approveUsersNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getApproveUsers());
         String twoApproveUsersNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getTwoApproveUsers());
+
         response.setOperator(operatorNickname)
+                .setOperator(twoOperatorNickname)
                 .setApproveUsers(approveUsersNickname)
                 .setTwoApproveUsers(twoApproveUsersNickname);  // 设置操作员（出库员）的昵称