转运单上报案例列表排序调整

sinake

8 天以前 9822e79febb5f30635035dc13538ce36a09d92e1

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

@@ -43,9 +43,8 @@
        LambdaQueryWrapper<ServiceTransport> wrappers = getWrappers(serviceTransport);
        // 添加create_time不为空的条件
        wrappers.isNotNull(ServiceTransport::getCreateTime);

        // 然后进行倒序排序
        wrappers.orderByDesc(ServiceTransport::getCreateTime);
        wrappers.orderByDesc(ServiceTransport::getTransportStartTime);
        // 创建分页对象，设置页码和每页大小
        int currentPage = (serviceTransport.getPageNum() == null || serviceTransport.getPageNum() < 1) ? 1 : serviceTransport.getPageNum();
        int size = (serviceTransport.getPageSize() == null || serviceTransport.getPageSize() < 1) ? 10 : serviceTransport.getPageSize();
@@ -58,7 +57,6 @@
                ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
                serviceTransportFile.setDelFlag(0);
                serviceTransportFile.setTransportId(serviceTransport1.getId());
                serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
                List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);

                serviceTransport1.setAnnexfilesList(serviceTransportFiles);
@@ -66,6 +64,16 @@
        }
        page.setRecords(list);
        return page;
    }
    /**
     * 查询供者转运登记列表
     *
     * @param serviceTransport 供者转运登记
     * @return 供者转运登记
     */
    @Override
    public List<Map<String,Object>> totalState(ServiceTransport serviceTransport) {
        return ServiceTransportMapper.totalState(serviceTransport);
    }

    @Override
@@ -156,6 +164,9 @@
        if (StringUtils.isNotBlank(serviceTransport.getIcuDoctorPhone())) {
            wrappers.eq(ServiceTransport::getIcuDoctorPhone, serviceTransport.getIcuDoctorPhone());
        }
        if (StringUtils.isNotBlank(serviceTransport.getNotAdminId())) {
            wrappers.eq(ServiceTransport::getCreateBy, serviceTransport.getNotAdminId());
        }
        return wrappers;
    }