修改分页获取指标计分规则接口

src/main/java/com/keymobile/indicators/model/mapper/indmapper/IndScorecardMapper.java

@@ -15,7 +15,7 @@ public interface IndScorecardMapper extends BaseMapper<IndScorecard>{
 	public List<IndScorecard> findByCatalogId(@Param("catalogId")Integer catalogId,
 			@Param("keyword")String keyword,@Param("start") int start,@Param("end") int end);
 	
-	public int countByCatalogId(@Param("catalogId")Integer catalogId);
+	public int countByCatalogId(@Param("catalogId")Integer catalogId,@Param("keyword")String keyword);
 	
 	public List<IndScorecard> findByIdList(@Param("ids")List<Integer> ids);
 }

src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java

@@ -120,13 +120,13 @@ public class IndScorecardService {
 	
 	public Map<String,Object> getByCatalogId(Integer catalogId,String keyword,int page,int rows){
 		Map<String,Object> result = new HashMap<>();
-		int count = 0;
-		//计算start
-		int start = page*rows;
-		count = indScorecardMapper.countByCatalogId(catalogId);
 		if(StringUtils.isNotBlank(keyword)) {
 			keyword = "%"+keyword+"%";
 		}
+		int count = 0;
+		//计算start
+		int start = page*rows;
+		count = indScorecardMapper.countByCatalogId(catalogId,keyword);
 		List<IndScorecard> datas = indScorecardMapper.findByCatalogId(catalogId,keyword,start,rows);
 //		List<IndScorecard> resultDatas = new ArrayList<>();
 //		for(IndScorecard data : datas) {

src/main/resources/mybatis/mapping/IndScorecardMapper.xml

@@ -15,6 +15,9 @@
     	select count(1) 
     	from drive_ind_score_card 
     	where catalog_id = #{catalogId}
+    	<if test="keyword!=null">
+    		and card_name like #{keyword}
+    	</if>
     </select>
     
     <delete id="deleteByCatalogIdIn" parameterType="java.util.List">