PDF合并，BUG修改

liusheng

2024-04-22 57a6735173d59feb6cfd95c9a8ec76d6f87bc578

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

@@ -9,6 +9,8 @@
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
@@ -124,11 +126,21 @@
    @ApiOperation("新增捐献见证")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
    @Log(title = "捐献见证", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {

        return toAjax(serviceDonationwitnessService.save(serviceDonationwitness));
        boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
        log.info("新增捐献见证是否成功：{},id为：{},infoId为：{}", save, serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
//        if (save) {
//            //生成“捐献者编号”
//            ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(serviceDonationwitness.getInfoid());
//            log.info("serviceDonatebaseinfo的信息为{}", serviceDonatebaseinfo);
//            String donorno = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
//            log.info("生成的捐献者编号为:{}", donorno);
//            serviceDonatebaseinfo.setDonorno(donorno);
//            serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo);
//        }
        return AjaxResult.success(serviceDonationwitness);
    }

    /**
@@ -140,6 +152,8 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        log.info("新增捐献见证id为：{},infoId为：{}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());

        int last = -1;
        if (StringUtils.isNotEmpty(serviceDonationwitness.getDonorno())) {
            last = serviceDonationwitness.getDonorno().lastIndexOf("*");
@@ -207,6 +221,7 @@
        }
        Map<String, Object> map = new HashMap<>();
        map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
        map.put("downloadName", name + ".doc");
        return map;
    }

@@ -310,18 +325,18 @@
        dataMap.put("ZDMCG", donationWitness.getAortacannulatime() == null ? "" : sformat.format(donationWitness.getAortacannulatime()));
        dataMap.put("ZDMGZ", donationWitness.getAortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAortaperfusiontime()));

        if (donationWitness.getIsrestoreremains() == 0) {
        if (donationWitness.getIsrestoreremains() != null && donationWitness.getIsrestoreremains() == 0) {
            dataMap.put("HFYT", "□");
            dataMap.put("BHFYT", (char) 8730);
        } else if (donationWitness.getIsrestoreremains() == 1) {
        } else if (donationWitness.getIsrestoreremains() != null && donationWitness.getIsrestoreremains() == 1) {
            dataMap.put("HFYT", (char) 8730);
            dataMap.put("BHFYT", "□");
        }

        if (donationWitness.getIsspendremember() == 0) {
        if (donationWitness.getIsspendremember() != null && donationWitness.getIsspendremember() == 0) {
            dataMap.put("MA", "□");
            dataMap.put("BMA", (char) 8730);
        } else if (donationWitness.getIsspendremember() == 1) {
        } else if (donationWitness.getIsspendremember() != null && donationWitness.getIsspendremember() == 1) {
            dataMap.put("MA", (char) 8730);
            dataMap.put("BMA", "□");
        }