回库程序

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

@@ -59,7 +59,7 @@ public class MuseumFlowPageVO extends PageParam {
     private String reviewPerson;
 
     @Schema(description = "审批时间")
-    private LocalDateTime reviewTime;
+    private LocalDateTime[] reviewTime;
 
     @Schema(description = "拒绝原因")
     private String rejectSeason;

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

@@ -112,8 +112,13 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
         queryWrapper
                 .likeIfPresent(MuseumFlowDO::getSampleName,pageVO.getSampleName())
+                .likeIfPresent(MuseumFlowDO::getPurpose,pageVO.getPurpose())
+                .likeIfPresent(MuseumFlowDO::getRejectSeason,pageVO.getRejectSeason())
+                .likeIfPresent(MuseumFlowDO::getApplyPerson, pageVO.getApplyPerson())
+                .likeIfPresent(MuseumFlowDO::getReceivePerson, pageVO.getReceivePerson())
+                .likeIfPresent(MuseumFlowDO::getOutboundPerson, pageVO.getOutboundPerson())
                 .betweenIfPresent(MuseumFlowDO::getApplyTime, pageVO.getApplyTime())
-                .eqIfPresent(MuseumFlowDO::getOutboundPerson, pageVO.getOutboundPerson())
+                .betweenIfPresent(MuseumFlowDO::getReviewTime,pageVO.getReviewTime())
                 .eqIfPresent(MuseumFlowDO::getState, pageVO.getState())
                 .orderByDesc(MuseumFlowDO::getId);
         if (pageVO.getNumber()!=null &&!pageVO.getNumber().isEmpty()) {