代码提交

liusheng

3 天以前 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b

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

@@ -2,24 +2,25 @@

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
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.PageUtils;
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.ServiceDonateorganBase;
import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import com.ruoyi.project.service.IServiceDonateorganBaseService;
import com.ruoyi.project.service.IServiceDonateorganService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -80,7 +81,7 @@
        Integer totalCount = 0;
        List<DonationCompletionBaseInfoDTO> total = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
        if (!org.springframework.util.CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(donationCompletionBaseInfoDTOList,totalCount);
        return getDataTable(donationCompletionBaseInfoDTOList, totalCount);
    }


@@ -113,61 +114,39 @@
     * 新增捐献完成
     */
    @ApiOperation("新增捐献完成")
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
    @Log(title = "捐献完成", businessType = BusinessType.INSERT)
    @UniqueCheck(fields = {"infoid"},
            entityClass = ServiceDonatecompletioninfoVO.class,
            serviceClass = IServiceDonatecompletioninfoService.class,
            message = "新增捐献完成的infoid已存在,无法保存!")
    @PostMapping("/add")
    @RepeatSubmit(interval = 5000)
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("新增捐献完成：{}", serviceDonatecompletioninfo);
        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
        boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
        log.info("新增捐献完成serviceDonatecompletioninfo的ID：{}", serviceDonatecompletioninfo.getId());
        return AjaxResult.success(serviceDonatecompletioninfo);
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        log.info("新增捐献完成：{}", serviceDonatecompletioninfoVO);
        boolean save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
        return AjaxResult.success(save);
    }

//    /**
//     * 新增捐献完成详情
//     */
//    @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);
//
//    @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(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
//        return toAjax(i);
//    }

    @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);
    }

    /**
     * 修改捐献完成
@@ -177,15 +156,9 @@
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo1 = new ServiceDonatecompletioninfo();
        serviceDonatecompletioninfo1.setInfoid(serviceDonatecompletioninfo.getInfoid());
        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo1);
        if (CollectionUtils.isEmpty(list)) {
            return error("案例ID，对应的完成登记信息为空");
        }
        serviceDonatecompletioninfo.setId(list.get(0).getId());
        return toAjax(serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo));
    public AjaxResult edit(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        boolean edit = serviceDonatecompletioninfoService.edit(serviceDonatecompletioninfoVO);
        return toAjax(edit);
    }

    /**