Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
wlf
wlf 7 years ago
parent f47d14f5b8
commit cfb39b2407

@ -10,16 +10,9 @@ import java.util.Map;
//指导老师评阅
public class C_MentorFillReview extends TempProcess {
public String graduationDesignId;
public String teacher_opinion;
public Map<String,String> vMap;
static String table="graduation_design_finished_product_mentor_score";
public String getTeacher_opinion() {
return teacher_opinion;
}
public void setTeacher_opinion(String teacher_opinion) {
this.teacher_opinion = teacher_opinion;
}
public String getGraduationDesignId() {
return graduationDesignId;
}
@ -49,7 +42,7 @@ public class C_MentorFillReview extends TempProcess {
@Override
protected boolean check() {
if(this.getGraduationDesignId()==null||this.getTeacher_opinion()==null||this.getVMap()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
else
return true;

@ -10,28 +10,9 @@ import java.util.Map;
//评阅老师评阅
public class C_ReviewerFillReview extends TempProcess {
public String graduationDesignId;
public String teacher_opinion;
public Map<String, String> vMap;
static String table = "graduation_design_finished_product_reviewer_score";
public String getTeacher_opinion() {
return teacher_opinion;
}
public void setTeacher_opinion(String teacher_opinion) {
this.teacher_opinion = teacher_opinion;
}
public String getGraduationDesignId() {
return graduationDesignId;
}
public void setGraduationDesignId(String teacherID) {
this.graduationDesignId = graduationDesignId;
}
public Map<String, String> getVMap() {
return vMap;
}
public void setVMap(Map<String, String> vMap) {
this.vMap = vMap;
}
public void TeacherTeamFillOpeningReportOpinion() throws Exception {
if (!check()) throw new GExcptInit("ReviewerFillReview Attrs init error!");
FillInformation fillInformation = new FillInformation();
@ -46,20 +27,25 @@ public class C_ReviewerFillReview extends TempProcess {
fillInformation.execute(null);
}
@Override
protected boolean check() {
if(this.getGraduationDesignId()==null||this.getTeacher_opinion()==null||this.getVMap()==null)
if (this.getGraduationDesignId() == null|| this.getVMap() == null)
return false;
else
return true;
}
public String getGraduationDesignId() {
return graduationDesignId;
}
public void setGraduationDesignId(String teacherID) {
this.graduationDesignId = graduationDesignId;
}
public Map<String, String> getVMap() {
return vMap;
}
public void setVMap(Map<String, String> vMap) {
this.vMap = vMap;
}
}

Loading…
Cancel
Save