searchByMajorKeyword

src/main/java/com/zglc/fm/controller/FaultController.java

@@ -259,9 +259,9 @@ public class FaultController {
             @ApiResponse(code = 0, message = "成功")
     })
     @GetMapping("searchByMajorKeyword")
-    public Result<PageInfo<FaultEntity>> searchByMajorKeyword(@RequestParam Integer type,@RequestParam String keyword,String major,Integer page, Integer size){
+    public Result<PageInfo<FaultEntity>> searchByMajorKeyword(@RequestParam Integer type,@RequestParam String keyword,@RequestParam String aircraft,String major,Integer page, Integer size){
         PageHelper.startPage(page, size, "id desc");
-        return Result.success(new PageInfo<>(faultService.searchByMajorKeyword(type,keyword,major)));
+        return Result.success(new PageInfo<>(faultService.searchByMajorKeyword(type,keyword,major,aircraft)));
     }
 
 

src/main/java/com/zglc/fm/service/FaultService.java

@@ -270,18 +270,23 @@ public class FaultService {
 
 
 
-    public List<FaultEntity> searchByMajorKeyword(Integer type,String keyword,String major) {
+    public List<FaultEntity> searchByMajorKeyword(Integer type,String keyword,String major,String aircraft) {
         Example example = new Example(FaultEntity.class);
         Example.Criteria criteria = example.createCriteria();
         switch (type) {
-            case 1: criteria.andLike("fault_name", "%"+keyword+"%");break;//全部查询
+            case 1: {
+                criteria.andEqualTo("aircraft_type", aircraft);
+                criteria.andLike("fault_name", "%"+keyword+"%");
+            }break;//全部查询
             case 2:{
-                    criteria.andEqualTo("major_type", major);
-                    criteria.andLike("fault_name", "%"+keyword+"%");
+                criteria.andEqualTo("aircraft_type", aircraft);
+                criteria.andEqualTo("major_type", major);
+                criteria.andLike("fault_name", "%"+keyword+"%");
                 }break; //不同专业查询
             case 3:{
-                    criteria.andIsNull("major_type");
-                    criteria.andLike("fault_name", "%"+keyword+"%");
+//                criteria.andEqualTo("aircraft_type", aircraft);
+                criteria.andIsNull("major_type");
+                criteria.andLike("fault_name", "%"+keyword+"%");
             }break;//未标引查询
 
         }