审批人本来存昵称，现在改为存id

yudao-module-museums/yudao-module-museums-api/src/main/java/cn/iocoder/yudao/module/museums/enums/common/PreservationTypeEnum.java

@@ -21,5 +21,5 @@ public enum PreservationTypeEnum {
     OTHER(6);
 
     /** 保存类型值 */
-    private final Integer type;
+    private final Integer preservationType;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/museumsdocument/MuseumsDocumentController.java

@@ -95,15 +95,4 @@ public class MuseumsDocumentController {
         ExcelUtils.write(response, "博物馆文件管理.xls", "数据", MuseumsDocumentRespVO.class,
                         BeanUtils.toBean(list, MuseumsDocumentRespVO.class));
     }
-
-//    @PostMapping("/upload")
-//    @Operation(summary = "上传文件", description = "模式一：后端上传文件")
-//    public CommonResult<String> uploadFile(@NotNull @RequestPart("file") MultipartFile file,
-//                                           @RequestPart(value = "path", required = false) String path,
-//                                           @AuthenticationPrincipal UserDetails userDetails) throws Exception {
-//        String uploadedBy = userDetails.getUsername(); // 获取上传者信息
-//        return success(documentService.createDocument(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream()), uploadedBy));
-//    }
-
-
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/museumsdocument/vo/DocumentUploadReqVO.java

@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.museums.controller.admin.museumsdocument.vo;
-
-import com.sun.istack.internal.NotNull;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 博物馆文件管理新增/修改 Request VO")
-@Data
-public class DocumentUploadReqVO {
-
-    @Schema(description = "文件", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "文件不能为空")
-    private MultipartFile file;
-
-    @Schema(description = "文件附件路径", example = "yudaoyuanma.png")
-    private String path;
-}

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photos/PhotosController.java

@@ -124,5 +124,4 @@ public class PhotosController {
             throw exception(PHOTO_GROUP_UPLOAD_FAILED);
         }
     }
-
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photos/vo/PhotosPageReqVO.java

@@ -24,11 +24,7 @@ public class PhotosPageReqVO extends PageParam {
     @Schema(description = "照片存储路径", example = "https://www.iocoder.cn")
     private String photoUrl;
 
-    @Schema(description = "上传时间")
-    private LocalDateTime createdAt;
-
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photos/vo/PhotosRespVO.java

@@ -24,10 +24,6 @@ public class PhotosRespVO {
     @ExcelProperty("照片存储路径")
     private String photoUrl;
 
-    @Schema(description = "上传时间")
-    @ExcelProperty("上传时间")
-    private LocalDateTime createdAt;
-
     @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/photos/vo/PhotosSaveReqVO.java

@@ -15,14 +15,9 @@ public class PhotosSaveReqVO {
     private Integer id;
 
     @Schema(description = "照片组表id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5803")
-//    @NotNull(message = "照片组表id不能为空")
     private Integer groupId;
 
     @Schema(description = "照片存储路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
     @NotEmpty(message = "照片存储路径不能为空")
     private List<String> photoUrl;
-
-    @Schema(description = "上传时间")
-    private LocalDateTime createdAt;
-
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/SpecimenInfoController.java

@@ -126,7 +126,7 @@ public class SpecimenInfoController {
                         .englishName("keichousaurus")  // 外文名称
                         .specimenType(SpecimenTypeEnum.FOSSIL.getType()) // 使用枚举：标本类型（矿物/矿石/岩石/化石/陨石）
                         .storageLocation("临展厅")  // 存放位置
-                        .preservationType(PreservationTypeEnum.SPECIMEN.getType()) // 使用枚举：保存类型（标本/原石/光片/薄片/切片/模型及其他）
+                        .preservationType(PreservationTypeEnum.SPECIMEN.getPreservationType()) // 使用枚举：保存类型（标本/原石/光片/薄片/切片/模型及其他）
                         .saveStatus(SaveStatusEnum.COMPLETE.getSaveStatus())  // 保存状态（完整/受损/严重受损/无实物）
                         .specimenAmount(1)  // 数量（件/套）
                         .size("1000cm")  // 规格（cm）
@@ -234,20 +234,6 @@ public class SpecimenInfoController {
         return CommonResult.success(yearlySourceStatistics);
     }
 
-//    @GetMapping("/logs")
-//    @Operation(summary = "获得标本相关的系统日志")
-//    @Parameter(name = "specimenId", description = "标本编号", required = true, example = "1024")
-//    @Parameter(name = "moduleType", description = "操作模块类型", required = true, example = "MUSEUMS 标本")
-//    public CommonResult<List<OperateLogRespVO>> getSpecimenLogs(
-//            @RequestParam("specimenId") List<String> extra,
-//            @RequestParam("moduleType") String type) {
-//        OperateLogPageReqVO pageReqDTO=new OperateLogPageReqVO();
-//        pageReqDTO.setType(type);
-//        pageReqDTO.setExtra(extra);
-//        List<OperateLogDO> logs = operateLogService.getLogsBySpecimenIdAndType(pageReqDTO);
-//        return success(BeanUtils.toBean(logs, OperateLogRespVO.class));
-//    }
-
     @GetMapping("/logs")
     @Operation(summary = "获得标本相关的系统日志")
     @Parameter(name = "specimenId", description = "标本编号", required = true, example = "1024")

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/vo/SpecimenImportExcelVO.java

@@ -42,7 +42,6 @@ public class SpecimenImportExcelVO {
     @DictFormat(DictTypeConstants.MUSEUMS_SPECIMEN_INFO)
     private Integer preservationType;
 
-    //保存状态（完整/受损/严重受损/无实物）
     @ExcelProperty(value = "保存状态（完整/受损/严重受损/无实物）", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.MUSEUMS_SPECIMEN_PRESERVATION_STATUS)
     private Integer saveStatus;
@@ -62,11 +61,9 @@ public class SpecimenImportExcelVO {
     @ExcelProperty("产地/发现地（市级县级产地）")
     private String origin;
 
-    //省
     @ExcelProperty("省")
     private String economize;
 
-    //国家
     @ExcelProperty("国家")
     private String country;
 
@@ -101,7 +98,6 @@ public class SpecimenImportExcelVO {
     @ExcelProperty("入藏时间")
     private String acquisitionTime;
 
-    //主要用途（工业原料/药用/建材/科学研究/观赏/其它）
     @ExcelProperty(value = "主要用途（工业原料/药用/建材/科学研究/观赏/其它）", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.MUSEUMS_SPECIMEN_MAIN_USES)
     private Integer mainPurpose;

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/vo/SpecimenImportRespVO.java

@@ -25,18 +25,11 @@ public class SpecimenImportRespVO {
     private Map<String, String> failureSpecimenNumbers;
 
     @Schema(description = "成功导入的标本id", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<Long> createdSpecimenIds; // 新增字段
+    private List<Long> createdSpecimenIds;
 
     @Schema(description = "创建成功的图片名称数组", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<String> createSpecimenImages;
 
     @Schema(description = "导入失败的图片集合，key 为图片名称，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
     private Map<String, String> failureSpecimenImages;
-
-    @Schema(description = "失败的图片数量", requiredMode = Schema.RequiredMode.REQUIRED)
-    private int successCount;
-
-    @Schema(description = "失败的图片数量", requiredMode = Schema.RequiredMode.REQUIRED)
-    private int failureCount;
-
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/vo/SpecimenInfoExportRespVO.java

@@ -154,19 +154,7 @@ public class SpecimenInfoExportRespVO {
     @ExcelProperty("入库操作员")
     private String operator;
 
-//    @Schema(description = "入库时间")
-//    @ExcelProperty("入库时间")
-//    private LocalDateTime entryDate;
-
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
-
-//    @Schema(description = "注销原因", example = "不香")
-//    @ExcelProperty("注销原因")
-//    private String deletedReason;
-
-    //    @Schema(description = "图片路径")
-    //    @ExcelProperty("图片路径")
-    //    private List<String> imagePath;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/vo/SpecimenOutboundFormRespVO.java

@@ -1,60 +0,0 @@
-package cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 标本出库单 Request VO")
-@Data
-public class SpecimenOutboundFormRespVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer id;
-
-    @Schema(description = "标本类型（矿物、岩石矿石、化石、陨石）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "标本类型（矿物、岩石矿石、化石、陨石）不能为空")
-    private Integer specimenType;
-
-    @Schema(description = "标本编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "标本编号不能为空")
-    private String specimenNumber;
-
-    @Schema(description = "中文名称", example = "赵六")
-    private String chineseName;
-
-    @Schema(description = "英文名称", example = "Maven")
-    private String englishName;
-
-    @Schema(description = "保存类型（标本、光片、薄片模型及其他）", example = "1")
-    private Integer preservationType;
-
-    @Schema(description = "保存状态（完整/受损/严重受损/无实物）", example = "1")
-    private Integer saveStatus;
-
-    @Schema(description = "重量")
-    private String weight;
-
-    @Schema(description = "存放位置")
-    private String storageLocation;
-
-    @Schema(description = "图片名称", example = "芋艿")
-    private String imageName;
-
-    @Schema(description = "图片路径")
-    private String imagePath;
-
-    @Schema(description = "数量（件/套）")
-    private Integer specimenAmount;
-
-    @Schema(description = "规格（cm）")
-    private String size;
-
-    @Schema(description = "主要用途（工业原料/药用/建材/科学研究/观赏/其它）", example = "1")
-    private Integer mainPurpose;
-
-    @Schema(description = "馆藏状态（在馆/展陈/借出）")
-    private Integer collectionStatus;
-
-    @Schema(description = "具体用途")
-    private String purpose;
-}

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

@@ -118,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(), getLoginUserNickname());
+        specimenOutboundService.confirmOutbound(req.getId(), getLoginUserId());
         return success(true);
     }
 
@@ -149,19 +149,6 @@ public class SpecimenOutboundController {
         return success(BeanUtils.toBean(specimenOutbound, SpecimenOutboundEditRespVO.class));
     }
 
-//    @GetMapping("/getReturn")
-//    @Operation(summary = "获得标本回库信息")
-//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-//    @PreAuthorize("@ss.hasPermission('museums:specimen-outbound:return')")
-//    public CommonResult<SpecimenOutboundRespVO> getSpecimenReturnInformation(@RequestParam("id") Long id) {
-//        SpecimenOutboundDO specimenOutbound = specimenOutboundService.getSpecimenReturnInformation(id);
-//        if (specimenOutbound != null && specimenOutbound.getStatus() == 4) {
-//            return success(BeanUtils.toBean(specimenOutbound, SpecimenOutboundRespVO.class));
-//        } else {
-//            throw exception(NO_PERMISSION_VIEW_NON_RETURNED_SPECIMENS);
-//        }
-//    }
-
     @GetMapping("/page")
     @Operation(summary = "获得标本出库回库信息分页")
     @PreAuthorize("@ss.hasPermission('museums:specimen-outbound:query')")

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

@@ -2,12 +2,9 @@ package cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 标本出库回库信息新增/修改 Request VO")
+@Schema(description = "管理后台 - 标本出库单审批 Request VO")
 @Data
 public class SpecimenOutboundApprovalReqVO {
 
@@ -18,11 +15,9 @@ public class SpecimenOutboundApprovalReqVO {
     private Integer status;
 
     @Schema(description = "一审驳回原因", example = "反对")
-//    @NotEmpty(message = "驳回原因是必填项")
     private String processInstanceId;
 
     @Schema(description = "二审驳回原因", example = "反对")
-//    @NotEmpty(message = "驳回原因是必填项")
     private String rejectionReasons ;
 
     @Schema(description = "一审批员", example = "100")

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

@@ -2,10 +2,9 @@ package cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import java.time.LocalDateTime;
 import lombok.*;
 
-@Schema(description = "管理后台 - 标本出库申请 Request VO")
+@Schema(description = "管理后台 - 确认标本出库 Request VO")
 @Data
 public class SpecimenOutboundConfirmReqVO {
 

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

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Schema(description = "管理后台 - 标本出库回库信息 Response VO")
+@Schema(description = "管理后台 - 标本出库单修改 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 

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

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;

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

@@ -1,11 +1,8 @@
 package cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo;
 
 import cn.iocoder.yudao.module.museums.enums.DictTypeConstants;
-import com.mzt.logapi.starter.annotation.DiffLogField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;

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

@@ -1,15 +1,11 @@
 package cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo;
 
-import com.mzt.logapi.starter.annotation.DiffLogField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 
-@Schema(description = "管理后台 - 标本回库信息编辑 Request VO")
+@Schema(description = "管理后台 - 标本回库单 Request VO")
 @Data
 public class SpecimenOutboundReturnReqVO {
 

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

@@ -1,127 +0,0 @@
-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;
-
-@Schema(description = "管理后台 - 标本回库信息 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class SpecimenOutboundReturnRespVO {
-
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @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;
-
-    @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 String 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 String approveUsers;
-
-    @Schema(description = "二审批员")
-    @ExcelProperty("二审批员")
-    private String twoApproveUsers;
-}

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

@@ -4,8 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
 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.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -14,7 +12,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 @Schema(description = "管理后台 - 标本出库回库信息 Response VO")
 @Data

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/dataobject/photos/PhotosDO.java

@@ -36,9 +36,4 @@ public class PhotosDO extends BaseDO {
      * 照片存储路径
      */
     private String photoUrl;
-    /**
-     * 上传时间
-     */
-    private LocalDateTime createdAt;
-
 }

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

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.museums.dal.dataobject.specimenoutbound;
 
+import cn.iocoder.yudao.module.museums.enums.common.ApproalStatusEnum;
 import lombok.*;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@@ -71,7 +71,7 @@ public class SpecimenOutboundDO extends BaseDO {
     /**
      * 审批状态
      *
-     * 枚举 {@link TODO museums_specimen_info 对应的类}
+     * 枚举 {@link ApproalStatusEnum}
      */
     private Integer status;
     /**
@@ -97,7 +97,7 @@ public class SpecimenOutboundDO extends BaseDO {
     /**
      * 出库员
      */
-    private String operator;
+    private Long operator;
     /**
      * 出库时间
      */
@@ -125,9 +125,9 @@ public class SpecimenOutboundDO extends BaseDO {
     /**
      * 一审批员
      */
-    private String approveUsers;
+    private Long approveUsers;
     /**
      * 二审批员
      */
-    private String twoApproveUsers;
+    private Long twoApproveUsers;
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/mysql/photos/PhotosMapper.java

@@ -25,7 +25,6 @@ public interface PhotosMapper extends BaseMapperX<PhotosDO> {
                 .eqIfPresent(PhotosDO::getId, reqVO.getId())
                 .eqIfPresent(PhotosDO::getGroupId, reqVO.getGroupId())
                 .eqIfPresent(PhotosDO::getPhotoUrl, reqVO.getPhotoUrl())
-                .eqIfPresent(PhotosDO::getCreatedAt, reqVO.getCreatedAt())
                 .betweenIfPresent(PhotosDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(PhotosDO::getId));
     }

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, String operator);
+    String confirmOutbound(Long id, Long operator);
 
     /**
      * 删除标本出库回库信息
@@ -55,13 +55,6 @@ public interface SpecimenOutboundService {
      * @return 标本出库回库信息
      */
     SpecimenOutboundDO getSpecimenOutbound(Long id);
-//    /**
-//     * 获得标本出库回库信息
-//     *
-//     * @param id 编号
-//     * @return 标本出库回库信息
-//     */
-//    SpecimenOutboundDO getSpecimenReturnInformation(Long id);
 
     /**
      * 获得标本出库回库信息分页
@@ -107,8 +100,4 @@ public interface SpecimenOutboundService {
      * @return 标本出库回库信息及相关标本信息
      */
     SpecimenOutboundWithInfoRespVO getSpecimenOutboundWithInfo(Long id, SpecimenInfoPageReqVO pageReqVO);
-
-
-
-
 }

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

@@ -5,6 +5,8 @@ import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.Specimen
 import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenInfoRespVO;
 import cn.iocoder.yudao.module.museums.dal.dataobject.specimeninfo.SpecimenInfoDO;
 import cn.iocoder.yudao.module.museums.dal.mysql.specimeninfo.SpecimenInfoMapper;
+import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.mzt.logapi.context.LogRecordContext;
 import com.mzt.logapi.service.impl.DiffParseFunction;
 import com.mzt.logapi.starter.annotation.LogRecord;
@@ -27,6 +29,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+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 static cn.iocoder.yudao.module.museums.enums.social.LogRecordConstants.*;
@@ -47,6 +50,9 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
     @Resource
     private SpecimenInfoMapper specimenInfoMapper;
 
+    @Resource
+    private AdminUserMapper adminUserMapper;
+
     //创建出库申请
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -118,8 +124,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
             specimenOutbound.setStatus(req.getStatus());
             specimenOutbound.setProcessInstanceId(req.getProcessInstanceId());
             specimenOutbound.setApprovalTime(req.getApprovalTime()); // 设置当前审批时间
-            specimenOutbound.setApproveUsers(getLoginUserNickname()); // 设置一审操作员
-
+            specimenOutbound.setApproveUsers(getLoginUserId()); // 设置一审操作员
         }
 
         // 二审逻辑
@@ -133,7 +138,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
             specimenOutbound.setStatus(req.getStatus());
             specimenOutbound.setRejectionReasons(req.getRejectionReasons());
             specimenOutbound.setTwoApprovalTime(req.getTwoApprovalTime()); // 设置当前审批时间
-            specimenOutbound.setTwoApproveUsers(getLoginUserNickname()); // 设置二审操作员
+            specimenOutbound.setTwoApproveUsers(getLoginUserId()); // 设置二审操作员
         }
         LogRecordContext.putVariable("rejectionReasons", req.getRejectionReasons());
         LogRecordContext.putVariable("processInstanceId", req.getProcessInstanceId());
@@ -183,14 +188,14 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
         LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(specimenInfo, SpecimenOutboundSaveReqVO.class));
     }
 
-    //确认出库，已经简化
+    //确认出库
     @Override
     @Transactional(rollbackFor = Exception.class)
     @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_CONFIRM,
             bizNo = "{{#existingSpecimen.id}}", // 使用出库单 ID
             success = MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS,
             extra = "{{#existingSpecimen.infoId}}") // 使用标本信息 ID
-    public String confirmOutbound(Long id, String operator) {
+    public String confirmOutbound(Long id, Long operator) {
         // 校验存在
         validateSpecimenOutboundExists(id);
         // 获取当前标本的状态
@@ -273,20 +278,6 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
         return specimenOutboundMapper.selectById(id);
     }
 
-    //目前没用到
-//    @Override
-//    public SpecimenOutboundDO getSpecimenReturnInformation(Long id) {
-//        // 获取标本出库回库信息
-//        SpecimenOutboundDO specimenOutbound = specimenOutboundMapper.selectById(id);
-//        // 检查审批状态是否为4（已回库）
-//        if (specimenOutbound != null && specimenOutbound.getStatus() == 4) {
-//            return specimenOutbound;
-//        } else {
-//            // 如果审批状态不是4，抛出异常
-//            throw exception(NO_PERMISSION_VIEW_NON_RETURNED_SPECIMENS);
-//        }
-//    }
-
     @Override
     public PageResult<SpecimenOutboundDO> getSpecimenOutboundPage(SpecimenOutboundPageReqVO pageReqVO) {
         return specimenOutboundMapper.selectPage(pageReqVO);
@@ -327,6 +318,15 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
         PageResult<SpecimenInfoRespVO> pageResultVO = BeanUtils.toBean(pageResult, SpecimenInfoRespVO.class);
         // 创建返回对象
         SpecimenOutboundWithInfoRespVO response = BeanUtils.toBean(specimenOutbound, SpecimenOutboundWithInfoRespVO.class);
+
+        // 获取出库员昵称并设置到返回对象
+        String operatorNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getOperator());
+        String approveUsersNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getApproveUsers());
+        String twoApproveUsersNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getTwoApproveUsers());
+        response.setOperator(operatorNickname)
+                .setApproveUsers(approveUsersNickname)
+                .setTwoApproveUsers(twoApproveUsersNickname);  // 设置操作员（出库员）的昵称
+
         // 设置分页后的标本信息列表
         response.setSpecimenInfoList(pageResultVO);
         return response;

yudao-module-museums/yudao-module-museums-biz/src/main/resources/mapper/specimenoutbound/SpecimenOutboundMapper.xml

@@ -2,27 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.museums.dal.mysql.specimenoutbound.SpecimenOutboundMapper">
 
-<!--    <select id="selectMonthlyOutboundStatistics" resultType="map">-->
-<!--        SELECT-->
-<!--            MONTH(outgoing_time) AS month,-->
-<!--            COUNT(DISTINCT TRIM(SUBSTRING_INDEX(SUBSTRING_INDEX(info_id, ',', numbers.n), ',', -1))) AS number-->
-<!--        FROM-->
-<!--            museums_specimen_outbound-->
-<!--            JOIN-->
-<!--            (SELECT 1 AS n UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION-->
-<!--            SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) AS numbers-->
-<!--        ON-->
-<!--            CHAR_LENGTH(info_id) - CHAR_LENGTH(REPLACE(info_id, ',', '')) >= numbers.n - 1-->
-<!--        WHERE-->
-<!--            (status = 3 OR status = 4)-->
-<!--          AND YEAR(outgoing_time) = #{year}-->
-<!--          AND deleted = 0-->
-<!--        GROUP BY-->
-<!--            MONTH(outgoing_time)-->
-<!--        ORDER BY-->
-<!--            month-->
-<!--    </select>-->
-
     <select id="selectMonthlyOutboundStatistics" resultType="map">
         SELECT
             months.month,

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -47,4 +47,9 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         return selectList(AdminUserDO::getDeptId, deptIds);
     }
 
+    default String selectNicknameByUserId(Long userId) {
+        AdminUserDO user = selectById(userId);
+        return user != null ? user.getNickname() : null;
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogService.java

@@ -39,13 +39,6 @@ public interface OperateLogService {
      */
     PageResult<OperateLogDO> getOperateLogPage(OperateLogPageReqDTO pageReqVO);
 
-//    /**
-//     * 根据标本编号和操作模块类型获取系统日志
-//     *
-//     * @return 系统日志列表
-//     */
-//    List<OperateLogDO> getLogsBySpecimenIdAndType(OperateLogPageReqVO pageReqDTO);
-
     /**
      * 根据标本编号和操作模块类型获取系统日志
      *

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java

@@ -44,11 +44,6 @@ public class OperateLogServiceImpl implements OperateLogService {
         return operateLogMapper.selectPage(pageReqDTO);
     }
 
-//    @Override
-//    public List<OperateLogDO> getLogsBySpecimenIdAndType(OperateLogPageReqVO pageReqDTO) {
-//        return operateLogMapper.selectMuseumsPage(pageReqDTO).getList();
-//    }
-
     @Override
     public List<OperateLogDO> getLogsBySpecimenIdAndType(OperateLogReqVO reqVO) {
         // 调用自定义的查询方法，获取所有符合条件的日志