从分享表取出riqi给主表加上

liusheng

2023-07-28 38c4696da012c26f7e4678fcbad76eb0d73baa46

从分享表取出riqi给主表加上

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

@@ -92,7 +92,7 @@
                    if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
                        serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
                    }

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

                    serviceFundflow.setFlowcontent(serviceFundShared.getZffs());
                    fundflowService.save(serviceFundflow);
                    //将审批状态改成1
                    serviceFundSharedService.updateById(serviceFundShared);
@@ -291,6 +294,7 @@
                    ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
                    serviceReimbursement.setId(serviceReimbursementShared.getReimid());
                    serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
                    serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
                        serviceReimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
                    }
@@ -359,6 +363,8 @@

                    serviceReimbursementShared.setSpjg(1);
                    fundflowService.save(serviceFundflow);
                    serviceFundflow.setFlowcontent(serviceReimbursementShared.getZffs());
                    fundflowService.save(serviceFundflow);
                    serviceReimbursementSharedService.updateById(serviceReimbursementShared);

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

                            serviceReimbursementService.updateById(reimbursement);

                            //将操作保存到fundflow表中