手机号和工号同时可登

sinake

9 天以前 c8fceb65958a1992d5b6df13f209a9da5ac121a1

 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);
        // 然后进行倒序排序
@@ -121,10 +122,25 @@
        //将report数据复制到serviceDonatebaseinfo中
        ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
        serviceDonatebaseinfo1.setId(null);
        serviceDonatebaseinfo1.setReportId(serviceDonatebaseinfoReport.getId());
        serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
        serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
        serviceDonatebaseinfo1.setCurrentHospital(serviceDonatebaseinfoReport.getToHospital());
        serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
        serviceDonatebaseinfo1.setBloodtype(serviceDonatebaseinfoReport.getBloodType());
        serviceDonatebaseinfo1.setRhyin(serviceDonatebaseinfoReport.getRhYin());
        serviceDonatebaseinfo1.setRecordstate("0");
        serviceDonatebaseinfo1.setInpatientno(null);
        serviceDonatebaseinfo1.setTreatmentdeptname(serviceDonatebaseinfoReport.getTreatmentdeptname());
        serviceDonatebaseinfo1.setTreatmenthospitalname(serviceDonatebaseinfoReport.getTreatmenthospitalname());
        serviceDonatebaseinfo1.setResidenceprovince(serviceDonatebaseinfoReport.getResidenceprovince());
        serviceDonatebaseinfo1.setResidenceprovincename(serviceDonatebaseinfoReport.getResidenceprovincename());
        serviceDonatebaseinfo1.setResidencecityname(serviceDonatebaseinfoReport.getRegistercityname());
        serviceDonatebaseinfo1.setResidencetownname(serviceDonatebaseinfoReport.getResidencetownname());
        serviceDonatebaseinfo1.setRegisterprovince(serviceDonatebaseinfoReport.getRegisterprovince());
        serviceDonatebaseinfo1.setRegisterprovincename(serviceDonatebaseinfoReport.getRegisterprovincename());
        serviceDonatebaseinfo1.setRegistercityname(serviceDonatebaseinfoReport.getRegistercityname());
        serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname());
        //先通过caseNo查询是否存在
        ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
        serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
@@ -142,6 +158,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());
        }
@@ -293,6 +310,9 @@
            wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo());
        }

        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNotAdminId())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getCreateBy, serviceDonatebaseinfoReport.getNotAdminId());
        }
        return wrappers;
    }