代码提交

liusheng

10 天以前 d88fffd5d757a23f302011ced88dea92e1ce31e9

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

@@ -9,10 +9,14 @@
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;
import com.ruoyi.project.service.IServiceDonatecomporganService;
@@ -39,7 +43,7 @@
 * @date 2021-11-19
 */
@Slf4j
@Api( description = "捐献完成登记管理")
@Api(description = "捐献完成登记管理")
@RestController
@RequestMapping("/project/donatecompletioninfo")
public class ServiceDonatecompletioninfoController extends BaseController {
@@ -60,26 +64,23 @@
    }

    /**
     * 查询捐献完成列表
     * 查询捐献完成列表基本信息
     */
    @ApiOperation("查询捐献完成列表")
    @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);
    }
    @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);

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