fix: 合并代码

app/src/main/java/com/navinfo/omqs/db/MyRealmModule.kt

@@ -0,0 +1,7 @@
+package com.navinfo.omqs.db
+
+import com.navinfo.collect.library.data.entity.QsRecordBean
+
+@io.realm.annotations.RealmModule(classes = [QsRecordBean::class])
+class MyRealmModule {
+}

app/src/main/java/com/navinfo/omqs/db/dao/ScProblemTypeDao.kt

@@ -1,8 +1,6 @@
 package com.navinfo.omqs.db.dao
 
 import androidx.room.*
-import androidx.sqlite.db.SupportSQLiteDatabase
-import com.navinfo.collect.library.data.dao.impl.MapLifeDataBase.getDatabase
 import com.navinfo.omqs.bean.ScProblemTypeBean
 
 
@@ -38,13 +36,13 @@ interface ScProblemTypeDao {
     /**
      * 获取问题类型，并去重
      */
-    @Query("select DISTINCT TYPE from ScProblemType where CLASS_TYPE=:type order by TYPE")
-    suspend fun findProblemTypeList(type: String): List<String>
+    @Query("select * from ScProblemType where CLASS_TYPE=:type order by TYPE")
+    suspend fun findProblemTypeList(type: String): List<ScProblemTypeBean>?
 
-    /**
-     *
-     */
-    @Query("select PHENOMENON from ScProblemType where CLASS_TYPE=:classType and TYPE=:type order by PHENOMENON")
-    suspend fun getPhenomenonList(classType: String, type: String): List<String>
+//    /**
+//     *
+//     */
+//    @Query("select PHENOMENON from ScProblemType where CLASS_TYPE=:classType and TYPE=:type order by PHENOMENON")
+//    suspend fun getPhenomenonList(classType: String, type: String): List<String>
 
 }

app/src/main/java/com/navinfo/omqs/db/dao/ScRootCauseAnalysisDao.kt

@@ -22,4 +22,10 @@ interface ScRootCauseAnalysisDao {
         insertList(list)
     }
 
+    /**
+     * 获取问题环节数据
+     */
+    @Query("select * from ScRootCauseAnalysis order by PROBLEM_LINK")
+    suspend fun findAllData(): List<ScRootCauseAnalysisBean>?
+
 }