endian11
2019-11-27 a691a7b3e4dca73671877196cca8611cc618afae
失败项目加入stu_id,跟学员表好关联
4个文件已修改
31 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 @@
     * 如果要添加 科目二II   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);
}
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;
    }
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 +
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));
                    }
                });