捐献确认基本信息集合协调员2字段错

sinake

2 天以前 af9eeec3590806f1e699511be33c892721defc49

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

@@ -6,13 +6,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.domain.ServiceTransportFile;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.mapper.ServiceTransportMapper;
import com.ruoyi.project.service.IServiceTransportFileService;
import com.ruoyi.project.service.IServiceTransportService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +41,11 @@
    @Override
    public Page<ServiceTransport> queryList(ServiceTransport serviceTransport) {
        LambdaQueryWrapper<ServiceTransport> wrappers = getWrappers(serviceTransport);
        // 添加create_time不为空的条件
        wrappers.isNotNull(ServiceTransport::getCreateTime);

        // 然后进行倒序排序
        wrappers.orderByDesc(ServiceTransport::getCreateTime);
        // 创建分页对象，设置页码和每页大小
        int currentPage = (serviceTransport.getPageNum() == null || serviceTransport.getPageNum() < 1) ? 1 : serviceTransport.getPageNum();
        int size = (serviceTransport.getPageSize() == null || serviceTransport.getPageSize() < 1) ? 10 : serviceTransport.getPageSize();
@@ -87,6 +90,9 @@

    private LambdaQueryWrapper<ServiceTransport> getWrappers(ServiceTransport serviceTransport) {
        LambdaQueryWrapper<ServiceTransport> wrappers = Wrappers.lambdaQuery();
        if (ObjectUtils.isNotEmpty(serviceTransport.getId() )) {
            wrappers.eq(ServiceTransport::getId, serviceTransport.getId());
        }
        if (serviceTransport.getReportId() != null) {
            wrappers.eq(ServiceTransport::getReportId, serviceTransport.getReportId());
        }