完善了有些字段没有传回前端的问题

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

@@ -73,6 +73,10 @@ public class SpecimenOutboundRespVO {
     @ExcelProperty("标本情况")
     private String specimenCondition;
 
+    @Schema(description = "出库时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("出库时间")
+    private LocalDateTime outgoingTime;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -93,6 +93,10 @@ public class SpecimenOutboundReturnRespVO {
     @ExcelProperty("出库员")
     private Long operator;
 
+    @Schema(description = "出库时间")
+    @ExcelProperty("出库时间")
+    private LocalDateTime outgoingTime;
+
     @Schema(description = "退还人")
     @ExcelProperty("退还人")
     private String returner;
@@ -109,6 +113,10 @@ public class SpecimenOutboundReturnRespVO {
     @ExcelProperty("一审时间")
     private LocalDateTime approvalTime;
 
+    @Schema(description = "二审时间")
+    @ExcelProperty("二审时间")
+    private LocalDateTime twoApprovalTime;
+
     @Schema(description = "一审批员")
     @ExcelProperty("一审批员")
     private Long approveUsers;

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

@@ -24,14 +24,6 @@ public class SpecimenOutboundWithInfoRespVO {
     @ExcelProperty("主键")
     private Long id;
 
-    @Schema(description = "关联到总表中的标本ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("关联到总表中的标本ID")
-    private String infoId;
-
-    @Schema(description = "申请出库的标本编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("申请出库的标本编号")
-    private String number;
-
     @Schema(description = "申请人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
     @ExcelProperty("申请人姓名")
     private String applicantName;
@@ -69,6 +61,58 @@ public class SpecimenOutboundWithInfoRespVO {
     @DictFormat(DictTypeConstants.MUSEUMS_APPROAL_STATUS)
     private Integer status;
 
+    @Schema(description = "回库附件上传", example = "2")
+    @ExcelProperty(value = "回库附件上传")
+    private String sampleStatus;
+
+    @Schema(description = "一审审批建议", example = "27504")
+    @ExcelProperty("一审审批建议")
+    private String processInstanceId;
+
+    @Schema(description = "二审审批建议", example = "27504")
+    @ExcelProperty("二审审批建议")
+    private String rejectionReasons;
+
+    @Schema(description = "出库员")
+    @ExcelProperty("出库员")
+    private Long operator;
+
+    @Schema(description = "出库时间")
+    @ExcelProperty("出库时间")
+    private LocalDateTime outgoingTime;
+
+    @Schema(description = "退还人")
+    @ExcelProperty("退还人")
+    private String returner;
+
+    @Schema(description = "点收人")
+    @ExcelProperty("点收人")
+    private String receiver;
+
+    @Schema(description = "退还日期")
+    @ExcelProperty("退还日期")
+    private LocalDateTime returnDate;
+
+    @Schema(description = "一审时间")
+    @ExcelProperty("一审时间")
+    private LocalDateTime approvalTime;
+
+    @Schema(description = "二审时间")
+    @ExcelProperty("二审时间")
+    private LocalDateTime twoApprovalTime;
+
+    @Schema(description = "一审批员")
+    @ExcelProperty("一审批员")
+    private Long approveUsers;
+
+    @Schema(description = "二审批员")
+    @ExcelProperty("二审批员")
+    private Long twoApproveUsers;
+
+    @Schema(description = "回库备注信息")
+    @ExcelProperty("回库备注信息")
+    private String remarks;
+
     @Schema(description = "关联标本信息分页")
     @ExcelProperty("关联标本信息")
     private PageResult<SpecimenInfoRespVO> specimenInfoList;

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

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.museums.service.specimenoutbound;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenInfoPageReqVO;
 import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenInfoRespVO;
-import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenOutboundFormRespVO;
 import cn.iocoder.yudao.module.museums.dal.dataobject.specimeninfo.SpecimenInfoDO;
 import cn.iocoder.yudao.module.museums.dal.mysql.specimeninfo.SpecimenInfoMapper;
 import com.mzt.logapi.context.LogRecordContext;
@@ -31,7 +30,6 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
 import static cn.iocoder.yudao.module.museums.enums.ErrorCodeConstants.*;
 import static cn.iocoder.yudao.module.museums.enums.social.LogRecordConstants.*;
-import static cn.iocoder.yudao.module.system.enums.LogRecordConstants.*;
 
 
 /**