Merge remote-tracking branch 'remotes/origin/hechu1'

# Conflicts:
#	GDMS.iml
hechu1
zhai_lw 6 years ago
parent ce9ae99567
commit 55a1d718f1

@ -90,7 +90,21 @@ public class DBManagement {
public static Map<String,String> allStatus = new HashMap<>(){ public static Map<String,String> allStatus = new HashMap<>(){
{ {
put("graduation_design","teacher_choose_student_status"); put("graduation_design","teacher_choose_student_status");
put("graduation_design",""); put("graduation_design","student_choose_teacher_status");
put("graduation_design_information","student_fill_graduation_design_information_status");
put("graduation_design_opening_report","opening_report_status");
put("graduation_design_opening_report_opinion_record","opening_report_mentor_opinion_status");
put("graduation_design_opening_report_opinion_record","opening_report_teacher_team_opinion_status");
put("graduation_design_opening_report_opinion_record","opening_report_college_opinion_status");
put("graduation_design_opening_report_opinion_record","opening_report_secretary_record_status");
put("graduation_design_finished_product","finished_product_status");
put("graduation_design_finished_product_mentor_score","finished_product_mentor_score_status");
put("graduation_design_finished_product_reviewer_score","finished_product_reviewer_score_status");
put("graduation_design_reply_opinion_record_score","reply_ secretary_record_status");
put("graduation_design_reply_opinion_record_score","reply_ teacher_team_score_status");
put("graduation_design_reply_opinion_record_score","reply_college_score_status");
put("graduation_design_reply_opinion_record_score","reply_school_score_status");
} }
}; };
public static String driverClassName="org.mariadb.jdbc.Driver"; public static String driverClassName="org.mariadb.jdbc.Driver";

Loading…
Cancel
Save