Merge remote-tracking branch 'origin/master'

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/MuseumFlowController.java

@@ -54,8 +54,14 @@ public class MuseumFlowController {
 //    @PostMapping("/outbound")
 //    @Operation(summary = "添加出库单")
 //    public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO){
-//        List<String>sample_id=saveVO.getNumber();
-//        MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+//        List<String>sample_ids=saveVO.getNumber();
+//        for (String sample_id :sample_ids){
+//            MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+//            if (result==null){
+//                return CommonResult.error(200,sample_id+"标本不存在");
+//            }
+//            break;
+//        }
 //        if(result == null){
 //            return CommonResult.error(200,"样品不存在");
 //        }else if(result != null){

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowSaveVO.java

@@ -74,4 +74,5 @@ public class MuseumFlowSaveVO {
 
     @Schema(description = "状态")
     private Integer state;
+
 }

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

@@ -34,6 +34,7 @@ public class MuseummodelController {
     @PostMapping("/create")
     @Operation(summary = "新增模型")
     public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
+
         if (saveVO == null) {
             return -1;
         }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museummodel/MuseummodelDO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.museum.dal.database.museummodel;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -28,7 +30,7 @@ public class MuseummodelDO extends BaseDO {
     @Schema(description = "模型名称")
     private String specimenName;
 
-    @Schema(description = "模型编号")
+    @Schema(description = "标本编号")
     private String specimenNumber;
 
     @Schema(description = "模型类型")
@@ -43,4 +45,8 @@ public class MuseummodelDO extends BaseDO {
     @Schema(description = "备注")
     private String remark;
 
+    @TableField(exist = false) //
+    @Schema(description = "标本信息")
+    private MuseumInfoDO  museumInfoDO;
+
 }

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

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
+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.database.museummodel.MuseummodelDetailDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -27,6 +28,12 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
     //分页查询
 //    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
+////        MPJLambdaWrapper<MuseummodelDO> mpjLambdaWrapper =new MPJLambdaWrapper<>();
+////        mpjLambdaWrapper.leftJoin(MuseumInfoDO.class,MuseumInfoDO::getSampleId,MuseummodelDO::getSpecimenNumber)
+////                .selectAll(MuseummodelDO.class)
+////                .selectAssociation(MuseumInfoDO.class,MuseummodelDO::getMuseumInfoDO)
+////                .
+//
 //        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
 //                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
 //                .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
@@ -35,7 +42,7 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 //                .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
 //                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
 //                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
-    }
+//    }
 
     //联表查询
 //    default list<MuseummodelDetailDO> selectListByStatusAndDeptName(Integer status, String deptName) {
@@ -53,6 +60,7 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
 
 //    }
 //}
+}
 
 
 

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

@@ -46,6 +46,11 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
 //      return museumModelMapper.selectPage(pageReqVO);
 //   }
 
+     @Override
+      public  PageResult<MuseummodelDO> getPage (MuseummodelPageReqVO pageReqVO){
+
+     }
+
 
 
 }