标本编号

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

@@ -142,9 +142,9 @@ public class SpecimenOutboundController {
     @Operation(summary = "获得标本出库回库信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('museums:specimen-outbound:query')")
-    public CommonResult<SpecimenOutboundRespVO> getSpecimenOutbound(@RequestParam("id") Long id) {
+    public CommonResult<SpecimenOutboundEditRespVO> getSpecimenOutbound(@RequestParam("id") Long id) {
         SpecimenOutboundDO specimenOutbound = specimenOutboundService.getSpecimenOutbound(id);
-        return success(BeanUtils.toBean(specimenOutbound, SpecimenOutboundRespVO.class));
+        return success(BeanUtils.toBean(specimenOutbound, SpecimenOutboundEditRespVO.class));
     }
 
     @GetMapping("/getReturn")

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

@@ -0,0 +1,124 @@
+package cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo;
+
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.museums.enums.DictTypeConstants;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 标本出库回库信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+
+public class SpecimenOutboundEditRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "关联到总表中的标本ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("关联到总表中的标本ID")
+    private List<String> infoId;
+
+    @Schema(description = "申请出库的标本编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("申请出库的标本编号")
+    private List<String> number;
+
+    @Schema(description = "申请人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("申请人姓名")
+    private String applicantName;
+
+    @Schema(description = "申请单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "地质博物馆")
+    @ExcelProperty("申请单位")
+    private String applicationUsage;
+
+    @Schema(description = "电话号码", requiredMode = Schema.RequiredMode.REQUIRED, example = "19900000000")
+    @ExcelProperty("电话号码")
+    private String phoneNumber;
+
+    @Schema(description = "研究项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研究")
+    @ExcelProperty("研究项目名称")
+    private String projectName;
+
+    @Schema(description = "项目开始时间")
+    @ExcelProperty("项目开始时间")
+    private LocalDateTime startTime;
+
+    @Schema(description = "项目结束时间")
+    @ExcelProperty("项目结束时间")
+    private LocalDateTime endTime;
+
+    @Schema(description = "出库备注信息")
+    @ExcelProperty("出库备注信息")
+    private String outboundRemarks;
+
+    @Schema(description = "出库附件上传")
+    @ExcelProperty("出库附件上传")
+    private String attachments;
+
+    @Schema(description = "审批状态", example = "2")
+    @ExcelProperty(value = "审批状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.MUSEUMS_APPROAL_STATUS)
+    private Integer status;
+
+    @Schema(description = "回库备注信息")
+    @ExcelProperty("回库备注信息")
+    private String remarks;
+
+    @Schema(description = "标本情况")
+    @ExcelProperty("标本情况")
+    private String specimenCondition;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @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 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;
+}

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/mysql/specimeninfo/SpecimenInfoMapper.java

@@ -155,13 +155,8 @@ public interface SpecimenInfoMapper extends BaseMapperX<SpecimenInfoDO> {
     @Select("SELECT * FROM museums_specimen_info WHERE image_name LIKE CONCAT('%', #{imageName}, '%')")
     SpecimenInfoDO selectByImageNames(@Param("imageName") String imageName);
 
-
-    // 根据多个 ID 查询标本信息
-    List<SpecimenOutboundFormRespVO> selectByIds(List<Long> ids);
-
     List<Map<String, Object>> selectMonthlyEntryStatisticsByYear(@Param("year") int year);
 
-
     boolean existsByNumber(String number);
 
 

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

@@ -379,7 +379,8 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
 
         // 创建返回对象
         SpecimenOutboundWithInfoRespVO response = BeanUtils.toBean(specimenOutbound, SpecimenOutboundWithInfoRespVO.class);
-        response.setSpecimenInfoList(pageResultVO); // 设置分页后的标本信息列表
+        // 设置分页后的标本信息列表
+        response.setSpecimenInfoList(pageResultVO);
 
         return response;
     }