update

myapps/pc_management/api/place_portal.py

@@ -28,22 +28,44 @@ def run_place_list():
 
     :return:
     """
+    json_data = request.get_json()
+    page = json_data.get("page", None)
+    page_size = json_data.get("pageSize", None)
+    keyword = json_data.get("keyword", None)
+
     admin = g.user
-    admin_place_list = AdminPlace.query.filter_by(user_id=admin.id, status=1).all()
-    if admin_place_list:
-        place_id_list = [i.place_id for i in admin_place_list]
-    else:
-        return BaseResponse(data=[])
+    select_sql = "select place.place_name, place.address, place.parent_id,place.status, place.id "
+    count_sql = "select count(place.id) as total_count"
+    from_sql = " from place where place.id in ( select place_id from admin_place where   admin_place.user_id = {} and admin_place.status = 1) ".format(
+        admin.id)
+
+    where_sql = " "
+    if keyword:
+        where_sql += """
+                    and CONCAT(place.place_name, place.address) LIKE '%{keyword}%'
 
-    place_list = db.session.query(Place).filter(Place.id.in_(place_id_list)).all()
+                        """.format(keyword=keyword)
+    order_sql = "  ORDER BY place.id ASC, place.status ASC"
+    limit_sql = " LIMIT {offset} , {page_size} ".format(offset=(page - 1) * page_size, page_size=page_size)
 
-    if place_list:
-        place_data_list = [
-            {"place_name": i.place_name, "place_id": i.id, "address": i.address, "parent_id": i.parent_id} for i in
-            place_list]
-        return BaseResponse(data=place_data_list)
+    count_result = db.session.execute(count_sql + from_sql + where_sql).fetchone()
+
+    if not count_result:
+        return BaseResponse(data={"list": [], "page": page, "pageSize": page_size, "total_count": 0})
     else:
-        return BaseResponse(data=[])
+        total_count = count_result.total_count
+
+    print(select_sql + from_sql + where_sql + order_sql + limit_sql)
+    result = db.session.execute(select_sql + from_sql + where_sql + order_sql + limit_sql).fetchall()
+
+    return_data = []
+    for info in result:
+        return_data.append(
+            {"place_name": info.place_name, "place_id": info.id, "address": info.address, "parent_id": info.parent_id,
+              "status":info.status
+             })
+
+    return BaseResponse({"list": return_data, "page": page, "pageSize": page_size, "total_count": total_count})
 
 
 @place_route.route("add_place", methods=["POST"])