修改上传文件名，医学成本的文件展示

liusheng

2023-08-10 c8707150e15be1425a096e40d44f043e9ecce5a2

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

@@ -163,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));
    }

    /**
     * 导出费用申请主列表
@@ -534,38 +530,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);

                }

@@ -586,14 +583,14 @@
     * 修改费用申请
     */
    @ApiOperation("修改费用申请")
    //@PreAuthorize("@ss.hasPermi('project:fund:edit')")
    @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)) {
            log.info("修改费用申请，通过入参查询 serviceFundService.queryInfoById数据为空,入参:{}", serviceFund);
            return toAjax(false);
        }
        for (ServiceFund sf : infoByInfoIdList) {
@@ -611,6 +608,7 @@
            } else {
                serviceFund.setFlowlevel(sf.getBackflowlevel());
                boolean bret = serviceFundService.updateById(serviceFund);
                log.info("serviceFundService.updateById返参:{}", bret);
//        if (bret) {
//            addReiSharedDatd(serviceFund, 2);
//        }