1.新增通过标本类型返回所有标本模型

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/MuseumModelController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -87,11 +88,16 @@ public class MuseumModelController {
     public CommonResult<Map<Integer, MuseummodelRespVO>> getMuseumModelBySpecimenType(@RequestParam("specimenType") String specimenType) {
         List<MuseummodelDO> result = museumModelService.getMuseumModelBySpecimenType(specimenType);
         List<MuseummodelRespVO> respVOs = BeanUtils.toBean(result, MuseummodelRespVO.class);
-        Map<Integer, MuseummodelRespVO> map = respVOs.stream()
-                .collect(Collectors.toMap(MuseummodelRespVO::getId, vo -> vo));
+
+        Map<Integer, MuseummodelRespVO> map = new HashMap<>();
+        for (MuseummodelRespVO vo : respVOs) {
+            map.put(vo.getId(), vo);
+        }
+
         return CommonResult.success(map);
     }
 
+
     @GetMapping("/page")
     @Operation(summary = "获得模型分页")
     @PreAuthorize("@ss.hasPermission('system:tenant:query')")

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museummodel/MuseummodelMapper.java

@@ -31,6 +31,12 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
     @Select("SELECT * FROM museum_specimen_model WHERE specimen_number =#{specimenNumber} AND deleted =0")
     List<MuseummodelDO> getMuseumModelBySpecimenNumber(@Param("specimenNumber") String sampleId);
 
+    /**
+     * 通过标本类型返回所有标本模型
+     * */
+    @Select("SELECT * FROM museum_specimen_model WHERE specimen_type =#{specimenType} AND deleted =0")
+    List<MuseummodelDO> getMuseumModelBySpecimenType(@Param("specimenType") String specimenType);
+
     //分页查询
     default PageResult<MuseummodelDO> getMuseumModelPage(MuseummodelPageReqVO reqVO) {
         MPJLambdaWrapper<MuseummodelDO> mpjLambdaWrapper = new MPJLambdaWrapper<>();
@@ -48,6 +54,7 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
                 .orderByDesc(MuseummodelDO::getId); // 按照 id 倒序
         return selectPage(reqVO, mpjLambdaWrapper);
 
+
     }
 }
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelServiceImpl.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
 import cn.iocoder.yudao.module.museum.dal.mysql.museummodel.MuseummodelMapper;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -56,9 +57,13 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
       return museumModelMapper.getMuseumModelBySpecimenNumber(specimenNumber);
    }
 
+//   @Autowired
+//   private MuseummodelMapper.MuseumModelMapper;
+
    @Override
    public List<MuseummodelDO> getMuseumModelBySpecimenType(String specimenType) {
-      return List.of();
+      // 修改为正确的方法调用
+      return museumModelMapper.getMuseumModelBySpecimenType(specimenType);
    }
 
 //     @Override