代码修改

liusheng

2023-05-18 0b92f536b0b302e479ca0307008666866091b492

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -213,122 +213,122 @@
    }


    public int addReiSharedDatd(ServiceFund serviceFund, int nType) {
        //remShare = ;
        ServiceFundShared remShare = null;
        if (nType == 1) {
            remShare = new ServiceFundShared();
            remShare.setSerfunid(serviceFund.getId());
        } else //modify
        {
            List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
            if (remlist != null) remShare = remlist.get(0);
        }

        remShare.setDonorno(serviceFund.getDonorno());
        remShare.setDonorname(serviceFund.getDonorname());
        remShare.setUserno(serviceFund.getUserno());
        remShare.setUsername(serviceFund.getUsername());
        remShare.setUnitname(serviceFund.getUnitname());
        remShare.setUnitno(serviceFund.getUnitno());
        remShare.setUnituserno(serviceFund.getUnituserno());
        remShare.setPhone(serviceFund.getPhone());
        remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
        remShare.setAnnexregistform(serviceFund.getAnnexregistform());
        Double nTemp = serviceFund.getPretaxcost();
        if (nTemp == null) nTemp = 0d;
        remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));

        nTemp = serviceFund.getTaxedcost();
        if (nTemp == null) nTemp = 0d;
        remShare.setTaxedcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getTotalcost();
        if (nTemp == null) nTemp = 0d;
        remShare.setTotalcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getExpertcost();
        if (nTemp == null) nTemp = 0.0;
        remShare.setExpertcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getEthicscost();
        if (nTemp == null) nTemp = 0.0;
        remShare.setEthicscost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getMedicalcost();
        if (nTemp == null) nTemp = 0.0;
        remShare.setMedicalcost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getFamilycost();
        if (nTemp == null) nTemp = 0.0;
        remShare.setFamilycost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getAftercarecost();
        if (nTemp == null) nTemp = 0.0;
        remShare.setAftercarecost(BigDecimal.valueOf(nTemp));

        nTemp = serviceFund.getAmountrequested();
        if (nTemp == null) nTemp = 0.0;
        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));


        remShare.setApplytype(serviceFund.getApplytype());

        nTemp = serviceFund.getPrepaidamount();
        if (nTemp == null) nTemp = 0.0;
        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));

        remShare.setInvoicecount(serviceFund.getInvoicecount());
        remShare.setAttachcount(serviceFund.getAttachcount());
        remShare.setManagerno(serviceFund.getManagerno());
        remShare.setManagername(serviceFund.getManagername());
        remShare.setDeptmentno(serviceFund.getDeptmentno());
        remShare.setDeptmentname(serviceFund.getDeptmentname());
        remShare.setOpochecker(serviceFund.getOpochecker());
        remShare.setFinvicepresident(serviceFund.getFinvicepresident());
        remShare.setBusvicepresident(serviceFund.getBusvicepresident());
        remShare.setOfficedirector(serviceFund.getOfficedirector());
        remShare.setFinancedirector(serviceFund.getFinancedirector());
        remShare.setFinancechecher(serviceFund.getFinancechecher());
        //remShare.setIsdistribute(serviceFund.getIsdistribute());
        remShare.setRecordstatus(serviceFund.getRecordstatus());
        remShare.setUploadflag(serviceFund.getUploadflag());
        remShare.setUploadtime(serviceFund.getUploadtime());
        long nLevel = serviceFund.getFlowlevel();
        remShare.setFlowlevel(nLevel);

        remShare.setInfoid(serviceFund.getInfoid());

        //remShare.setOaid(serviceReimbursement.getOaid());
        //remShare.setDonorno(serviceReimbursement.getDonorno());

        boolean bRet = false;
        if (nType == 1) {
            bRet = fundServiceShare.save(remShare);
        } else {
            //remShare.setId(serviceReimbursement.);
            bRet = fundServiceShare.updateById(remShare);
        }

        //if(!bRet) return -1;
        String strMutfileUrl = remShare.getAnnexbankcard();
        //有附件时才调用第三方进行上传
        if (strMutfileUrl == null) return 0;
        if (strMutfileUrl.isEmpty()) return 0;

        try {
            uploadOAFileAndUpdateDb(remShare);
        } catch (Exception e) {
            logger.error("调用第三方接口出错!");
            e.printStackTrace();
        }

        //此处保存成功后要上传OA，保存返回值

        return 0;
    }
//    public int addReiSharedDatd(ServiceFund serviceFund, int nType) {
//        //remShare = ;
//        ServiceFundShared remShare = null;
//        if (nType == 1) {
//            remShare = new ServiceFundShared();
//            remShare.setSerfunid(serviceFund.getId());
//        } else //modify
//        {
//            List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
//            if (remlist != null) remShare = remlist.get(0);
//        }
//
//        remShare.setDonorno(serviceFund.getDonorno());
//        remShare.setDonorname(serviceFund.getDonorname());
//        remShare.setUserno(serviceFund.getUserno());
//        remShare.setUsername(serviceFund.getUsername());
//        remShare.setUnitname(serviceFund.getUnitname());
//        remShare.setUnitno(serviceFund.getUnitno());
//        remShare.setUnituserno(serviceFund.getUnituserno());
//        remShare.setPhone(serviceFund.getPhone());
//        remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
//        remShare.setAnnexregistform(serviceFund.getAnnexregistform());
//        Double nTemp = serviceFund.getPretaxcost();
//        if (nTemp == null) nTemp = 0d;
//        remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
//        //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
//        // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
//
//        nTemp = serviceFund.getTaxedcost();
//        if (nTemp == null) nTemp = 0d;
//        remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceFund.getTotalcost();
//        if (nTemp == null) nTemp = 0d;
//        remShare.setTotalcost(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceFund.getExpertcost();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setExpertcost(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceFund.getEthicscost();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setEthicscost(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceFund.getMedicalcost();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceFund.getFamilycost();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setFamilycost(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceFund.getAftercarecost();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
//
//        nTemp = serviceFund.getAmountrequested();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
//
//
//        remShare.setApplytype(serviceFund.getApplytype());
//
//        nTemp = serviceFund.getPrepaidamount();
//        if (nTemp == null) nTemp = 0.0;
//        remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
//
//        remShare.setInvoicecount(serviceFund.getInvoicecount());
//        remShare.setAttachcount(serviceFund.getAttachcount());
//        remShare.setManagerno(serviceFund.getManagerno());
//        remShare.setManagername(serviceFund.getManagername());
//        remShare.setDeptmentno(serviceFund.getDeptmentno());
//        remShare.setDeptmentname(serviceFund.getDeptmentname());
//        remShare.setOpochecker(serviceFund.getOpochecker());
//        remShare.setFinvicepresident(serviceFund.getFinvicepresident());
//        remShare.setBusvicepresident(serviceFund.getBusvicepresident());
//        remShare.setOfficedirector(serviceFund.getOfficedirector());
//        remShare.setFinancedirector(serviceFund.getFinancedirector());
//        remShare.setFinancechecher(serviceFund.getFinancechecher());
//        //remShare.setIsdistribute(serviceFund.getIsdistribute());
//        remShare.setRecordstatus(serviceFund.getRecordstatus());
//        remShare.setUploadflag(serviceFund.getUploadflag());
//        remShare.setUploadtime(serviceFund.getUploadtime());
//        long nLevel = serviceFund.getFlowlevel();
//        remShare.setFlowlevel(nLevel);
//
//        remShare.setInfoid(serviceFund.getInfoid());
//
//        //remShare.setOaid(serviceReimbursement.getOaid());
//        //remShare.setDonorno(serviceReimbursement.getDonorno());
//
//        boolean bRet = false;
//        if (nType == 1) {
//            bRet = fundServiceShare.save(remShare);
//        } else {
//            //remShare.setId(serviceReimbursement.);
//            bRet = fundServiceShare.updateById(remShare);
//        }
//
//        //if(!bRet) return -1;
//        String strMutfileUrl = remShare.getAnnexbankcard();
//        //有附件时才调用第三方进行上传
//        if (strMutfileUrl == null) return 0;
//        if (strMutfileUrl.isEmpty()) return 0;
//
//        try {
//            uploadOAFileAndUpdateDb(remShare);
//        } catch (Exception e) {
//            logger.error("调用第三方接口出错!");
//            e.printStackTrace();
//        }
//
//        //此处保存成功后要上传OA，保存返回值
//
//        return 0;
//    }


    int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {