anderx лет назад: 4
Родитель
Сommit
6a18c5379b

+ 8 - 2
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2299,7 +2299,13 @@ inner join(
 	where r.role_type=80
   </select>
   
-  <select id="getUserByName" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
-		select id,nickname name from `user` where nickname like concat('%',#{name},'%')
+  <select id="getUserByNameList" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
+  	select id,nickname name from `user` where nickname like concat('%',#{name},'%')
+  	<if test="page_sql != null">
+   		${page_sql}
+	</if>
+    </select>
+    <select id="getUserByNameCount" resultType="java.lang.Integer" >
+  	select count(*) from `user` where nickname like concat('%',#{name},'%')
     </select>
 </mapper>

+ 2 - 2
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -253,14 +253,14 @@ public class AdminCustomerApiController extends BaseApiController{
 	
 	/** 客户查询 **/
 	@RequestMapping(value = "/getUserByName",method = RequestMethod.GET)
-	public Result getUserByName(String name){
+	public Result getUserByName(String name,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 		if(StringUtils.isEmpty(name)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "名称","名称"));
 			return res;
 		}
 		if(name.length()<2) return res;
-		res.data(customerService.getUserByName(name));
+		res.data(customerService.getUserByName(name,pageNo,pageSize));
 		return res;
 	}
 	

+ 3 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -130,9 +130,11 @@ public interface CustomerService {
 	/**
 	 * 客户全查询
 	 * @param name
+	 * @param pageSize 
+	 * @param pageNo 
 	 * @return
 	 */
-	List<CustomerSimpleBo> getUserByName(String name);
+	Object getUserByName(String name, Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 判断是否存在某个单位客户

+ 6 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2210,8 +2210,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	@Override
-	public List<CustomerSimpleBo> getUserByName(String name) {
-		return userMapper.getUserByName(name);
+	public Object getUserByName(String name, Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("name", name);
+		return  findPage("getUserByNameList", "getUserByNameCount", params, pageNo,pageSize);
+				
+				
 	}
 
 	@Override

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -2,13 +2,13 @@ dev.name=local
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-#测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft20210528?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#测试
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570