From 87ce88bf64ca5fb0eb9010474d55df170a44ac79 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 28 十一月 2019 11:50:33 +0800
Subject: [PATCH] 根据学号查失败项目表；再加上根据subject考场类型查询
---
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java | 4 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java | 11 +++++++++--
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java | 4 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 5 +++--
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java
index cea361e..f9ea361 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java
@@ -25,8 +25,15 @@
* 濡傛灉瑕佹坊鍔� 绉戠洰浜孖I III绫昏�冨満澶辫触椤圭洰锛岄渶瑕佸缓绔嬬浉搴旂殑璇勫垽鏍囧噯琛ㄦ暟鎹〃
* @return
*/
- @Query("SELECT emp_id,stu_id,deducting_reason,score_deducting,item_content from criteria_one INNER JOIN fail_projects ON criteria_one.item_id= fail_projects.emp_id")
- LiveData<List<FailedProj_select>> getFailedProjects();
+ @Query("SELECT emp_id,stu_id,deducting_reason,score_deducting,item_content from criteria_one INNER JOIN fail_projects ON criteria_one.item_id= fail_projects.emp_id where fail_projects.stu_id=:stu_id and fail_projects.subject=1")
+ LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id);
+ /**
+ * 鏌ヨ 绉戠洰浜� II绫昏�冨満鐨勫け璐ラ」鐩� 锛堝琛ㄦ煡璇級
+ * 濡傛灉瑕佹坊鍔� 绉戠洰浜孖I III绫昏�冨満澶辫触椤圭洰锛岄渶瑕佸缓绔嬬浉搴旂殑璇勫垽鏍囧噯琛ㄦ暟鎹〃
+ * @return
+ */
+ @Query("SELECT emp_id,stu_id,deducting_reason,score_deducting,item_content from criteria_two INNER JOIN fail_projects ON criteria_two.item_id= fail_projects.emp_id where fail_projects.stu_id=:stu_id and fail_projects.subject=2")
+ LiveData<List<FailedProj_select>> getFailedProjectsForII(long stu_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 d8db12f..1114506 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,7 @@
});
}
- public LiveData<List<FailedProj_select>> getFailedProjects() {
- return failProjDao.getFailedProjects();
+ public LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id) {
+ return failProjDao.getFailedProjectsForI(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 ccfad7e..7968fd6 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
@@ -23,8 +23,8 @@
failedProjRepository = new FailedProjRepository(application);
}
- public LiveData<List<FailedProj_select>> getFailedProjects(){
- return failedProjRepository.getFailedProjects();
+ public LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id){
+ return failedProjRepository.getFailedProjectsForI(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 beeb253..6c79d99 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -78,7 +78,7 @@
btn_send.setOnClickListener(this);
btn_connect.setOnClickListener(this);
}
- int r ;
+ int r ; boolean flag;
@Override
public void onClick(View v) {
switch (v.getId()){
@@ -94,7 +94,8 @@
@Override
public void run() {
- WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getFailProjDao().insert(new FailedProj(1, r,1001));
+ WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getFailProjDao().insert(new FailedProj(1, 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 64a17cf..d2a793d 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.getFailedProjects().observe(this, new Observer<List<FailedProj_select>>() {
+ failedProjViewModel.getFailedProjectsForI(1001).observe(this, new Observer<List<FailedProj_select>>() {
@Override
public void onChanged(List<FailedProj_select> failedProj_selects) {
item_id = 0;
--
Gitblit v1.8.0