申请出库单传数组

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

@@ -16,12 +16,11 @@ public class SpecimenOutboundSaveReqVO {
     private Long id;
 
     @Schema(description = "关联到总表中的标本ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "关联到总表中的标本ID不能为空")
     @DiffLogField(name = "关联到总表中的标本ID")
     private List<String> infoId;
 
     @Schema(description = "申请出库的标本编号", requiredMode = Schema.RequiredMode.REQUIRED)
-//    @NotEmpty(message = "申请出库的标本编号不能为空")
+    @NotEmpty(message = "申请出库的标本编号不能为空")
     private List<String> number;
 
     @Schema(description = "申请人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")

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

@@ -76,6 +76,11 @@ public interface SpecimenOutboundService {
      */
     void recompileSpecimenOutbound(@Valid SpecimenOutboundSaveReqVO updateReqVO);
 
+    /**
+     * 标本出库审批
+     *
+     * @param req 审批
+     */
     void updateStatus(SpecimenOutboundApprovalReqVO req);
 
     //工作台

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

@@ -67,12 +67,9 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
             }
         }
 
-        // 将有效ID转换为字符串
-        String infoIdString = String.join(",", validInfoIds);
-
         // 创建出库记录
         SpecimenOutboundDO specimenOutbound = BeanUtils.toBean(createReqVO, SpecimenOutboundDO.class);
-        specimenOutbound.setInfoId(infoIdString);
+        specimenOutbound.setInfoId(validInfoIds.toString());
         specimenOutboundMapper.insert(specimenOutbound);
 
         // 记录日志上下文
@@ -83,6 +80,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
         return specimenOutbound.getId();
     }
 
+
     //出库审批
     @Override
     @Transactional(rollbackFor = Exception.class)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/OperateLogMapper.java

@@ -23,7 +23,6 @@ public interface OperateLogMapper extends BaseMapperX<OperateLogDO> {
                 .likeIfPresent(OperateLogDO::getType, pageReqDTO.getType())
                 .likeIfPresent(OperateLogDO::getSubType, pageReqDTO.getSubType())
                 .likeIfPresent(OperateLogDO::getAction, pageReqDTO.getAction())
-//                .inIfPresent(OperateLogDO::getExtra,pageReqDTO.getExtra())
                 .betweenIfPresent(OperateLogDO::getCreateTime, pageReqDTO.getCreateTime())
                 .likeIfPresent(OperateLogDO::getExtra, "[" + id + ", ")
                 .or(qw->qw.like(OperateLogDO::getExtra, "["+ id + "]"))
@@ -40,7 +39,5 @@ public interface OperateLogMapper extends BaseMapperX<OperateLogDO> {
                 .orderByDesc(OperateLogDO::getId));
     }
 
-    //  TODO    这个其实直接调用他的方法就行了，不过这样也行 ，有点白写的感觉哈哈哈
-    List<OperateLogDO> selectBySpecimenIdAndType(@Param("specimenId") Integer specimenId, @Param("moduleType") String moduleType);
 
 }

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

@@ -43,14 +43,8 @@ public class OperateLogServiceImpl implements OperateLogService {
         return operateLogMapper.selectPage(pageReqDTO);
     }
 
-//    @Override
-//    public List<OperateLogDO> getLogsBySpecimenIdAndType(Integer specimenId, String moduleType) {
-//        return operateLogMapper.selectBySpecimenIdAndType(specimenId, moduleType);
-//    }
-
     @Override
     public List<OperateLogDO> getLogsBySpecimenIdAndType(OperateLogPageReqVO pageReqDTO) {
         return operateLogMapper.selectPage(pageReqDTO).getList();
     }
-
 }

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/OperateLogMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper">
-
-    <select id="selectBySpecimenIdAndType" resultType="OperateLogDO">
-        SELECT *
-        FROM system_operate_log
-        WHERE extra LIKE CONCAT('%',#{specimenId},'%')
-          AND type = #{moduleType}
-        ORDER BY create_time DESC;
-    </select>
-
-</mapper>