Browse Source

增加材质根据名称模糊搜索

liaoyitao 2 months ago
parent
commit
c46866b7bb

+ 2 - 2
src/main/java/com/lqkj/link/module/zone/controller/MaterialInfoController.java

@@ -83,8 +83,8 @@ public class MaterialInfoController {
83 83
      * @return
84 84
      */
85 85
     @GetMapping("/getAll")
86
-    public List<MaterialInfo> getAll(){
87
-        return materialInfoService.getAll();
86
+    public List<MaterialInfo> getAll(@RequestParam(name = "materialName", required = false, defaultValue = "") String materialName){
87
+        return materialInfoService.getAll(materialName);
88 88
     }
89 89
 
90 90
 }

+ 6 - 0
src/main/java/com/lqkj/link/module/zone/repository/MaterialInfoRepository.java

@@ -10,6 +10,8 @@ import org.springframework.data.jpa.repository.Query;
10 10
 import org.springframework.data.repository.query.Param;
11 11
 import org.springframework.stereotype.Repository;
12 12
 
13
+import java.util.List;
14
+
13 15
 @Repository
14 16
 public interface MaterialInfoRepository extends JpaRepository<MaterialInfo, Integer> {
15 17
 
@@ -48,4 +50,8 @@ public interface MaterialInfoRepository extends JpaRepository<MaterialInfo, Inte
48 50
                                  @Param("materialType") Integer materialType,
49 51
                                  Pageable pageable,
50 52
                                  @Param("userId") Integer userId);
53
+    @Query(nativeQuery = true,
54
+            value = "select * from material_info where (:materialName = '' or material_name like concat('%', :materialName, '%'))"
55
+    )
56
+    List<MaterialInfo> findAllByName(@Param("materialName") String materialName);
51 57
 }

+ 1 - 1
src/main/java/com/lqkj/link/module/zone/service/MaterialInfoService.java

@@ -39,6 +39,6 @@ public interface MaterialInfoService {
39 39
      */
40 40
     void batchAdd(String compressFilePath);
41 41
 
42
-    List<MaterialInfo> getAll();
42
+    List<MaterialInfo> getAll(String materialName);
43 43
 
44 44
 }

+ 2 - 2
src/main/java/com/lqkj/link/module/zone/service/impl/MaterialInfoServiceImpl.java

@@ -111,9 +111,9 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
111 111
     }
112 112
 
113 113
     @Override
114
-    public List<MaterialInfo> getAll() {
114
+    public List<MaterialInfo> getAll(String materialName) {
115 115
 
116
-        return materialInfoRepository.findAll();
116
+        return materialInfoRepository.findAllByName(materialName);
117 117
     }
118 118
 
119 119