代码提交

liusheng

2026-01-21 29f287cf6e4869d7bbc283991458e09a03b59c52

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

@@ -4,15 +4,14 @@
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.PageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
@@ -41,7 +40,6 @@
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

/**
 * 捐献见证Controller
@@ -50,7 +48,7 @@
 * @date 2021-11-17
 */
@Slf4j
@Api("捐献见证管理")
@Api(description = "捐献见证管理（死亡判定）")
@RestController
@RequestMapping("/project/donationwitness")
public class ServiceDonationwitnessController extends BaseController {
@@ -77,25 +75,39 @@
        configuration.setDefaultEncoding("utf-8");
    }

    /**
     * 查询捐献见证列表
     */
    @ApiOperation("获取捐献见证列表")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
        startPage();
        List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
        return getDataTable(list);
    }
//    /**
//     * 查询捐献见证列表
//     */
//    @ApiOperation("获取捐献见证列表")
//    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
//    @GetMapping("/list")
//    public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
//        startPage();
//        List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
//        return getDataTable(list);
//    }
//
//    @ApiOperation("获取捐献见证列表-新")
//    @GetMapping("/listnew")
//    public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
//        startPage();
//        List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
//        return getDataTable(list);
//    }
@ApiOperation("获取捐献见证基本信息(器官获取)")
@PostMapping("/getDonationwitnessBaseInfo")
public Map<String,Object> getDonationwitnessBaseInfo(@RequestBody DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
    Integer offset = PageUtils.getOffset(donationwitnessBaseInfoVO.getPageNum(), donationwitnessBaseInfoVO.getPageSize());
    donationwitnessBaseInfoVO.setPageNum(offset);
    List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfo = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);

    @ApiOperation("获取捐献见证列表-新")
    @GetMapping("/listnew")
    public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
        startPage();
        List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
        return getDataTable(list);
    }
    donationwitnessBaseInfoVO.setPageNum(null);
    donationwitnessBaseInfoVO.setPageSize(null);
    Integer totalCount = 0;
    List<DonationwitnessBaseInfoDTO> total = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
    if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
    return getDataTable(donationwitnessBaseInfo, totalCount);
}


    /**
@@ -551,7 +563,7 @@
            log.info("捐献见证管理id是否为空 : {},基础表的id为 : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
            ServiceDonationwitness sd2 = new ServiceDonationwitness();
            sd2.setInfoid(serviceDonationwitness.getInfoid());
            sd2.setDel_flag(0);
            sd2.setDelFlag(0);
            List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessService.queryList(sd2);
            if (!CollectionUtils.isEmpty(serviceDonationwitnesses)) {
                serviceDonationwitness.setId(serviceDonationwitnesses.get(0).getId());