BUG修改

liusheng

2023-08-02 0c3f8972c92d0d5ce5912be6c460a3f2165ec04c

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

@@ -59,7 +59,7 @@


    /**
     * 查询费用申请主列表
     * 查询费用申请主列表(包含删除的)
     *
     * @param serviceFund 费用申请主
     * @return 费用申请主
@@ -69,6 +69,9 @@
        LambdaQueryWrapper<ServiceFund> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceFund.getDonorno())) {
            wrappers.eq(ServiceFund::getDonorno, serviceFund.getDonorno());
        }
        if (serviceFund.getId() != null) {
            wrappers.eq(ServiceFund::getId, serviceFund.getId());
        }
        if (StringUtils.isNotBlank(serviceFund.getUserno())) {
            wrappers.eq(ServiceFund::getUserno, serviceFund.getUserno());
@@ -91,6 +94,18 @@
        if (serviceFund.getUploadtime() != null) {
            wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
        }
        return this.list(wrappers);
    }


    @Override
    public List<ServiceFund> queryInfoById(ServiceFund serviceFund) {
        LambdaQueryWrapper<ServiceFund> wrappers = Wrappers.lambdaQuery();
        if (serviceFund.getId() != null) {
            wrappers.eq(ServiceFund::getId, serviceFund.getId());
        }

        wrappers.eq(ServiceFund::getDel_flag, "0");
        return this.list(wrappers);
    }

@@ -643,6 +658,7 @@

        return count;
    }

    int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {
        //上传OA文件
        //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";