回库程序

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

@@ -78,7 +78,7 @@ public class MuseumFlowController {
 
     @GetMapping("/page")
     @Operation(summary = "根据所给参数获取标本在出回库中的信息")
-    public CommonResult<PageResult<MuseumFlowInfoVO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
+    public CommonResult<PageResult<MuseumFlowPageVO>> selectPageMuseumFlowFormIntel(@Valid MuseumFlowPageVO pageVO) {
         return CommonResult.success(museumFlowService.selectPageMuseumFlowFormIntel(pageVO));
     }
 
@@ -125,7 +125,7 @@ public class MuseumFlowController {
 
     @PostMapping("/outbound")
     @Operation(summary = "出库功能")
-    @PreAuthorize("@ss.hasPermission('system:role:operate')")
+//    @PreAuthorize("@ss.hasPermission('system:role:operate')")
     public CommonResult<Boolean> createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO) {
         Long UserId = getLoginUserId();
         if (permissionService.hasAnyRoles(UserId, "operate")) {//获取操作者id并对其权限做判断，不为operate则结束进程

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

@@ -64,8 +64,8 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     MuseumFlowDO selectMuseumFlowFormById(@Param("id") Integer id);
 
     /**根据编号数组在Flow库中进行包含查询*/
-    @Select("SELECT * FROM museum_outbound WHERE JSON_CONTAINS(number, CAST(#{number} AS JSON)) AND deleted = 0  " +
-            "OR (number LIKE CONCAT('%, ', #{number}, ',%') OR number LIKE CONCAT('[', #{number}, ',%') OR number LIKE CONCAT('%, ', #{number}, ']')) AND deleted = 0"
+    @Select("SELECT * FROM museum_outbound WHERE JSON_CONTAINS(number, CAST(#{number} AS JSON)) AND deleted = 0  "
+//            "OR (number LIKE CONCAT('%, ', #{number}, ',%') OR number LIKE CONCAT('[', #{number}, ',%') OR number LIKE CONCAT('%, ', #{number}, ']')) AND deleted = 0"
     )
     List<MuseumFlowDO> selectMuseumFlowByNumbersLike(@Param("number") String number);
 

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

@@ -64,7 +64,7 @@ public interface MuseumFlowService {
 
 
     /**根据输入信息进行分页查找*/
-    PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO);
+    PageResult<MuseumFlowPageVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO);
 
 
 /**审批功能

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

@@ -173,8 +173,8 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
 
     /**根据输入信息进行分页查找*/
     @Override
-    public PageResult<MuseumFlowInfoVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO){
-        PageResult<MuseumFlowInfoVO> result = BeanUtils.toBean(museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO),MuseumFlowInfoVO.class);
+    public PageResult<MuseumFlowPageVO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO){
+        PageResult<MuseumFlowPageVO> result = BeanUtils.toBean(museumFlowMapper.selectPageMuseumFlowFormIntel(pageVO),MuseumFlowPageVO.class);
         return result;
     }