endian11
2019-11-28 87ce88bf64ca5fb0eb9010474d55df170a44ac79
根据学号查失败项目表;再加上根据subject考场类型查询
5个文件已修改
26 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java
@@ -25,8 +25,15 @@
     * 如果要添加 科目二II   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类考场的失败项目 (多表查询)
     * 如果要添加 科目二II   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);
    /**
     * 获取失败项目条数
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);
    }
}
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);
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;
                    }
                });
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;