From b3a9898d4560d39cbd7f7024638588efb264a82a Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 28 十一月 2019 15:07:30 +0800
Subject: [PATCH] 在FailedProj增加对科目二 II类考场标准表的查询
---
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java | 14 ++++++++++++++
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java | 6 ++++--
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java | 3 +++
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 2 +-
5 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java
index 1b656ec..1eff2f4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java
@@ -7,6 +7,7 @@
import androidx.room.PrimaryKey;
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
+import safeluck.drive.evaluation.DB.criterias.CriteriaForII;
import static androidx.room.ForeignKey.CASCADE;
@@ -17,8 +18,9 @@
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
-@Entity(tableName = "fail_projects",foreignKeys = @ForeignKey(entity = CriteriaForI.class,
-parentColumns = "item_id",childColumns = "emp_id",onDelete = CASCADE),indices = @Index(value = {"emp_id"}))
+@Entity(tableName = "fail_projects",foreignKeys = {@ForeignKey(entity = CriteriaForI.class,
+parentColumns = "item_id",childColumns = "emp_id",onDelete = CASCADE),@ForeignKey(entity = CriteriaForII.class,
+ parentColumns = "item_id",childColumns = "emp_id")},indices = @Index(value = {"emp_id"}))
public class FailedProj {
@PrimaryKey(autoGenerate = true)
private int id;
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java
index 1114506..ddfa6d1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java
@@ -35,7 +35,21 @@
});
}
+ /**
+ * 鑾峰緱绉戠洰浜� I绫昏�冨満澶辫触椤圭洰鎵ｅ垎椤�
+ * @param stu_id
+ * @return
+ */
public LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id) {
return failProjDao.getFailedProjectsForI(stu_id);
}
+
+ /**
+ * 鑾峰緱绉戠洰浜� II绫昏�冨満澶辫触椤圭洰鎵ｅ垎椤�
+ * @param stu_id
+ * @return
+ */
+ public LiveData<List<FailedProj_select>> getFailedProjectsForII(long stu_id) {
+ return failProjDao.getFailedProjectsForII(stu_id);
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java
index 7968fd6..e11d7c3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java
@@ -26,6 +26,9 @@
public LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id){
return failedProjRepository.getFailedProjectsForI(stu_id);
}
+ public LiveData<List<FailedProj_select>> getFailedProjectsForII(long stu_id){
+ return failedProjRepository.getFailedProjectsForII(stu_id);
+ }
public void insert(FailedProj proj){
failedProjRepository.insert(proj);
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index 6c79d99..bfe5efb 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -94,7 +94,7 @@
@Override
public void run() {
- WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getFailProjDao().insert(new FailedProj(1, r,flag?1001:1000));
+ WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getFailProjDao().insert(new FailedProj(flag?1:2, r,flag?1001:1000));
flag = !flag;
}
});
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index d2a793d..0ace87a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -67,7 +67,7 @@
FailedProjViewModel failedProjViewModel =ViewModelProviders.of(this).get(FailedProjViewModel.class);
- failedProjViewModel.getFailedProjectsForI(1001).observe(this, new Observer<List<FailedProj_select>>() {
+ failedProjViewModel.getFailedProjectsForI(1000).observe(this, new Observer<List<FailedProj_select>>() {
@Override
public void onChanged(List<FailedProj_select> failedProj_selects) {
item_id = 0;
--
Gitblit v1.8.0