Merge branch 'test' of http://git.izouma.com/licailing/wenlvju into test

src/main/java/com/izouma/wenlvju/repo/TrainingInstitutionRepo.java

@@ -20,7 +20,8 @@ public interface TrainingInstitutionRepo extends JpaRepository<TrainingInstituti
 
     List<TrainingInstitution> findAllByPhoneIsNull();
 
-    List<TrainingInstitution> findAllByNameLike(String name);
+    @Query(nativeQuery = true, value = "select name from training_institution where name like ?1 limit ?2,?3")
+    List<String> findAllByNameLike(String name, int page, int size);
 
     TrainingInstitution findByUscc(String uscc);
 }

src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java

@@ -13,6 +13,7 @@ import com.izouma.wenlvju.utils.JpaUtils;
 import com.izouma.wenlvju.utils.excel.UploadDataListener;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -79,6 +80,12 @@ public class TrainingInstitutionService {
 
     }
 
+    public List<String> byName(PageQuery pageQuery) {
+        String name = "%" + pageQuery.getSearch() + "%";
+        PageRequest pageRequest = JpaUtils.toPageRequest(pageQuery);
+        return trainingInstitutionRepo.findAllByNameLike(name, pageRequest.getPageNumber(), pageRequest.getPageSize());
+    }
+
     public TrainingInstitution byUscc(String name, String uscc) {
         TrainingInstitution byUscc = trainingInstitutionRepo.findByUscc(uscc);
         if (ObjectUtil.isNotNull(byUscc)) {