代码提交

liusheng

2026-01-21 29f287cf6e4869d7bbc283991458e09a03b59c52

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

@@ -13,6 +13,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
@@ -59,28 +60,17 @@
        configuration.setDefaultEncoding("utf-8");
    }

    /**
     * 查询捐献完成列表
     */
    @ApiOperation("查询捐献完成列表")
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("查询捐献完成列表：{}", serviceDonatecompletioninfo);
        startPage();
        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
        return getDataTable(list);
    }

    @ApiOperation("查询捐献完成列表（新）")
    @GetMapping("/listnew")
    @Log(title = "查询捐献完成列表（新）", businessType = BusinessType.OTHER)
    public TableDataInfo listnew(DonationCompletionVO donationCompletionVO) {
        log.info("查询捐献完成列表（新）：{}", donationCompletionVO);
        startPage();
        List<DonationCompletionVO> list = serviceDonatecompletioninfoService.selectVOList(donationCompletionVO);
        return getDataTable(list);
    }
//    /**
//     * 查询捐献完成列表
//     */
//    @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);
//    }


    /**