From a691a7b3e4dca73671877196cca8611cc618afae Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 27 十一月 2019 15:57:33 +0800
Subject: [PATCH] 失败项目加入stu_id,跟学员表好关联
---
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java | 14 +++++++++++++-
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java | 11 +++++++++++
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java | 4 +++-
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 2 +-
4 files changed, 28 insertions(+), 3 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 ffbf1b6..cea361e 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
@@ -2,6 +2,7 @@
import androidx.lifecycle.LiveData;
import androidx.room.Dao;
+import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.Query;
@@ -24,7 +25,7 @@
* 濡傛灉瑕佹坊鍔� 绉戠洰浜孖I III绫昏�冨満澶辫触椤圭洰锛岄渶瑕佸缓绔嬬浉搴旂殑璇勫垽鏍囧噯琛ㄦ暟鎹〃
* @return
*/
- @Query("SELECT emp_id,deducting_reason,score_deducting,item_content from criteria_one INNER JOIN fail_projects ON criteria_one.item_id= fail_projects.emp_id")
+ @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();
/**
@@ -34,4 +35,5 @@
*/
@Query("SELECT COUNT(*) from fail_projects where subject=:subject_id")
LiveData<Integer> getSubject(int subject_id);
+
}
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 8ced221..1b656ec 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
@@ -25,6 +25,9 @@
+ @ColumnInfo(name = "stu_id")
+ private long stu_id;
+
@ColumnInfo(name = "subject")
private int subject;
@@ -32,9 +35,10 @@
@ColumnInfo(name = "emp_id")
private int emp_id;
- public FailedProj(int subject, int emp_id) {
+ public FailedProj(int subject, int emp_id,long stu_id) {
this.subject = subject;
this.emp_id = emp_id;
+ this.stu_id = stu_id;
}
public int getId() {
@@ -45,6 +49,14 @@
this.id = id;
}
+ public long getStu_id() {
+ return stu_id;
+ }
+
+ public void setStu_id(long stu_id) {
+ this.stu_id = stu_id;
+ }
+
public int getSubject() {
return subject;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java
index bc62ea2..f0f3634 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java
@@ -12,6 +12,8 @@
@ColumnInfo(name = "emp_id")
private int emp_id;
+
+ private long stu_id;
private String item_content;
private String deducting_reason;
private int score_deducting;
@@ -40,6 +42,14 @@
this.deducting_reason = deducting_reason;
}
+ public long getStu_id() {
+ return stu_id;
+ }
+
+ public void setStu_id(long stu_id) {
+ this.stu_id = stu_id;
+ }
+
public int getScore_deducting() {
return score_deducting;
}
@@ -52,6 +62,7 @@
public String toString() {
return "FailedProj_select{" +
"emp_id=" + emp_id +
+ ", stu_id=" + stu_id +
", item_content='" + item_content + '\'' +
", deducting_reason='" + deducting_reason + '\'' +
", score_deducting=" + score_deducting +
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 befb00f..beeb253 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));
+ WorkRoomDataBase.getWorkRoomDataBase(getContext().getApplicationContext()).getFailProjDao().insert(new FailedProj(1, r,1001));
}
});
--
Gitblit v1.8.0