指标评分规则添加关键字查询

src/main/java/com/keymobile/indicators/api/hytobacco/IndScorecardCtrl.java

@@ -87,9 +87,10 @@ public class IndScorecardCtrl {
 	@ApiOperation(value = "根据评分卡目录获取评分卡", notes = "根据评分卡目录获取评分卡")
 	@PostMapping(value = "/getByCatalogId")
 	public Map<String,Object> getByCatalogId(@RequestParam Integer catalogId,
-			@RequestParam(value = "page", required = false, defaultValue = "1") int page,
+			@RequestParam(required = false) String keyword,
+			@RequestParam(value = "page", required = false, defaultValue = "0") int page,
 			@RequestParam(value = "rows", required = false, defaultValue = "10") int rows){
-		return indScorecardService.getByCatalogId(catalogId,page,rows);
+		return indScorecardService.getByCatalogId(catalogId,keyword,page,rows);
 	}
 	
 	@ApiOperation(value = "根据id获取评分卡", notes = "根据id获取评分卡")

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

@@ -13,7 +13,7 @@ public interface IndScorecardMapper extends BaseMapper<IndScorecard>{
 	public void deleteByCatalogIdIn(@Param("catalogIds")List<Integer> catalogIds);
 	
 	public List<IndScorecard> findByCatalogId(@Param("catalogId")Integer catalogId,
-			@Param("start") int start,@Param("end") int end);
+			@Param("keyword")String keyword,@Param("start") int start,@Param("end") int end);
 	
 	public int countByCatalogId(@Param("catalogId")Integer catalogId);
 	

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

@@ -118,13 +118,16 @@ public class IndScorecardService {
 		return scorecards;
 	}
 	
-	public Map<String,Object> getByCatalogId(Integer catalogId,int page,int rows){
+	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-1)*rows;
+		int start = page*rows;
 		count = indScorecardMapper.countByCatalogId(catalogId);
-		List<IndScorecard> datas = indScorecardMapper.findByCatalogId(catalogId,start,rows);
+		if(StringUtils.isNotBlank(keyword)) {
+			keyword = "%"+keyword+"%";
+		}
+		List<IndScorecard> datas = indScorecardMapper.findByCatalogId(catalogId,keyword,start,rows);
 //		List<IndScorecard> resultDatas = new ArrayList<>();
 //		for(IndScorecard data : datas) {
 //			IndScorecard data1 = this.changeJson(data);

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

@@ -5,6 +5,9 @@
         select * 
         from drive_ind_score_card 
         where catalog_id = #{catalogId} 
+        <if test="keyword!=null">
+    		and card_name like #{keyword}
+    	</if>
         limit #{start},#{end}
     </select>