PDF合并，BUG修改

liusheng

2024-04-22 57a6735173d59feb6cfd95c9a8ec76d6f87bc578

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

@@ -40,7 +40,7 @@
    @PreAuthorize("@ss.hasPermi('project:organcharge:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseOrgancharge baseOrgancharge) {
        log.info("查询人体器官获取费用列表{}：" , baseOrgancharge);
        log.info("查询人体器官获取费用列表{}：", baseOrgancharge);
        startPage();
        List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
        return getDataTable(list);
@@ -54,7 +54,7 @@
    @Log(title = "人体器官获取费用", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseOrgancharge baseOrgancharge) {
        log.info("导出人体器官获取费用列表{}：" , baseOrgancharge);
        log.info("导出人体器官获取费用列表{}：", baseOrgancharge);
        List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
        ExcelUtil<BaseOrgancharge> util = new ExcelUtil<BaseOrgancharge>(BaseOrgancharge.class);
        return util.exportExcel(list, "人体器官获取费用数据");
@@ -67,7 +67,7 @@
    @PreAuthorize("@ss.hasPermi('project:organcharge:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取人体器官获取费用详细信息{}：" , id);
        log.info("获取人体器官获取费用详细信息{}：", id);
        return AjaxResult.success(baseOrganchargeService.getById(id));
    }

@@ -80,8 +80,10 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrgancharge baseOrgancharge) {
        log.info("新增人体器官获取费用{}：" , baseOrgancharge);
        return toAjax(baseOrganchargeService.save(baseOrgancharge));
        log.info("新增人体器官获取费用{}：", baseOrgancharge);
        boolean save = baseOrganchargeService.save(baseOrgancharge);
        log.info("新增人体器官获取费用baseOrgancharge的ID：{}", baseOrgancharge.getId());
        return AjaxResult.success(baseOrgancharge);
    }

    /**
@@ -93,7 +95,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseOrgancharge baseOrgancharge) {
        log.info("修改人体器官获取费用{}：" , baseOrgancharge);
        log.info("修改人体器官获取费用{}：", baseOrgancharge);
        return toAjax(baseOrganchargeService.updateById(baseOrgancharge));
    }

@@ -104,7 +106,7 @@
    @PreAuthorize("@ss.hasPermi('project:organcharge:remove')")
    @GetMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除人体器官获取费用{}：" , ids);
        log.info("删除人体器官获取费用{}：", ids);
        return toAjax(baseOrganchargeService.removeByIds(Arrays.asList(ids)));
    }
}