feat: 加强搜索字段的搜索功能

sql/garbage.py

@@ -94,26 +94,47 @@ def __search_fields_time(time_: str, time_name: str) -> str:
         return f"({time_name}={mysql_time(t)} AND"
 
 
+def set_where_(ex: Optional[str], column: str):
+    if ex is None:
+        return ""
+
+    if ex.strip() == "IS NULL":
+        where = f"{column} IS NULL AND "
+    elif ex.startswith("LIKE ") or ex.startswith("REGEXP "):
+        where = f"{column} {ex} AND "
+    else:
+        where = f"{column}='{ex}' AND "
+    return where
+
+
 def search_garbage_by_fields(columns, gid, uid, cuid, create_time, use_time, loc, type_, check, db: DB):
     where = ""
-    if gid is not None:
-        where += f"GarbageID={gid} AND "
-    if uid is not None:
-        where += f"UserID=‘{uid}’ AND "
-    if cuid is not None:
-        where += f"CheckerID='{cuid}' AND "
-    if loc is not None:
-        where += f"Location='{loc}' AND "
+    where += set_where_(gid, "GarbageID")
+    where += set_where_(uid, "UserID")
+    where += set_where_(cuid, "CheckerID")
+    where += set_where_(loc, "Location")
+
     if check is not None:
-        if check == "False":
+        if check == 'IS NULL':
+            where += f"CheckResult IS NULL AND "
+        elif check == "不通过" or check == "False" or check == "Fail":
             where += f"CheckResult=0 AND "
-        else:
+        elif check == "通过" or check == "True" or check == "Pass":
             where += f"CheckResult=1 AND "
-    if type_ is not None and type_ in GarbageType.GarbageTypeStrList:
-        res = GarbageType.GarbageTypeStrList.index(type_)
-        where += f"Phone={res} AND "
+
+    if type_ is not None:
+        if type_ == 'IS NULL':
+            where += f"GarbageType IS NULL AND "
+        elif type_ in GarbageType.GarbageTypeStrList:
+            res = GarbageType.GarbageTypeStrList.index(type_)
+            where += f"GarbageType={res} AND "
+        elif type_ in GarbageType.GarbageTypeStrList_ch:
+            res = GarbageType.GarbageTypeStrList_ch.index(type_)
+            where += f"GarbageType={res} AND "
+
     if create_time is not None:
         where += __search_fields_time(create_time, "CreateTime")
+
     if use_time is not None:
         where += __search_fields_time(use_time, "UseTime")
 

sql/user.py

@@ -47,14 +47,22 @@ def update_user_reputation(where: str, reputation: score_t, db: DB) -> int:
     return cur.rowcount
 
 
+def set_where_(ex: Optional[str], column: str):
+    if ex is None:
+        return ""
+
+    if ex.startswith("LIKE ") or ex.startswith("REGEXP "):
+        where = f"{column} {ex} AND "
+    else:
+        where = f"{column}='{ex}' AND "
+    return where
+
+
 def search_user_by_fields(columns, uid: uid_t, name: uname_t, phone: phone_t, db: DB):
     where = ""
-    if uid is not None:
-        where += f"UserID=‘{uid}’ AND "
-    if name is not None:
-        where += f"Name='{name}' AND "
-    if phone is not None:
-        where += f"Phone='{phone}' AND "
+    where += set_where_(uid, "UserID")
+    where += set_where_(name, "Name")
+    where += set_where_(phone, "Phone")
 
     if len(where) != 0:
         where = where[0:-4]  # 去除末尾的AND