修改

ims-service/ims-eval/src/main/java/com/ims/eval/controller/CiteCalculationIndicatorController.java

@@ -1,6 +1,7 @@
 package com.ims.eval.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.CiteCalculationIndicator;
 import com.ims.eval.entity.dto.result.R;
@@ -10,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * <p>
@@ -42,7 +42,7 @@ public class CiteCalculationIndicatorController {
 		@RequestParam(value = "pageSize") Integer pageSize,
 		@RequestParam(value = "citeCalculationName", required = false) String citeCalculationName,
 		@RequestParam(value = "binSection", required = false) String binSection) {
-		List<CiteCalculationIndicator> list = null;
+		IPage<CiteCalculationIndicator> list = null;
 
 		try {
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/CiteCalculationIndicatorMapper.java

@@ -1,12 +1,12 @@
 package com.ims.eval.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.entity.CiteCalculationIndicator;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -19,9 +19,9 @@ import java.util.Map;
 public interface CiteCalculationIndicatorMapper extends BaseMapper<CiteCalculationIndicator> {
 
 
-	List<CiteCalculationIndicator> selectCiteCalculationIndicatorList(Page page,
-																	  @Param("citeCalculationName") String citeCalculationName,
-																	  @Param("binSection") String binSection);
+	IPage<CiteCalculationIndicator> selectCiteCalculationIndicatorList(Page page,
+																	   @Param("citeCalculationName") String citeCalculationName,
+																	   @Param("binSection") String binSection);
 
 
 	List<CiteCalculationIndicator> selectListLikeIndicatorIds(@Param("indicatorIds") String indicatorIds);

ims-service/ims-eval/src/main/java/com/ims/eval/service/ICiteCalculationIndicatorService.java

@@ -1,8 +1,8 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.CiteCalculationIndicator;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ims.eval.entity.DataDictionary;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ import java.util.List;
 public interface ICiteCalculationIndicatorService extends IService<CiteCalculationIndicator> {
 
 
-	List<CiteCalculationIndicator> getCiteCalculationIndicatorList(Integer pageNum, Integer pageSize,String citeCalculationName, String binSection);
+	IPage<CiteCalculationIndicator> getCiteCalculationIndicatorList(Integer pageNum, Integer pageSize, String citeCalculationName, String binSection);
 
 
 	List<CiteCalculationIndicator> getListLikeIndicatorIds(String indicatorIds);

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/CiteCalculationIndicatorServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ims.eval.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.CiteCalculationIndicator;
@@ -24,7 +25,7 @@ import java.util.List;
 public class CiteCalculationIndicatorServiceImpl extends ServiceImpl<CiteCalculationIndicatorMapper, CiteCalculationIndicator> implements ICiteCalculationIndicatorService {
 
 	@Override
-	public List<CiteCalculationIndicator> getCiteCalculationIndicatorList(Integer pageNum, Integer pageSize,String citeCalculationName, String binSection) {
+	public IPage<CiteCalculationIndicator> getCiteCalculationIndicatorList(Integer pageNum, Integer pageSize, String citeCalculationName, String binSection) {
 		QueryWrapper<Indicator> qw = new QueryWrapper<>();
 		if (null == pageNum || null == pageSize) {
 			throw new CustomException("分页参数为空");
@@ -32,7 +33,7 @@ public class CiteCalculationIndicatorServiceImpl extends ServiceImpl<CiteCalcula
 		//构造分页构造器
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
 
-		List<CiteCalculationIndicator> list  = baseMapper.selectCiteCalculationIndicatorList(page,citeCalculationName,binSection);
+		IPage<CiteCalculationIndicator> list  = baseMapper.selectCiteCalculationIndicatorList(page,citeCalculationName,binSection);
 		return list;
 	}