代码提交

liusheng

2023-09-07 5f265641217e0a2b5b8160233487e63ff8cfaf39

代码提交

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

@@ -1087,11 +1087,14 @@
            String fyxm = "";
            fyxm += f.getItemname() == null ? "" : f.getItemname();
            fyxm += f.getAmount() + "元";
//            fyxm += "(";
//            fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
//            fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
//            fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
//            fyxm += ")";
            //如果是医疗成本，则把银行卡加上每条明细的后面
            if (serviceFund.getApplytype().equals("3")) {
                fyxm += "(";
                fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
                fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
                fyxm += ")";
            }
            map.put("FYXM", fyxm);
            newList.add(map);
        }
@@ -1104,7 +1107,8 @@
//        dataMap.put("JEXS", serviceFund.getAmountrequested());
//        dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "整");
        //备注里放的是经办人的银行卡信息
        dataMap.put("BXBZ", infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + "  " + infoByUserNo.getBankcardno());

        dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") ? "" : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + "  " + infoByUserNo.getBankcardno());
        dataMap.put("YZ", serviceFund.getPresident() == null ? "" : serviceFund.getPresident());
        dataMap.put("CWFYZ", serviceFund.getFinvicepresident() == null ? "" : serviceFund.getFinvicepresident());
        dataMap.put("YWFYZ", serviceFund.getBusvicepresident() == null ? "" : serviceFund.getBusvicepresident());

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

@@ -117,8 +117,7 @@
     * 删除报销申请明细并修改金额
     */
    @ApiOperation("删除报销申请明细并修改金额")
    @Log(title = "报销申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/deleteDetail/{id}")
    @GetMapping("/deleteDetail/{id}")
    public AjaxResult deleteDetail(@PathVariable Long id) {
        return AjaxResult.success(serviceFunddetailService.deleteDetail(id));
    }