PDF合并，BUG修改

liusheng

2024-04-22 57a6735173d59feb6cfd95c9a8ec76d6f87bc578

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

@@ -4,9 +4,13 @@
import java.text.SimpleDateFormat;
import java.util.*;

import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
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;
@@ -19,7 +23,9 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -42,6 +48,7 @@
 * @author ruoyi
 * @date 2021-11-17
 */
@Slf4j
@Api("捐献见证管理")
@RestController
@RequestMapping("/project/donationwitness")
@@ -119,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);
    }

    /**
@@ -135,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("*");
@@ -202,6 +221,7 @@
        }
        Map<String, Object> map = new HashMap<>();
        map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
        map.put("downloadName", name + ".doc");
        return map;
    }

@@ -305,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", "□");
        }
@@ -517,5 +537,24 @@
        return AjaxResult.success(serviceDonationwitnessService.getStats(timeVO));
    }

    @RepeatSubmit
    @ApiOperation("新增或修改捐献见证管理")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonationwitness")
    public AjaxResult saveOrUpdateDonationwitness(@RequestBody List<ServiceDonationwitness> serviceDonationwitnessList) {
        if (CollectionUtils.isEmpty(serviceDonationwitnessList)) {
            throw new BaseException("请检查需要新增或修改的捐献见证管理参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonationwitness serviceDonationwitness : serviceDonationwitnessList) {
            log.info("捐献见证管理id是否为空 : {},基础表的id为 : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
            if (serviceDonationwitness.getId() == null) {
                i = serviceDonationwitnessService.save(serviceDonationwitness);
            } else {
                i = serviceDonationwitnessService.updateById(serviceDonationwitness);
            }
        }
        return toAjax(i);
    }

}