sinake
7 天以前 7156c5ac2b953c7d82d09d41b8efd3487c0ef26d
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -50,6 +50,7 @@
    @Override
    public Page<ServiceDonatebaseinfoReport> queryList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = getWrapper(serviceDonatebaseinfoReport);
        // 添加create_time不为空的条件
        wrappers.isNotNull(ServiceDonatebaseinfoReport::getCreateTime);
        // 然后进行倒序排序
@@ -140,6 +141,9 @@
        serviceDonatebaseinfo1.setRegisterprovincename(serviceDonatebaseinfoReport.getRegisterprovincename());
        serviceDonatebaseinfo1.setRegistercityname(serviceDonatebaseinfoReport.getRegistercityname());
        serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname());
        serviceDonatebaseinfo1.setReportHospital(serviceDonatebaseinfoReport.getToHospital());
        serviceDonatebaseinfo1.setFirstDept(serviceDonatebaseinfoReport.getDeptName());
        serviceDonatebaseinfo1.setCaseNo(null);
        //先通过caseNo查询是否存在
        ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
        serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
@@ -157,6 +161,7 @@
    private LambdaQueryWrapper<ServiceDonatebaseinfoReport> getWrapper(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = Wrappers.lambdaQuery();
        wrappers.eq(ServiceDonatebaseinfoReport::getDelFlag, "0");
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getCaseNo())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getCaseNo, serviceDonatebaseinfoReport.getCaseNo());
        }
@@ -308,6 +313,9 @@
            wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNotAdminId())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getCreateBy, serviceDonatebaseinfoReport.getNotAdminId());
        }
        return wrappers;
    }