回库程序

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

@@ -142,7 +142,6 @@ public class MuseumFlowController {
                 if (result == null) {
                     return CommonResult.error(2, number + "标本不存在");
                 } else {
-                    //TODO 判断在主库内是否是在库
                     if (result.getStore() == 0) {
                         return CommonResult.error(2, number + "标本已出库");
                     } else if (result.getStore() == 1) {

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

@@ -22,7 +22,7 @@ public class MuseumFlowPageVO extends PageParam {
     private Integer id;
 
     @Schema(description = "样品编号")
-    private String number;
+    private  String number;
 
     @Schema(description = "样品名称")
     private List<String> sampleName;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/MuseumInfoController.java

@@ -109,7 +109,7 @@ public class MuseumInfoController {
     @GetMapping("/page")
     @Operation(summary = "获取分页")
     public PageResult<MuseumInfoRespVO> getPage(@Valid MuseumInfoPageReqVO pageReqVO){
-        PageResult<MuseumInfoDO> PageResult = museumInfoService.getMuseumInfoPage(pageReqVO);
+        PageResult<MuseumInfoDO> PageResult = museumInfoService. getMuseumInfoPage(pageReqVO);
         return BeanUtils.toBean(PageResult, MuseumInfoRespVO.class);
     }
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumflow/MuseumFlowMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.*;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import com.google.gson.Gson;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -69,7 +70,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     @Select("SELECT * FROM museum_outbound WHERE number = #{number} AND deleted = 0 ")
     MuseumFlowDO selectMuseumFlowByNumber(@Param("number")String number);
 
-    /**根据编号数组在Flow库中进行模糊查询*/
+    /**根据编号数组在Flow库中进行包含查询*/
     @Select("SELECT * FROM museum_outbound WHERE JSON_CONTAINS(number, CAST(#{number} AS JSON)) AND deleted = 0")
     List<MuseumFlowDO> selectMuseumFlowByNumbersLike(@Param("number") String number);
 
@@ -99,11 +100,12 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
         queryWrapper
                 .inIfPresent(MuseumFlowDO::getSampleName,pageVO.getSampleName())
                 .betweenIfPresent(MuseumFlowDO::getApplyTime, pageVO.getApplyTime())
-                .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
-                .inIfPresent(MuseumFlowDO::getState,pageVO.getState())
-//                .apply("JSON_CONTAINS(number, CAST(#{number} AS JSON))", pageVO.getNumber())
-                .apply("JSON_CONTAINS(leader_user_id, CAST({number} AS JSON))", pageVO.getNumber())
+                .eqIfPresent(MuseumFlowDO::getOutboundPerson, pageVO.getOutboundPerson())
+                .eqIfPresent(MuseumFlowDO::getState, pageVO.getState())
                 .orderByDesc(MuseumFlowDO::getId);
+        if (pageVO.getNumber()!=null &&!pageVO.getNumber().isEmpty()) {
+            queryWrapper.apply("JSON_CONTAINS(number, CAST({0} AS JSON))", pageVO.getNumber());
+        }
         return selectPage(pageVO, queryWrapper);
     }
 

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

@@ -33,8 +33,6 @@ public interface MuseumFlowService {
 
 /**搜索功能
 
-    /**根据编号在Flow库中进行查找*/
-    MuseumFlowDO selectMuseumFlowNumber(String number);
 
     /**根据编号在总表中进行查找**/
     MuseumFlowDO selectMuseumFlowById(Integer id);
@@ -45,7 +43,6 @@ public interface MuseumFlowService {
     /**根据编号数组在Flow库中进行模糊查询*/
     List<MuseumFlowDO> selectMuseumFlowByNumbersLike(String number);
 
-    MuseumFlowDO selectMuseumFlowByID(Integer id);
 
 /**出库功能 Save中 0为已出库 flow中1
 
@@ -55,8 +52,6 @@ public interface MuseumFlowService {
     /**将出回库中标本状态设置为1*/
     void updateMuseumFlowOutbound(MuseumFlowSaveVO saveVO);
 
-    /**添加出库单功能中 若表单已创建过判断标本状态*/
-    CommonResult<Boolean> judgeMuseumFlowState(Integer State);
 
     /**添加出库单功能中 若表单已创建过判断标本状态*/
     String isMuseumFlowState(Integer State);
@@ -65,14 +60,8 @@ public interface MuseumFlowService {
 
     List<String> isMuseumFlowStateOutbound0(List<MuseumFlowDO> event,String number);
 
-//    String isMuseumFlowIn(MuseumFlowSaveVO saveVO);
-
-    boolean isOnlyNull(List<String> errorList);
-
 /**分页功能
 
-    /**根据分页长度进行排序**/
-//    PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO);
 
     /**根据输入信息进行分页查找*/
     PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO);
@@ -84,8 +73,6 @@ public interface MuseumFlowService {
     /**将样品状态更新为输入值 3为审批通过 4为审批驳回**/
     void updateMuseumFlowStateReview(MuseumFlowDO museumFlowDO);
 
-    /**审批功能中 判断状态是否为2后对错误情况进行回答*/
-    String isMuseumFlowStateReward(Integer State);
 
 /**回库功能 Save中 1现为未出库或已回库，0为已出库 flow中1
 

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

@@ -112,41 +112,6 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
         // museumFlowMapper.updateById(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
     }
 
-    /**添加出库单功能中 若表单已创建过判断标本状态*/
-    public CommonResult<Boolean> judgeMuseumFlowState(Integer State){
-        if (State == 0) {
-            return CommonResult.error(200, "标本已回库");
-        } else if (State == 1) {
-            return CommonResult.error(200, "标本已出库");
-        } else if (State == 2) {
-            return CommonResult.error(200, "标本正在审批");
-        } else if (State == 3) {
-            return CommonResult.error(200, "标本审批已通过");
-        } else if (State == 4) {
-            return CommonResult.error(200, "标本已审批已驳回");
-        }
-        else {
-            return CommonResult.error(200, "标本状态异常");
-        }
-    }
-
-    /**判断出回库数据库中是否有相关编号的记录 有不为0(出库)的返回相应错误信息 无则返回null*/
-//    public String isMuseumFlowIn(MuseumFlowSaveVO saveVO){
-//        List<String> errorList = new ArrayList<>();
-//        for(String number :saveVO.getNumber()) {
-//            List<MuseumFlowDO> event = selectMuseumFlowByNumbersLike(number);
-//            if (event != null) {
-//                errorList.add( isMuseumFlowStateOutbound0(event));}
-//            else {
-//                continue;
-//            }
-//        }
-//        if (errorList.isEmpty()) {
-//            return null;
-//        }else {
-//            return errorList.toString();
-//        }
-//    }
 
     /**
      * 判断有相关编号的数据中的状态值 有不为0(出库)的返回相应错误信息 无则为空