BigLawn 1 ماه پیش
والد
کامیت
4cb49e3770

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

@@ -69,7 +69,7 @@ public class MuseumFlowPageVO extends PageParam {
     private String returnPerson;
 
     @Schema(description = "退还时间")
-    private LocalDateTime returnTime;
+    private LocalDateTime[] returnTime;
 
     @Schema(description = "点收人")
     private String receivePerson;

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

@@ -117,8 +117,11 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
                 .likeIfPresent(MuseumFlowDO::getApplyPerson, pageVO.getApplyPerson())
                 .likeIfPresent(MuseumFlowDO::getReceivePerson, pageVO.getReceivePerson())
                 .likeIfPresent(MuseumFlowDO::getOutboundPerson, pageVO.getOutboundPerson())
+                .likeIfPresent(MuseumFlowDO::getPurpose, pageVO.getPurpose())
+                .likeIfPresent(MuseumFlowDO::getNots, pageVO.getNots())
                 .betweenIfPresent(MuseumFlowDO::getApplyTime, pageVO.getApplyTime())
                 .betweenIfPresent(MuseumFlowDO::getReviewTime,pageVO.getReviewTime())
+                .betweenIfPresent(MuseumFlowDO::getReturnTime,pageVO.getReturnTime())
                 .eqIfPresent(MuseumFlowDO::getState, pageVO.getState())
                 .eqIfPresent(MuseumFlowDO::getId, pageVO.getOutboundPerson())
                 .orderByDesc(MuseumFlowDO::getId);