李明 / ClasManage · 提交

转到一个项目

作者 guojianfu
提交 88f2b10d6b1525603df397b03f147b525ddd5c8d 1 个父辈 7864ea49

作业BUG修复 及点评模块修改

内嵌 并排对比
正在显示 6 个修改的文件 包含 128 行增加 和 86 行删除
... ... @@ -149,34 +149,40 @@ public class HdLBBean {
* class_name : 六(1班)
* teacher_name : 高颖
*/
private int type;
private int id;
private int create_time;
private String title;
private String teacher_id;
private int class_id;
private String class_id;
private String date;
private int deadline;
private String teacher_ids;
private String parent_ids;
private String content;
private int student_id;
private String student_id;
private String leave_type;
private String start_date;
private String end_date;
private int day;
private int parent_id;
private int status;//1=进行中,2=已结束
private String parent_id;
private int is_online;
private String type_text;
private int total_num;
private int view_num;
private int uncomment_num;
private String class_name;
private String teacher_name;
private int is_author=0;//1-自己发的 0-别人发的 默认要为0 因为家长活动接口 没返回此字段
private int is_read;//0=未读,1=已读
private int is_author;
private int detail_id;
private int status;
private String label;
private int read_time;
private String type_text;
private String status_text;
private int is_read;
private int itemType;
private String parent_name;
private String student_name;
private int is_sign;//0=未报名1=已报名
public int getIs_read() {
... ... @@ -243,11 +249,11 @@ public class HdLBBean {
this.teacher_id = teacher_id;
}
public int getClass_id() {
public String getClass_id() {
return class_id;
}
public void setClass_id(int class_id) {
public void setClass_id(String class_id) {
this.class_id = class_id;
}
... ... @@ -291,11 +297,11 @@ public class HdLBBean {
this.content = content;
}
public int getStudent_id() {
public String getStudent_id() {
return student_id;
}
public void setStudent_id(int student_id) {
public void setStudent_id(String student_id) {
this.student_id = student_id;
}
... ... @@ -331,11 +337,11 @@ public class HdLBBean {
this.day = day;
}
public int getParent_id() {
public String getParent_id() {
return parent_id;
}
public void setParent_id(int parent_id) {
public void setParent_id(String parent_id) {
this.parent_id = parent_id;
}
... ...
... ... @@ -133,32 +133,40 @@ public class DcwjEntity {
* class_name :
* teacher_name :
*/
private int type;
private int id;
private int create_time;
private String title;
private String teacher_id;
private int class_id;
private String class_id;
private String date;
private int deadline;
private String teacher_ids;
private String parent_ids;
private String content;
private int student_id;
private String student_id;
private String leave_type;
private String start_date;
private String end_date;
private int day;
private int parent_id;
private int status;
private String parent_id;
private int is_online;
private String type_text;
private String total_num;
private String view_num;
private String uncomment_num;
private int total_num;
private int view_num;
private int uncomment_num;
private String class_name;
private String teacher_name;
private int is_author;
private int detail_id;
private int status;
private String label;
private int read_time;
private String type_text;
private String status_text;
private int is_read;
private int itemType;
private String parent_name;
private String student_name;
public int getType() {
return type;
... ... @@ -200,11 +208,11 @@ public class DcwjEntity {
this.teacher_id = teacher_id;
}
public int getClass_id() {
public String getClass_id() {
return class_id;
}
public void setClass_id(int class_id) {
public void setClass_id(String class_id) {
this.class_id = class_id;
}
... ... @@ -248,11 +256,11 @@ public class DcwjEntity {
this.content = content;
}
public int getStudent_id() {
public String getStudent_id() {
return student_id;
}
public void setStudent_id(int student_id) {
public void setStudent_id(String student_id) {
this.student_id = student_id;
}
... ... @@ -288,11 +296,11 @@ public class DcwjEntity {
this.day = day;
}
public int getParent_id() {
public String getParent_id() {
return parent_id;
}
public void setParent_id(int parent_id) {
public void setParent_id(String parent_id) {
this.parent_id = parent_id;
}
... ... @@ -320,27 +328,27 @@ public class DcwjEntity {
this.type_text = type_text;
}
public String getTotal_num() {
public int getTotal_num() {
return total_num;
}
public void setTotal_num(String total_num) {
public void setTotal_num(int total_num) {
this.total_num = total_num;
}
public String getView_num() {
public int getView_num() {
return view_num;
}
public void setView_num(String view_num) {
public void setView_num(int view_num) {
this.view_num = view_num;
}
public String getUncomment_num() {
public int getUncomment_num() {
return uncomment_num;
}
public void setUncomment_num(String uncomment_num) {
public void setUncomment_num(int uncomment_num) {
this.uncomment_num = uncomment_num;
}
... ...
... ... @@ -131,32 +131,40 @@ public class JxtJlEntity {
* class_name :
* teacher_name :
*/
private int type;
private int id;
private int create_time;
private String title;
private String teacher_id;
private int class_id;
private String class_id;
private String date;
private int deadline;
private String teacher_ids;
private String parent_ids;
private String content;
private int student_id;
private String student_id;
private String leave_type;
private String start_date;
private String end_date;
private int day;
private int parent_id;
private int status;
private String parent_id;
private int is_online;
private String type_text;
private String total_num;
private String view_num;
private int total_num;
private int view_num;
private int uncomment_num;
private String class_name;
private String teacher_name;
private int is_author;
private int detail_id;
private int status;
private String label;
private int read_time;
private String type_text;
private String status_text;
private int is_read;
private int itemType;
private String parent_name;
private String student_name;
public int getType() {
return type;
... ... @@ -198,11 +206,11 @@ public class JxtJlEntity {
this.teacher_id = teacher_id;
}
public int getClass_id() {
public String getClass_id() {
return class_id;
}
public void setClass_id(int class_id) {
public void setClass_id(String class_id) {
this.class_id = class_id;
}
... ... @@ -246,11 +254,11 @@ public class JxtJlEntity {
this.content = content;
}
public int getStudent_id() {
public String getStudent_id() {
return student_id;
}
public void setStudent_id(int student_id) {
public void setStudent_id(String student_id) {
this.student_id = student_id;
}
... ... @@ -286,11 +294,11 @@ public class JxtJlEntity {
this.day = day;
}
public int getParent_id() {
public String getParent_id() {
return parent_id;
}
public void setParent_id(int parent_id) {
public void setParent_id(String parent_id) {
this.parent_id = parent_id;
}
... ... @@ -318,19 +326,19 @@ public class JxtJlEntity {
this.type_text = type_text;
}
public String getTotal_num() {
public int getTotal_num() {
return total_num;
}
public void setTotal_num(String total_num) {
public void setTotal_num(int total_num) {
this.total_num = total_num;
}
public String getView_num() {
public int getView_num() {
return view_num;
}
public void setView_num(String view_num) {
public void setView_num(int view_num) {
this.view_num = view_num;
}
... ...
... ... @@ -131,24 +131,23 @@ public class JxtZyListEntity {
* class_name : 六(1班)
* teacher_name : 罗艳萍
*/
private int type;
private int id;
private int create_time;
private String title;
private String teacher_id;
private int class_id;
private String class_id;
private String date;
private int deadline;
private String teacher_ids;
private String parent_ids;
private String content;
private int student_id;
private String student_id;
private String leave_type;
private String start_date;
private String end_date;
private int day;
private int parent_id;
private String parent_id;
private int is_online;
private int total_num;
private int view_num;
... ... @@ -157,6 +156,15 @@ public class JxtZyListEntity {
private String teacher_name;
private int is_author;
private int detail_id;
private int status;
private String label;
private int read_time;
private String type_text;
private String status_text;
private int is_read;
private int itemType;
private String parent_name;
private String student_name;
public int getDetail_id() {
return detail_id;
... ... @@ -189,7 +197,6 @@ public class JxtZyListEntity {
//请假
public static final int QINGJIA= 7;
private int itemType;
public DataBean(int itemType) {
this.itemType = itemType;
... ... @@ -235,11 +242,11 @@ public class JxtZyListEntity {
this.teacher_id = teacher_id;
}
public int getClass_id() {
public String getClass_id() {
return class_id;
}
public void setClass_id(int class_id) {
public void setClass_id(String class_id) {
this.class_id = class_id;
}
... ... @@ -283,11 +290,11 @@ public class JxtZyListEntity {
this.content = content;
}
public int getStudent_id() {
public String getStudent_id() {
return student_id;
}
public void setStudent_id(int student_id) {
public void setStudent_id(String student_id) {
this.student_id = student_id;
}
... ... @@ -323,11 +330,11 @@ public class JxtZyListEntity {
this.day = day;
}
public int getParent_id() {
public String getParent_id() {
return parent_id;
}
public void setParent_id(int parent_id) {
public void setParent_id(String parent_id) {
this.parent_id = parent_id;
}
... ...
... ... @@ -131,32 +131,40 @@ public class JxttpEntity {
* class_name : 六(1班)
* teacher_name : 寸晓丹
*/
private int type;
private int id;
private int create_time;
private String title;
private String teacher_id;
private int class_id;
private String class_id;
private String date;
private int deadline;
private String teacher_ids;
private String parent_ids;
private String content;
private int student_id;
private String student_id;
private String leave_type;
private String start_date;
private String end_date;
private int day;
private String parent_id;
private int status;
private int is_online;
private String type_text;
private int total_num;
private int view_num;
private String uncomment_num;
private int uncomment_num;
private String class_name;
private String teacher_name;
private int is_author;
private int detail_id;
private int status;
private String label;
private int read_time;
private String type_text;
private String status_text;
private int is_read;
private int itemType;
private String parent_name;
private String student_name;
public int getType() {
return type;
... ... @@ -198,11 +206,11 @@ public class JxttpEntity {
this.teacher_id = teacher_id;
}
public int getClass_id() {
public String getClass_id() {
return class_id;
}
public void setClass_id(int class_id) {
public void setClass_id(String class_id) {
this.class_id = class_id;
}
... ... @@ -246,11 +254,11 @@ public class JxttpEntity {
this.content = content;
}
public int getStudent_id() {
public String getStudent_id() {
return student_id;
}
public void setStudent_id(int student_id) {
public void setStudent_id(String student_id) {
this.student_id = student_id;
}
... ... @@ -334,11 +342,11 @@ public class JxttpEntity {
this.view_num = view_num;
}
public String getUncomment_num() {
public int getUncomment_num() {
return uncomment_num;
}
public void setUncomment_num(String uncomment_num) {
public void setUncomment_num(int uncomment_num) {
this.uncomment_num = uncomment_num;
}
... ...
... ... @@ -134,7 +134,6 @@ public class TzlistJzEntity {
* status_text : 未提交
* detail_id : 4900
*/
private int type;
private int id;
private int create_time;
... ... @@ -146,23 +145,29 @@ public class TzlistJzEntity {
private String teacher_ids;
private String parent_ids;
private String content;
private int student_id;
private int leave_type;
private String student_id;
private String leave_type;
private String start_date;
private String end_date;
private int day;
private String parent_id;
private int status;
private int is_online;
private String type_text;
private int total_num;
private int view_num;
private int uncomment_num;
private String class_name;
private String teacher_name;
private String status_text;
private int is_author;
private int detail_id;
private int status;
private String label;
private int read_time;
private String type_text;
private String status_text;
private int is_read;
private int itemType;
private String parent_name;
private String student_name;
public String getLabel() {
return label;
... ... @@ -260,19 +265,19 @@ public class TzlistJzEntity {
this.content = content;
}
public int getStudent_id() {
public String getStudent_id() {
return student_id;
}
public void setStudent_id(int student_id) {
public void setStudent_id(String student_id) {
this.student_id = student_id;
}
public int getLeave_type() {
public String getLeave_type() {
return leave_type;
}
public void setLeave_type(int leave_type) {
public void setLeave_type(String leave_type) {
this.leave_type = leave_type;
}
... ...