李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 3b62f7233208d376cd9a812bb8c856f06b67d2e1 1 个父辈 ba17091a

add

内嵌 并排对比
正在显示 5 个修改的文件 包含 205 行增加 和 271 行删除
... ... @@ -2,47 +2,38 @@ package com.yinhebairong.clasmanage.bean;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* 科目成绩列表
* 期末成绩列表
*/
public class SubjectScoreList implements Serializable {
public class QimoScoreList implements Serializable {
/**
* {{
* "code;// 1,
* "msg;// "",
* "time;// "1586411372",
* "data;// [
* {
* "code": 1,
* "msg": "",
* "time": "1586409538",
* "data": [
* {
* "id": 33,
* "campus_id": 1,
* "grade_id": 1,
* "class_id": 2,
* "exam_id": 1,
* "subject_id": 1,
* "student_id": 1,
* "student_name": "刘秉鑫",
* "obj_score": 50,
* "sub_score": 50,
* "total_score": 85,
* "examer_id": "1",
* "exam_card_Id": "1212121",
* "createtime": 1586166273,
* "examtime": null,
* "educlassexaminfo": {
* "exam_id": 1,
* "exam_name": "2019年下学期末考试",
* "is_final": 1,
* "examtime": 1
* },
* "edusubjectinfo": {
* "id": 1,
* "subject_name": "道德与法治",
* "school_id": "1"
* }
* }
* ]
* "total_all;// 2806,
* "name;// "2019年下学期末考试",
* "data;// [
* {
* private int total_score;// 11,
* private int exam_id;// 1,
* private int grade_id;// 1,
* private int subject_id;// 7,
* private int full_score;// 100,
* private int edusubjectinfo;// {
* private String id;// 7,
* private String subject_name;// "体育与健康",
* private String school_id;// "1"
* }
* }
* ]
* }
* ]
* }
*/
private int code;
... ... @@ -93,227 +84,119 @@ public class SubjectScoreList implements Serializable {
}
public class DataBeanX {
private int id;// 33,
private int campus_id;// 1,
private int grade_id;// 1,
private int class_id;// 2,
private int exam_id;// 1,
private int subject_id;// 1,
private int student_id;// 1,
private String student_name;// "刘秉鑫",
private int obj_score;// 50,
private int sub_score;// 50,
private int total_score;// 85,
private String examer_id;// "1",
private String exam_card_Id;// "1212121",
private int createtime;// 1586166273,
private String examtime;// null,
private EduClassexamInfo educlassexaminfo;//
private EdusubjectInfo edusubjectinfo;// {
public class EduClassexamInfo {
private int exam_id;// 1,
private String exam_name;// "2019年下学期末考试",
private int is_final;// 1,
private int examtime;// 1
public int getExam_id() {
return exam_id;
}
private int total_all;
private String name;
private List<DataBean> data;
public void setExam_id(int exam_id) {
this.exam_id = exam_id;
}
public String getExam_name() {
return exam_name;
}
public int getTotal_all() {
return total_all;
}
public void setExam_name(String exam_name) {
this.exam_name = exam_name;
}
public void setTotal_all(int total_all) {
this.total_all = total_all;
}
public int getIs_final() {
return is_final;
}
public String getName() {
return name;
}
public void setIs_final(int is_final) {
this.is_final = is_final;
}
public void setName(String name) {
this.name = name;
}
public int getExamtime() {
return examtime;
}
public List<DataBean> getData() {
return data;
}
public void setExamtime(int examtime) {
this.examtime = examtime;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public class EdusubjectInfo {
private int id;// 1,
private String subject_name;// "道德与法治",
private int school_id;// "1"
public class DataBean {
private int total_score;// 11,
private int exam_id;// 1,
private int grade_id;// 1,
private int subject_id;// 7,
private int full_score;// 100,
private EduSubjectInfo edusubjectinfo;// {
public int getId() {
return id;
public int getTotal_score() {
return total_score;
}
public void setId(int id) {
this.id = id;
public void setTotal_score(int total_score) {
this.total_score = total_score;
}
public String getSubject_name() {
return subject_name;
public int getExam_id() {
return exam_id;
}
public void setSubject_name(String subject_name) {
this.subject_name = subject_name;
public void setExam_id(int exam_id) {
this.exam_id = exam_id;
}
public int getSchool_id() {
return school_id;
public int getGrade_id() {
return grade_id;
}
public void setSchool_id(int school_id) {
this.school_id = school_id;
public void setGrade_id(int grade_id) {
this.grade_id = grade_id;
}
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getCampus_id() {
return campus_id;
}
public void setCampus_id(int campus_id) {
this.campus_id = campus_id;
}
public int getGrade_id() {
return grade_id;
}
public void setGrade_id(int grade_id) {
this.grade_id = grade_id;
}
public int getClass_id() {
return class_id;
}
public void setClass_id(int class_id) {
this.class_id = class_id;
}
public int getExam_id() {
return exam_id;
}
public void setExam_id(int exam_id) {
this.exam_id = exam_id;
}
public int getSubject_id() {
return subject_id;
}
public void setSubject_id(int subject_id) {
this.subject_id = subject_id;
}
public int getStudent_id() {
return student_id;
}
public void setStudent_id(int student_id) {
this.student_id = student_id;
}
public String getStudent_name() {
return student_name;
}
public void setStudent_name(String student_name) {
this.student_name = student_name;
}
public int getObj_score() {
return obj_score;
}
public void setObj_score(int obj_score) {
this.obj_score = obj_score;
}
public int getSub_score() {
return sub_score;
}
public void setSub_score(int sub_score) {
this.sub_score = sub_score;
}
public int getTotal_score() {
return total_score;
}
public void setTotal_score(int total_score) {
this.total_score = total_score;
}
public int getSubject_id() {
return subject_id;
}
public String getExamer_id() {
return examer_id;
}
public void setSubject_id(int subject_id) {
this.subject_id = subject_id;
}
public void setExamer_id(String examer_id) {
this.examer_id = examer_id;
}
public int getFull_score() {
return full_score;
}
public String getExam_card_Id() {
return exam_card_Id;
}
public void setFull_score(int full_score) {
this.full_score = full_score;
}
public void setExam_card_Id(String exam_card_Id) {
this.exam_card_Id = exam_card_Id;
}
public EduSubjectInfo getEdusubjectinfo() {
return edusubjectinfo;
}
public int getCreatetime() {
return createtime;
}
public void setEdusubjectinfo(EduSubjectInfo edusubjectinfo) {
this.edusubjectinfo = edusubjectinfo;
}
public void setCreatetime(int createtime) {
this.createtime = createtime;
}
public class EduSubjectInfo {
private int id;// 7,
private String subject_name;// "体育与健康",
private String school_id;// "1"
public String getExamtime() {
return examtime;
}
public int getId() {
return id;
}
public void setExamtime(String examtime) {
this.examtime = examtime;
}
public void setId(int id) {
this.id = id;
}
public EduClassexamInfo getEduclassexaminfo() {
return educlassexaminfo;
}
public String getSubject_name() {
return subject_name;
}
public void setEduclassexaminfo(EduClassexamInfo educlassexaminfo) {
this.educlassexaminfo = educlassexaminfo;
}
public void setSubject_name(String subject_name) {
this.subject_name = subject_name;
}
public EdusubjectInfo getEdusubjectinfo() {
return edusubjectinfo;
}
public String getSchool_id() {
return school_id;
}
public void setEdusubjectinfo(EdusubjectInfo edusubjectinfo) {
this.edusubjectinfo = edusubjectinfo;
public void setSchool_id(String school_id) {
this.school_id = school_id;
}
}
}
}
}
... ...
... ... @@ -8,6 +8,7 @@ import com.yinhebairong.clasmanage.bean.HDMBBean;
import com.yinhebairong.clasmanage.bean.HdLBBean;
import com.yinhebairong.clasmanage.bean.HdTjmbBean;
import com.yinhebairong.clasmanage.bean.ParentsInfoBean;
import com.yinhebairong.clasmanage.bean.QimoScoreList;
import com.yinhebairong.clasmanage.bean.SubjectScoreList;
import com.yinhebairong.clasmanage.bean.TeacherInfoBean;
import com.yinhebairong.clasmanage.bean.TzMbBean;
... ... @@ -511,4 +512,7 @@ public interface ApiService {
/*学生科目成绩列表*/
@POST("/api/score/getChildScore")
Observable<SubjectScoreList> getChildScore(@Header("token") String token, @Query("student_id") int student_id, @Query("exam_id") int exam_id);
/*学生科目成绩列表*/
@POST("/api/score/getChildFinal")
Observable<QimoScoreList> getChildFinal(@Header("token") String token, @Query("student_id") int student_id);
}
\ No newline at end of file
... ...
... ... @@ -9,7 +9,7 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yinhebairong.clasmanage.R;
import com.yinhebairong.clasmanage.entity.QimoListEntity;
import com.yinhebairong.clasmanage.bean.QimoScoreList;
import java.util.List;
... ... @@ -18,25 +18,25 @@ import java.util.List;
* Author: TAO
* Description:期末成绩-（家长端）
*/
public class QimoAdapter extends BaseQuickAdapter<QimoListEntity.DataBeanX, BaseViewHolder> {
public class QimoAdapter extends BaseQuickAdapter<QimoScoreList.DataBeanX, BaseViewHolder> {
String id;
private Context context;
public QimoAdapter(int layoutResId, @Nullable List<QimoListEntity.DataBeanX> data, Context context) {
public QimoAdapter(int layoutResId, @Nullable List<QimoScoreList.DataBeanX> data, Context context) {
super(layoutResId, data);
this.context=context;
}
@Override
protected void convert(BaseViewHolder helper, QimoListEntity.DataBeanX item) {
protected void convert(BaseViewHolder helper, QimoScoreList.DataBeanX item) {
TextView tv_zongdefen = helper.getView(R.id.tv_zongdefen);
TextView tv_title = helper.getView(R.id.tv_title);
tv_zongdefen.setText(item.getZongdefen());
tv_title.setText(item.getTitle());
tv_zongdefen.setText(String.valueOf(item.getTotal_all()));
tv_title.setText(item.getName());
RecyclerView rv_achievement= helper.getView(R.id.rv_achievement);
QimoAdapter2 mQimoAdapter = new QimoAdapter2(R.layout.item_qimo_achievement2, item.getBeans());
QimoAdapter2 mQimoAdapter = new QimoAdapter2(R.layout.item_qimo_achievement2, item.getData());
rv_achievement.setLayoutManager(new LinearLayoutManager(context));
rv_achievement.setAdapter(mQimoAdapter);
... ...
... ... @@ -6,7 +6,7 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yinhebairong.clasmanage.R;
import com.yinhebairong.clasmanage.entity.QimoListEntity;
import com.yinhebairong.clasmanage.bean.QimoScoreList;
import java.util.List;
... ... @@ -15,22 +15,22 @@ import java.util.List;
* Author: TAO
* Description:期末成绩-（家长端）
*/
public class QimoAdapter2 extends BaseQuickAdapter<QimoListEntity.DataBeanX.DataBean, BaseViewHolder> {
public class QimoAdapter2 extends BaseQuickAdapter<QimoScoreList.DataBeanX.DataBean, BaseViewHolder> {
String id;
public QimoAdapter2(int layoutResId, @Nullable List<QimoListEntity.DataBeanX.DataBean> data) {
public QimoAdapter2(int layoutResId, @Nullable List<QimoScoreList.DataBeanX.DataBean> data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, QimoListEntity.DataBeanX.DataBean item) {
protected void convert(BaseViewHolder helper, QimoScoreList.DataBeanX.DataBean item) {
TextView tv_kemu = helper.getView(R.id.tv_kemu);
TextView tv_manfen = helper.getView(R.id.tv_manfen);
TextView tv_defen = helper.getView(R.id.tv_defen);
tv_kemu.setText(item.getTitle());
tv_manfen.setText(item.getManfen());
tv_defen.setText(item.getDefen());
tv_kemu.setText(item.getEdusubjectinfo().getSubject_name());
tv_manfen.setText(String.valueOf(item.getTotal_score()));
tv_defen.setText(String.valueOf(item.getFull_score()));
// TextView tv_time = helper.getView(R.id.tv_time);
// TextView tv_fenshu = helper.getView(R.id.tv_fenshu);
... ...
... ... @@ -2,20 +2,29 @@ package com.yinhebairong.clasmanage.ui.main.jzdFragment;
import android.support.v4.app.Fragment;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import com.kongzue.dialog.v3.WaitDialog;
import com.yinhebairong.clasmanage.Config;
import com.yinhebairong.clasmanage.R;
import com.yinhebairong.clasmanage.base.BaseFragment;
import com.yinhebairong.clasmanage.base.instant.Layout;
import com.yinhebairong.clasmanage.entity.QimoListEntity;
import com.yinhebairong.clasmanage.bean.QimoScoreList;
import com.yinhebairong.clasmanage.m.M;
import com.yinhebairong.clasmanage.ui.main.adapter.QimoAdapter;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
/**
* A simple {@link Fragment} subclass.
... ... @@ -27,47 +36,85 @@ public class QmcjFragment extends BaseFragment {
private QimoAdapter mQimoAdapter;
private List<QimoListEntity.DataBeanX> mList =new ArrayList<>();
private List<QimoScoreList.DataBeanX> mList =new ArrayList<>();
@Override
protected void initView(View root) {
QimoListEntity.DataBeanX.DataBean bean=new QimoListEntity.DataBeanX.DataBean();
bean.setDefen("99");
bean.setManfen("100");
bean.setTitle("物理成绩");
QimoListEntity.DataBeanX.DataBean bean2=new QimoListEntity.DataBeanX.DataBean();
bean2.setDefen("99");
bean2.setManfen("100");
bean2.setTitle("历史成绩");
QimoListEntity.DataBeanX.DataBean bean3=new QimoListEntity.DataBeanX.DataBean();
bean3.setDefen("99");
bean3.setManfen("1000");
bean3.setTitle("体育成绩");
List<QimoListEntity.DataBeanX.DataBean> list =new ArrayList<>();
list.add(bean);
list.add(bean2);
list.add(bean3);
List<QimoListEntity.DataBeanX.DataBean> list2 =new ArrayList<>();
list2.add(bean);
QimoListEntity.DataBeanX dataBeanX =new QimoListEntity.DataBeanX();
dataBeanX.setTitle("2019-2021期末成绩");
dataBeanX.setZongdefen("200");
dataBeanX.setBeans(list2);
QimoListEntity.DataBeanX dataBeanX2 =new QimoListEntity.DataBeanX();
dataBeanX2.setTitle("2019-2059期末成绩");
dataBeanX2.setZongdefen("2003");
dataBeanX2.setBeans(list);
mList.add(dataBeanX);
mList.add(dataBeanX2);
// QimoListEntity.DataBeanX.DataBean bean=new QimoListEntity.DataBeanX.DataBean();
// bean.setDefen("99");
// bean.setManfen("100");
// bean.setTitle("物理成绩");
// QimoListEntity.DataBeanX.DataBean bean2=new QimoListEntity.DataBeanX.DataBean();
// bean2.setDefen("99");
// bean2.setManfen("100");
// bean2.setTitle("历史成绩");
// QimoListEntity.DataBeanX.DataBean bean3=new QimoListEntity.DataBeanX.DataBean();
// bean3.setDefen("99");
// bean3.setManfen("1000");
// bean3.setTitle("体育成绩");
// List<QimoListEntity.DataBeanX.DataBean> list =new ArrayList<>();
// list.add(bean);
// list.add(bean2);
// list.add(bean3);
// List<QimoListEntity.DataBeanX.DataBean> list2 =new ArrayList<>();
// list2.add(bean);
//
// QimoListEntity.DataBeanX dataBeanX =new QimoListEntity.DataBeanX();
// dataBeanX.setTitle("2019-2021期末成绩");
// dataBeanX.setZongdefen("200");
// dataBeanX.setBeans(list2);
//
// QimoListEntity.DataBeanX dataBeanX2 =new QimoListEntity.DataBeanX();
// dataBeanX2.setTitle("2019-2059期末成绩");
// dataBeanX2.setZongdefen("2003");
// dataBeanX2.setBeans(list);
//
// mList.add(dataBeanX);
// mList.add(dataBeanX2);
mQimoAdapter = new QimoAdapter(R.layout.item_qimo_achievement, mList,getActivity());
rv_achievement.setLayoutManager(new LinearLayoutManager(getActivity()));
rv_achievement.setAdapter(mQimoAdapter);
getChildFinal();
}
/**
* 获取成绩列表
*/
private void getChildFinal() {
WaitDialog.show((AppCompatActivity) getActivity(), "请稍候...");
Api().getChildFinal(Config.Token, 1)//Config.Student_id
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<QimoScoreList>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(QimoScoreList teacherInfoBean) {
Log.e("onNext==", "1");
if (teacherInfoBean.getCode() == M.success) {
if (null != teacherInfoBean.getData() && teacherInfoBean.getData().size() > 0) {
mList.clear();
mList.addAll(teacherInfoBean.getData());
mQimoAdapter.notifyDataSetChanged();
}
}
}
@Override
public void onError(Throwable e) {
Log.e("请求onError==", e.getMessage());
Log.e("请求1onError==", e.toString());
}
@Override
public void onComplete() {
WaitDialog.dismiss();
Log.e("onComplete==", "1");
}
});
}
@Override
protected void initListener() {
... ...