diff --git a/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt
index 10bfdfb..4a4e798 100644
--- a/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt
@@ -67,6 +67,13 @@
         }
     }
 
+    fun loadLabelByDate(startDate: String, endDate: String): MutableList<LabelBean> {
+        return labelBeanDao.queryBuilder().where(
+            LabelBeanDao.Properties.ConstructTime.gt(startDate),
+            LabelBeanDao.Properties.ConstructTime.lt(endDate)
+        ).list()
+    }
+
     /******************************* Lable *** End **********************************************/
 
     /******************************* Small Lable *** Start **************************************/

diff --git a/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt
index 10bfdfb..4a4e798 100644
--- a/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/electric/detector/utils/DataBaseManager.kt
@@ -67,6 +67,13 @@
         }
     }
 
+    fun loadLabelByDate(startDate: String, endDate: String): MutableList<LabelBean> {
+        return labelBeanDao.queryBuilder().where(
+            LabelBeanDao.Properties.ConstructTime.gt(startDate),
+            LabelBeanDao.Properties.ConstructTime.lt(endDate)
+        ).list()
+    }
+
     /******************************* Lable *** End **********************************************/
 
     /******************************* Small Lable *** Start **************************************/
diff --git a/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt b/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt
index 7890297..d01e912 100644
--- a/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt
@@ -251,17 +251,21 @@
                     override fun onConfirmClick(
                         selectedCondition: String, vararg contentValue: String
                     ) {
-                        Log.d(kTag, "selectedCondition => $selectedCondition")
-                        Log.d(kTag, "contentValue => ${contentValue.toJson()}")
                         //查询数据库
-//                        CoroutineScope(Dispatchers.Main).launch {
-//                            labelBeans = withContext(Dispatchers.IO) {
-//                                DataBaseManager.get.loadLabelByCondition(
-//                                    selectedItem, value
-//                                ) as ArrayList<LabelBean>
-//                            }
-//                            showLabelsOnMap()
-//                        }
+                        lifecycleScope.launch {
+                            labels = withContext(Dispatchers.IO) {
+                                if (contentValue.size == 1) {
+                                    DataBaseManager.get.loadLabelByCondition(
+                                        selectedCondition, contentValue[0]
+                                    ) as ArrayList<LabelBean>
+                                } else {
+                                    DataBaseManager.get.loadLabelByDate(
+                                        contentValue[0], contentValue[1]
+                                    ) as ArrayList<LabelBean>
+                                }
+                            }
+                            showLabelsOnMap()
+                        }
                     }
 
                     override fun onCancelClick() {