代码提交

liusheng

2023-08-11 ae29f1b7da8a405a358f5d71150b60a504af5f3a

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -60,7 +60,7 @@
        //查出所有被医院退回的Fund数据
        List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
        for (ServiceFundShared serviceFundShared : serviceFundShareds) {
            if (StringUtils.isNotBlank(serviceFundShared.getCxrjyj())) {
            if (serviceFundShared.getOabdzt().equals("已撤销")) {
                //如果有财务驳回信息说明是退回的
                String[] split = serviceFundShared.getCxrjyj().split("&");
                String phone = serviceFundShared.getPhone();
@@ -83,16 +83,22 @@
                    ServiceFund serviceFund = new ServiceFund();
                    serviceFund.setId(serviceFundShared.getSerfunid());
                    serviceFund.setZffs(serviceFundShared.getZffs());
                    if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
                        serviceFund.setOpochecker(serviceFundShared.getOpochecker());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
                        serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
                    }

                    if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getOfficedirector());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getFinancedirector());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getFinancechecher());
                    }
                    serviceFund.setRiqi(serviceFundShared.getRiqi());
                    boolean b = serviceFundService.updateById(serviceFund);
                    log.info("更新serviceFund里的zffs表是否成功: {}", b);
                    ServiceFundflow serviceFundflow = new ServiceFundflow();
@@ -149,6 +155,10 @@
                    serviceFundflow.setApplytype(null);
                    serviceFundflow.setFundid(serviceFundShared.getSerfunid());
                    serviceFundShared.setSpjg(1);
                    fundflowService.save(serviceFundflow);

                    serviceFundflow.setFlowcontent("已付款 : " + serviceFundShared.getZffs());
                    serviceFundflow.setId(null);
                    fundflowService.save(serviceFundflow);
                    //将审批状态改成1
                    serviceFundSharedService.updateById(serviceFundShared);
@@ -265,7 +275,7 @@
        //查出所有被医院退回的Reimbursement数据
        List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
        for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
            if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
            if (serviceReimbursementShared.getOabdzt().equals("已撤销")) {
                String phone = serviceReimbursementShared.getPhone();
                String[] split = serviceReimbursementShared.getCxrjyj().split("&");

@@ -291,14 +301,22 @@
                    ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
                    serviceReimbursement.setId(serviceReimbursementShared.getReimid());
                    serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
                        serviceReimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
                    }
                    serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
              
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
                        serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) {
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getOfficedirector());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) {
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancedirector());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) {
                        serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancechecher());
                    }
                    boolean b = serviceReimbursementService.updateById(serviceReimbursement);
                    log.info("更新serviceReimbursement里的zffs表是否成功: {}", b);
@@ -359,6 +377,9 @@

                    serviceReimbursementShared.setSpjg(1);
                    fundflowService.save(serviceFundflow);
                    serviceFundflow.setFlowcontent("已付款 : " + serviceReimbursementShared.getZffs());
                    serviceFundflow.setId(null);
                    fundflowService.save(serviceFundflow);
                    serviceReimbursementSharedService.updateById(serviceReimbursementShared);

                } else if (StringUtils.isNotBlank(serviceReimbursementShared.getZffs()) && serviceReimbursementShared.getSpjg().equals("1")) {
@@ -382,6 +403,7 @@
                        //先查询一下fund是否已经更新Opochecker，如果没有更新，则进行更新，并往fundflow表里插一条数据
                        if (StringUtils.isEmpty(serviceReimbursementList.get(0).getOpochecker())) {
                            reimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());

                            serviceReimbursementService.updateById(reimbursement);

                            //将操作保存到fundflow表中