捐献确认基本信息集合新增排序

sinake

3 天以前 df9a47128a707b37483f282083e317d1d0119156

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java

@@ -48,12 +48,10 @@
        if (serviceMeeting.getOrganizerId() != null){
            wrappers.eq(ServiceMeeting::getOrganizerId ,serviceMeeting.getOrganizerId());
        }
        if (serviceMeeting.getStartTime() != null){
            wrappers.eq(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime());
        if (serviceMeeting.getStartTime() != null&&serviceMeeting.getEndTime() != null){
            wrappers.between(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime(),serviceMeeting.getEndTime() );
        }
        if (serviceMeeting.getEndTime() != null){
            wrappers.eq(ServiceMeeting::getEndTime ,serviceMeeting.getEndTime());
        }

        if (StringUtils.isNotBlank(serviceMeeting.getSummary())){
            wrappers.eq(ServiceMeeting::getSummary ,serviceMeeting.getSummary());
        }
@@ -99,18 +97,7 @@
        if (serviceMeeting.getApprovalTime() != null){
            wrappers.eq(ServiceMeeting::getApprovalTime ,serviceMeeting.getApprovalTime());
        }
        if (StringUtils.isNotBlank(serviceMeeting.getCreatedBy())){
            wrappers.eq(ServiceMeeting::getCreatedBy ,serviceMeeting.getCreatedBy());
        }
        if (serviceMeeting.getCreatedTime() != null){
            wrappers.eq(ServiceMeeting::getCreatedTime ,serviceMeeting.getCreatedTime());
        }
        if (StringUtils.isNotBlank(serviceMeeting.getUpdatedBy())){
            wrappers.eq(ServiceMeeting::getUpdatedBy ,serviceMeeting.getUpdatedBy());
        }
        if (serviceMeeting.getUpdatedTime() != null){
            wrappers.eq(ServiceMeeting::getUpdatedTime ,serviceMeeting.getUpdatedTime());
        }

        return this.list(wrappers);
    }