代码修改

liusheng

2023-08-10 e623e633f1a28b66632d9c17dcfe2f6e2a78073b

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

@@ -27,6 +27,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Options;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.io.*;
@@ -162,15 +163,11 @@
        return AjaxResult.success(serviceFundService.getFundId(infoid));
    }

    @GetMapping("/addFundSharedInfo/{id}")
    public AjaxResult addFundSharedInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundService.addFundSharedInfo(id));
    }
//    @GetMapping("/addFundSharedInfo/{id}")
//    public AjaxResult addFundSharedInfo(@PathVariable("id") Long id) {
//        return AjaxResult.success(serviceFundService.addFundSharedInfo(id));
//    }

    @GetMapping("/getFundDetail/{id}")
    public AjaxResult getFundDetail(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundService.getFundDetail(id));
    }

    /**
     * 导出费用申请主列表
@@ -434,67 +431,8 @@
    @RepeatSubmit
    @Options(useGeneratedKeys = true, keyProperty = "id")
    public AjaxResult addOrUpdateNew(@RequestBody ServiceFundVO serviceFundVO) {
        Long id = null;
        if (serviceFundVO.getId() == null) {
            boolean b = serviceFundService.save(serviceFundVO);
            id = serviceFundVO.getId();
        } else {
            serviceFundService.updateById(serviceFundVO);
            id = serviceFundVO.getId();
        }
        List<ServiceFunddetail> serviceFunddetails = serviceFundVO.getServiceFunddetails();

        double taxBefore = 0.0;
        double taxAfter = 0.0;
        for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
            serviceFunddetail.setFundid(id);
            log.info("serviceFunddetail的值为 : {}",serviceFunddetail);
            if (serviceFunddetail.getTaxedamount() != null && serviceFunddetail.getAmount() != null && serviceFunddetail.getTaxedamount() != 0.0 && serviceFunddetail.getAmount() != 0.0) {
                // 税前税后都不为空
                if (serviceFunddetail.getId() == null) {
                    serviceFunddetailService.save(serviceFunddetail);
                } else {
                    serviceFunddetailService.updateById(serviceFunddetail);
                }
                continue;
            } else if (serviceFunddetail.getTaxedamount() != 0.0 && serviceFunddetail.getTaxedamount() != null) {
                // 税后求税前,如果是专家费申请  或 伦理专家费申请   才会计算税前税后
                if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
                    Double taxationBefore = Double.valueOf(TaxtUtils.getTaxationBefore(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())));
                    // 税金
                    String taxation = TaxtUtils.getTaxation(BigDecimal.valueOf(taxationBefore));
                    serviceFunddetail.setAmount(Double.valueOf(taxationBefore));
                    serviceFunddetail.setTaxamount(Double.parseDouble(taxation));
                }
            } else if (serviceFunddetail.getAmount() != 0.0 && serviceFunddetail.getAmount() != null) {
                // 税前求税后,如果是专家费申请  或 伦理专家费申请   才会计算税前税后
                if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
                    double tax = Double.parseDouble(TaxtUtils.getTaxation(BigDecimal.valueOf(serviceFunddetail.getAmount())));
                    BigDecimal taxAfterMoney = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(BigDecimal.valueOf(tax));
                    serviceFunddetail.setTaxamount(tax);
                    serviceFunddetail.setTaxedamount(taxAfterMoney.doubleValue());
                }
            }

            //根据id判断是新增还是修改
            if (serviceFunddetail.getId() == null) {
                serviceFunddetailService.save(serviceFunddetail);
            } else {
                serviceFunddetailService.updateById(serviceFunddetail);
            }
            if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
                //如果是专家费申请  或 伦理专家费申请   才会计算税前税后
                taxBefore = taxBefore + serviceFunddetail.getAmount();
                taxAfter = taxAfter + serviceFunddetail.getTaxedamount();
            }
        }
        //将税前、税后金额更新到fund表中
        serviceFundVO.setPretaxcost(taxBefore);
        serviceFundVO.setTaxedcost(taxAfter);
        serviceFundService.updateById(serviceFundVO);
//        //将计算好的数据，保存到detail表中
//        serviceFunddetailService.saveBatch(serviceFunddetails);
        return AjaxResult.success(id);
        return AjaxResult.success(serviceFundService.addOrUpdateNew(serviceFundVO));
    }


@@ -551,6 +489,7 @@
                if (CheckFlag == 2) {
                    //应医院要求如果出现退回，直接退到发起者
                    FlowLevel = 0;
                    RecordStatus = -1;
                } else {
                    RecordStatus = (FlowLevel + 1) * 2 - 1;
                    FlowLevel = (FlowLevel - 1);
@@ -562,6 +501,7 @@

            serviceFund.setRecordstatus(RecordStatus);
            serviceFund.setFlowlevel(FlowLevel);
            serviceFund.setBackflowlevel(serviceFund.getFlowlevel());

            ServiceFundflow serviceFundflow = new ServiceFundflow();
            SysUser user = loginUser.getUser();
@@ -592,38 +532,39 @@
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核通过");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "提交的关于捐献案例【" + serviceFund.getDonorname() + "】的费用申请已通过" + (OriginalFlowLevel + 1) + "级审核");
                if (TotalLevel == OriginalFlowLevel + 1) {
                    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);
                    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);

                }

@@ -641,15 +582,19 @@


    /**
     * 修改费用申请主
     * 修改费用申请
     */
    @ApiOperation("修改费用申请主")
    //@PreAuthorize("@ss.hasPermi('project:fund:edit')")
    @ApiOperation("修改费用申请")
    @Log(title = "费用申请主", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/fundEdit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceFund serviceFund) {
    public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
        log.info("修改费用申请入参:{}", serviceFund);
        List<ServiceFund> infoByInfoIdList = serviceFundService.queryInfoById(serviceFund);
        log.info("修改费用申请，通过入参查询 serviceFundService.queryInfoById数据为空,入参:{}", infoByInfoIdList.size());
        if (CollectionUtils.isEmpty(infoByInfoIdList)) {
            return toAjax(false);
        }
        for (ServiceFund sf : infoByInfoIdList) {
            //如果等于100，说明已经走到医院财务那边了；财务那边取数据是从分享表取，所以，这里直接往分享表里添加数据就行了
            if (sf.getBackflowlevel() == 100 || sf.getBackflowlevel() == 199) {
@@ -665,6 +610,7 @@
            } else {
                serviceFund.setFlowlevel(sf.getBackflowlevel());
                boolean bret = serviceFundService.updateById(serviceFund);
                log.info("serviceFundService.updateById返参:{}", bret);
//        if (bret) {
//            addReiSharedDatd(serviceFund, 2);
//        }
@@ -1129,8 +1075,10 @@
        }
        dataMap.put("items", newList);

        dataMap.put("JEXS", serviceFund.getAmountrequested());
        dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "整");
        dataMap.put("JEXS", serviceFund.getPretaxcost());
        dataMap.put("JEDS", convert(serviceFund.getPretaxcost()) + "整");
//        dataMap.put("JEXS", serviceFund.getAmountrequested());
//        dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "整");
        dataMap.put("BXBZ", serviceFund.getRemark() == null ? "" : serviceFund.getRemark());

        dataMap.put("YYMMDD", time);