11111

src/main/java/com/zhiqiyun/open/core/enmus/HotelGrade.java

@@ -1,41 +0,0 @@
-package com.zhiqiyun.open.core.enmus;
-
-
-public enum HotelGrade implements IBaseEnum {
-    /**
-     *
-     */
-    ONE_STAR(1, "一星"), TWO_STAR(2, "二星"), THREE_STAR(3, "三星"), FOUR_STAR(4, "四星"), FIVE_STAR(5, "五星");
-
-    private final int value;
-    private final String text;
-
-    HotelGrade(int value, String text) {
-        this.value = value;
-        this.text = text;
-    }
-
-    public static HotelGrade valueOf(int value) {
-        HotelGrade[] values = HotelGrade.values();
-        for (HotelGrade type : values) {
-            if (type.value == value) {
-                return type;
-            }
-        }
-        return null;
-    }
-
-
-    public String getText() {
-        return text;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String getName() {
-        return this.name();
-    }
-}

src/main/java/com/zhiqiyun/open/core/enmus/SceneryGrade.java

@@ -1,41 +0,0 @@
-package com.zhiqiyun.open.core.enmus;
-
-
-public enum SceneryGrade implements IBaseEnum {
-    /**
-     *
-     */
-    A(1, "A"), AA(2, "AA"), AAA(3, "AAA"), AAAA(4, "AAAA"), AAAAA(5, "AAAAA");
-
-    private final int value;
-    private final String text;
-
-    SceneryGrade(int value, String text) {
-        this.value = value;
-        this.text = text;
-    }
-
-    public static SceneryGrade valueOf(int value) {
-        SceneryGrade[] values = SceneryGrade.values();
-        for (SceneryGrade type : values) {
-            if (type.value == value) {
-                return type;
-            }
-        }
-        return null;
-    }
-
-
-    public String getText() {
-        return text;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String getName() {
-        return this.name();
-    }
-}

src/main/java/com/zhiqiyun/open/core/models/place/PlaceBaseInfo.java

@@ -33,5 +33,5 @@ public class PlaceBaseInfo {
     private Long updatedBy;
 
     @TableField(exist = false)
-    private PlaceCategory dataType;
+    private PlaceCategory category;
 }

src/main/java/com/zhiqiyun/open/mvc/controller/PlaceBaseInfoController.java

@@ -67,6 +67,11 @@ public class PlaceBaseInfoController {
 
         Page<PlaceBaseInfo> resultData = this.placeBaseInfoService.page(page, wrapper);
 
+        for (PlaceBaseInfo baseInfo : resultData.getRecords()) {
+            PlaceCategory category = this.placeCategoryService.getById(baseInfo.getCategoryId());
+            baseInfo.setCategory(category);
+        }
+
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
@@ -200,4 +205,35 @@ public class PlaceBaseInfoController {
 
         return Result.instance(Result.Code.SUCCESS).setData(listData);
     }
+
+    @ResponseBody
+    @PostMapping("/findSelectByKeyword")
+    public Result findSelectBaseInfoByKeyword(String keyword) throws Exception {
+        QueryWrapper<PlaceBaseInfo> queryWrapper = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(keyword)) {
+            queryWrapper.like("id", keyword);
+            queryWrapper.or();
+            queryWrapper.like("name", keyword);
+            queryWrapper.or();
+            queryWrapper.like("brief", keyword);
+            queryWrapper.or();
+            queryWrapper.like("address", keyword);
+            queryWrapper.or();
+            queryWrapper.like("contacts", keyword);
+            queryWrapper.or();
+            queryWrapper.like("contact_number", keyword);
+            queryWrapper.or();
+            queryWrapper.inSql("category_id", "select id from place_category where name like '%" + keyword + "%'");
+        }
+        queryWrapper.last("limit 10");
+        queryWrapper.orderByDesc("id");
+
+        List<PlaceBaseInfo> listData = this.placeBaseInfoService.list(queryWrapper);
+        for (PlaceBaseInfo baseInfo : listData) {
+            PlaceCategory category = this.placeCategoryService.getById(baseInfo.getCategoryId());
+            baseInfo.setCategory(category);
+        }
+        return Result.instance(Result.Code.SUCCESS).setData(listData);
+    }
 }