代码提交

liusheng

2023-08-11 ae29f1b7da8a405a358f5d71150b60a504af5f3a

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

@@ -535,39 +535,6 @@
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "提交的关于捐献案例【" + serviceFund.getDonorname() + "】的费用申请已通过" + (OriginalFlowLevel + 1) + "级审核");
                if (TotalLevel == OriginalFlowLevel + 1) {
                    serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
//                    ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
//                    serviceFundShared.setId(null);
//                    serviceFundShared.setSerfunid(serviceFund.getId());
//                    serviceFundShared.setAmountrequested(new BigDecimal(serviceFund.getAmountrequested()));
//                    serviceFundShared.setPrepaidamount(new BigDecimal(serviceFund.getPrepaidamount()));
//                    serviceFundShared.setTotalcost(new BigDecimal(serviceFund.getTotalcost()));
//                    serviceFundShared.setProcurementcost(new BigDecimal(serviceFund.getProcurementcost()));
//                    serviceFundShared.setExpertcost(new BigDecimal(serviceFund.getExpertcost()));
//                    serviceFundShared.setEthicscost(new BigDecimal(serviceFund.getEthicscost()));
//                    serviceFundShared.setMedicalcost(new BigDecimal(serviceFund.getMedicalcost()));
//                    serviceFundShared.setFamilycost(new BigDecimal(serviceFund.getFamilycost()));
//                    serviceFundShared.setAftercarecost(new BigDecimal(serviceFund.getAftercarecost()));
//                    fundSharedService.save(serviceFundShared);
//
//                    Map<String, Object> columnMap = new HashMap<>();
//                    columnMap.put("fundID", checkFundVO.getFundid());
//                    //获取详情数据
//                    List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap);
//                    logger.info("serviceFundController---checkFund的返回值serviceFunddetails :{}", serviceFunddetails);
//                    List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class);
//                    for (int i = 0; i < serviceFunddetails.size(); i++) {
//                        serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
//                        serviceFunddetailShareds.get(i).setFdid(serviceFunddetails.get(i).getId());
//                        serviceFunddetailShareds.get(i).setAmount(new BigDecimal(serviceFunddetails.get(i).getAmount()));
//                        serviceFunddetailShareds.get(i).setPrepaidamount(new BigDecimal(serviceFunddetails.get(i).getPrepaidamount()));
//                        serviceFunddetailShareds.get(i).setTaxamount(new BigDecimal(serviceFunddetails.get(i).getTaxamount()));
//                        serviceFunddetailShareds.get(i).setTaxedamount(new BigDecimal(serviceFunddetails.get(i).getTaxedamount()));
//                        serviceFunddetailShareds.get(i).setQuantity(new BigDecimal(serviceFunddetails.get(i).getQuantity()));
//                        serviceFunddetailShareds.get(i).setPrice(new BigDecimal(serviceFunddetails.get(i).getPrice()));
//                        serviceFunddetailShareds.get(i).setId(null);
//                    }
//                    funddetailSharedService.saveBatch(serviceFunddetailShareds);

                }

            } else {
@@ -599,23 +566,20 @@
        }
        for (ServiceFund sf : infoByInfoIdList) {
            //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了
            if (sf.getBackflowlevel() == 100 || sf.getBackflowlevel() == 199) {
                ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
                serviceFundShared.setId(null);
                serviceFundShared.setDel_flag(0);
                fundSharedService.save(serviceFundShared);

            if (sf.getBackflowlevel() == 199) {
                //将fund表的审核状态改成100
                sf.setBackflowlevel(100);
                serviceFundService.updateById(sf);

                //往分享表里新增
                serviceFundService.addFundSharedInfo(serviceFund.getId());

                return success();
            } else {
                serviceFund.setFlowlevel(sf.getBackflowlevel());
                boolean bret = serviceFundService.updateById(serviceFund);
                log.info("serviceFundService.updateById返参:{}", bret);
//        if (bret) {
//            addReiSharedDatd(serviceFund, 2);
//        }

                return toAjax(bret);
            }
        }