回库程序

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

@@ -30,6 +30,7 @@ public class MuseumFlowController {
 
     @Resource
     private MuseumFlowService museumFlowService;
+    @Resource
     private MuseumInfoService museumInfoService;
     @Resource
     private PermissionService permissionService;
@@ -79,14 +80,20 @@ public class MuseumFlowController {
 //        return museumInfoService.getMuseumInfoPage(pageVO);
 //    }
 
-    @GetMapping("/page")
-    @Operation(summary = "根据表单id获取标本在总库中的信息")
-    public CommonResult<PageResult<MuseumFlowInfoVO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
-        return CommonResult.success(museumFlowService.selectPageMuseumFlowFormIntel(pageVO));
-    }
+//    @GetMapping("/page")
+//    @Operation(summary = "根据所给参数获取标本在总库中的信息")
+//    public CommonResult<PageResult<MuseumInfoDO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
+//        PageResult<MuseumInfoDO> event = new PageResult<>();
+//        for (String number :pageVO.getNumber()){
+//            MuseumInfoPageReqVO reqVO = new MuseumInfoPageReqVO();
+//            reqVO.setSampleId(number);
+//            PageResult<MuseumInfoDO> result = museumInfoService.getMuseumInfoPage(reqVO);
+//        }
+//        return CommonResult.success();
+//    }
 
     @GetMapping("/getFormIntel")
-    @Operation(summary = "审批功能中根据id查找标本信息")
+    @Operation(summary = "根据id查找标本出回库中的信息，并展示在总库中的信息")
     public CommonResult<MuseumFlowInfoVO> getFormIntel(@RequestParam("id") Integer id) {
         Long UserId = getLoginUserId();
         if (permissionService.hasAnyRoles(UserId, "operate")) {
@@ -97,8 +104,9 @@ public class MuseumFlowController {
                 int State = form.getState();
                 if (State == 2) {
                     for (String number : form.getNumber()) {
-                        MuseumInfoDO result1 = museumFlowService.selectMuseumFlowSampleId(number);
-                        museumInfoDO.add(result1);
+                        MuseumInfoPageReqVO reqVO = new MuseumInfoPageReqVO();
+                        reqVO.setSampleId(number);
+                        museumInfoDO.addAll(museumInfoService.getMuseumInfoPageList(reqVO));
                     }
                     form.setMuseumInfoList(museumInfoDO);
                     return CommonResult.success(form);
@@ -141,11 +149,13 @@ public class MuseumFlowController {
                     //TODO 判断在主库内是否是在库
                     if (result.getStore() == 0) {
                         return CommonResult.error(2, number + "标本已出库");
-                    } else {
+                    } else if (result.getStore() == 1) {
                         List<MuseumFlowDO> event = museumFlowService.selectMuseumFlowByNumbersLike(number);
                         if (event != null) {
-                            errorList.addAll( museumFlowService.isMuseumFlowStateOutbound0(event,number));
+                            errorList.addAll(museumFlowService.isMuseumFlowStateOutbound0(event, number));
                         }
+                    } else {
+                        return CommonResult.error(2, number + "标本状态异常");
                     }
                 }
             }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java

@@ -5,6 +5,7 @@ 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.museuminfo.vo.*;
 
+import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -147,4 +148,14 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
                 .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
                 .orderByDesc(MuseumInfoDO::getId));
     }
+
+    default List<MuseumInfoDO> selectPageList(MuseumInfoPageReqVO pageReqVO) {
+        LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
+        queryWrapper.inIfPresent(MuseumInfoDO::getSampleId,pageReqVO.getSampleId())
+                .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
+                .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
+                .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
+                .orderByDesc(MuseumInfoDO::getId);
+        return selectList(queryWrapper);
+    }
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumflow/MuseumFlowServiceImpl.java

@@ -216,13 +216,6 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
     @Override
     public PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO){
         PageResult<MuseumFlowInfoVO> result = BeanUtils.toBean(museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO),MuseumFlowInfoVO.class);
-
-//        for (MuseumFlowInfoVO re : result.getList()) {
-//            MuseumInfoListVO pageReqVO =new MuseumInfoListVO();
-//            pageReqVO.setSampleId(re.getNumber());
-//            List<MuseumInfoDO> MuseumInfoDOList = MuseumInfoMapper.selectInfoList(pageReqVO);
-//            re.setMuseumInfoList(MuseumInfoDOList);
-//        }
         return result;
     }
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoService.java

@@ -60,6 +60,10 @@ public interface MuseumInfoService {
     * @return 分页列表
     */
     PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO);
+   /**
+    * 查询标本类型
+    * */
+   List<MuseumInfoDO> getMuseumInfoPageList(MuseumInfoPageReqVO pageReqVO);
    /**
     * 标本类型计数
     * */

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoServiceImpl.java

@@ -135,6 +135,13 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
    public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO){
       return museumInfoMapper.selectPage(pageReqVO);
    }
+   /**
+    * 查询标本类型
+    * */
+   @Override
+   public List<MuseumInfoDO> getMuseumInfoPageList(MuseumInfoPageReqVO pageReqVO){
+      return museumInfoMapper.selectPageList(pageReqVO);
+   }
    /**
     * 标本类型计数
     * */