代码提交

liusheng

3 天以前 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b

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

@@ -2,12 +2,16 @@

import java.util.Arrays;
import java.util.List;
import java.util.Map;

import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonateFollowupVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -44,20 +48,17 @@
     */
    @ApiOperation("查询捐献随访列表")
    //// @PreAuthorize("@ss.hasPermi('project:donatefollowup:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup) {
        startPage();
        //List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
    @PostMapping("/list")
    public Map<String, Object> list(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
        Integer offset = PageUtils.getOffset(serviceDonatefollowup.getPageNum(), serviceDonatefollowup.getPageSize());
        serviceDonatefollowup.setPageNum(offset);
        List<ServiceDonatefollowup> list = serviceDonatefollowupService.selectAll(serviceDonatefollowup);
        return getDataTable(list);
    }

    @GetMapping("/listnew")
    public TableDataInfo listnew(DonateFollowupVO donateFollowupVO) {
        startPage();
        List<DonateFollowupVO> list = serviceDonatefollowupService.selectVOList(donateFollowupVO);
        return getDataTable(list);

        //获取总数
        serviceDonatefollowup.setPageNum(null);
        serviceDonatefollowup.setPageSize(null);
        List<ServiceDonatefollowup> count = serviceDonatefollowupService.selectAll(serviceDonatefollowup);
        return getDataTable(list, CollectionUtils.isEmpty(count) ? 0 : count.size());
    }