PDF合并，BUG修改

liusheng

2024-04-22 57a6735173d59feb6cfd95c9a8ec76d6f87bc578

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

@@ -1,7 +1,6 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
@@ -9,11 +8,14 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import com.ruoyi.project.service.IServiceDonateorganService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -46,6 +48,9 @@

    @Autowired
    private IServiceDonateorganService serviceDonateorganService;

    @Autowired
    private IServiceDonatecomporganService serviceDonatecomporganService;

    private static Configuration configuration = null;

@@ -109,12 +114,58 @@
    @ApiOperation("新增捐献完成")
    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
    @Log(title = "捐献完成", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit(interval = 5000)
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("新增捐献完成：{}", serviceDonatecompletioninfo);
        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
        boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
        log.info("新增捐献完成serviceDonatecompletioninfo的ID：{}", serviceDonatecompletioninfo.getId());
        return AjaxResult.success(serviceDonatecompletioninfo);
    }

//    /**
//     * 新增捐献完成详情
//     */
//    @ApiOperation("新增捐献完成详情")
//    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
//    @Log(title = "新增捐献完成详情", businessType = BusinessType.INSERT)
//    @PostMapping
//    @RepeatSubmit(interval = 5000)
//    public AjaxResult addDetail(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
//        log.info("新增捐献完成：{}", serviceDonatecompletioninfo);
//        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
//        //新增donatecomporgan数据
//        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfo.getServiceDonatecomporganList())) {
//            for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfo.getServiceDonatecomporganList()) {
//                if (serviceDonatecomporgan.getInfoid() == null) {
//                    throw new BaseException("请检查捐献器官移植信息，是否与捐献基础表进行关联");
//                }
//                serviceDonatecomporganService.save(serviceDonatecomporgan);
//            }
//        }
//        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
//    }

    @RepeatSubmit
    @ApiOperation("新增或修改捐献完成")
    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonatecompletioninfo")
    public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
        if (CollectionUtils.isEmpty(serviceDonatecompletioninfoList)) {
            throw new BaseException("请检查需要新增或修改的捐献完成参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonatecompletioninfo serviceDonatecompletioninfo : serviceDonatecompletioninfoList) {
            log.info("捐献完成id是否为空 : {},基础表的id为 : {}", serviceDonatecompletioninfo.getId(), serviceDonatecompletioninfo.getInfoid());
            if (serviceDonatecompletioninfo.getId() == null) {
                i = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
            } else {
                i = serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo);
            }
        }
        return toAjax(i);
    }

    /**
@@ -185,6 +236,7 @@
        }
        Map<String, Object> map = new HashMap<>();
        map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
        map.put("downloadName", name + ".doc");
        return map;
    }