代码提交

liusheng

2026-01-28 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2

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

@@ -9,10 +9,13 @@
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.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.service.IServiceDonatecompletioninfoService;
@@ -60,17 +63,25 @@
        configuration.setDefaultEncoding("utf-8");
    }

//    /**
//     * 查询捐献完成列表
//     */
//    @ApiOperation("查询捐献完成列表")
//    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
//    @GetMapping("/list")
//    public Map<String, Object> list(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
//        log.info("查询捐献完成列表：{}", donationCompletionBaseInfoVO);
//        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(donationCompletionBaseInfoVO);
//        return getDataTable(list);
//    }
    /**
     * 查询捐献完成列表基本信息
     */
    @ApiOperation("查询捐献完成列表基本信息（器官利用）")
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
    @PostMapping("/getDonationCompletionBaseInfo")
    public Map<String, Object> getDonationCompletionBaseInfo(@RequestBody DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
        log.info("查询捐献完成列表基本信息：{}", donationCompletionBaseInfoVO);
        Integer offset = PageUtils.getOffset(donationCompletionBaseInfoVO.getPageNum(), donationCompletionBaseInfoVO.getPageSize());
        donationCompletionBaseInfoVO.setPageNum(offset);
        List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);

        donationCompletionBaseInfoVO.setPageNum(null);
        donationCompletionBaseInfoVO.setPageSize(null);
        Integer totalCount = 0;
        List<DonationCompletionBaseInfoDTO> total = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
        if (!org.springframework.util.CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(donationCompletionBaseInfoDTOList,totalCount);
    }


    /**