增加模糊查询

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireStationMapper.java

@@ -22,16 +22,16 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 	
 	@Select("<script>"
 			+ "select * from  cb_fire_station  where cb_fire_station.is_delete=0 "
-			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'#{par.name}'%' </if>"	
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
 			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"	
 			+"limit  #{pageNum},#{pageSize}"
 			+ "</script>")	
 	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
 	@Select("<script>"
 			+ "select COUNT(cb_fire_station.sequence_nbr) num from  cb_fire_station  where cb_fire_station.is_delete=0 "
-			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'#{par.name}'%' </if>"	
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
 			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"	
 			+ "</script>")	
-	 Map<String, Long> getFireStationCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireStationServiceImpl.java

@@ -53,7 +53,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
 		@Override
 		public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {			
 		    List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
-		    Map<String, Long> num = fireStationMapper.getFireStationCount((pageNum - 1) * pageSize, pageSize, par);
+		    Map<String, Long> num = fireStationMapper.getFireStationCount( par);
 		    Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
 		    return   pageBean.setRecords(list);
 		}