Merge remote-tracking branches 'remotes/origin/wmj' and 'remotes/origin/zgl'

# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml
hechu1
zhai_lw 6 years ago
commit 9433c8ad1a

@ -1,11 +1,17 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="gdms:war exploded">
<output-path>$PROJECT_DIR$/out/artifacts/gdms_war_exploded</output-path>
<artifact type="exploded-war" name="GDMS:war exploded">
<output-path>$PROJECT_DIR$/out/artifacts/GDMS_war_exploded</output-path>
<root id="root">
<element id="javaee-facet-resources" facet="gdms/web/Web" />
<element id="javaee-facet-resources" facet="GDMS/web/Web" />
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="gdms" />
<element id="module-output" name="GDMS" />
<element id="dir-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5" />
</element>
<element id="directory" name="lib">
<element id="library" level="project" name="lib" />
<element id="extracted-dir" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" path-in-jar="/" />
<element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" />
</element>
</element>
</root>

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="true" project-jdk-name="10" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

@ -2,6 +2,5 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

@ -9,25 +9,40 @@
<webroots>
<root url="file://$MODULE_DIR$/web" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<orderEntry type="library" exported="" scope="PROVIDED" name="lib" level="project" />
<orderEntry type="library" exported="" scope="PROVIDED" name="tomcat-lib" level="project" />
<orderEntry type="module-library" exported="" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar!/" />
<root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/webapps/docs/appdev/sample/src" />
<root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/work/Catalina/localhost/ROOT" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.14" level="application_server_libraries" />
</component>
</module>

@ -11,7 +11,7 @@ import java.util.Map;
public class C_CollegeFillOpeningReportOpinion extends TempProcess{
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="学院开题意见";
static String table="graduation_design_opening_report_opinion_record";
public void fillInformation() throws Exception {

@ -12,7 +12,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="学院老师评分";
static String table="graduation_design_reply_opinion_record_score";
public void fillInformation() throws Exception{
@ -30,7 +30,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
}
protected boolean check() {
if(this.getGraduationDesignId()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
return true;
}

@ -10,8 +10,9 @@ import java.util.Map;
public class C_MentorFillOpeningReportOpinion extends TempProcess{
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="导师开题意见";
static String table="graduation_design_opening_report_opinion_record";
public void fillInformation() throws Exception{
@ -33,6 +34,16 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
return false;
return true;
}
@Override
public String getGraduationDesignId() {
return graduationDesignId;
}
@Override
public void setGraduationDesignId(String graduationDesignId) {
this.graduationDesignId = graduationDesignId;
}
public void setVMap(Map<String, String> vMap) {
this.vMap = vMap;
}

@ -9,30 +9,13 @@ import java.util.HashMap;
import java.util.Map;
public class C_MentorFillReview extends TempProcess {
public String teacherID;
public String teacher_opinion;
public Map<String,String> vMap;
public String graduationDesignId;
public Map<String,String> vMap;
private static String buttonName ="指导老师评阅";
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 getTeacherID() {
return teacherID;
}
public void setTeacherID(String teacherID) {
this.teacherID = teacherID;
}
public Map<String, String> getvMap() {
return vMap;
}
public void setvMap(Map<String, String> vMap) {
this.vMap = vMap;
}
public void TeacherTeamFillOpeningReportOpinion() throws Exception{
public void teacherTeamFillOpeningReportOpinion() throws Exception{
if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!");
FillInformation fillInformation=new FillInformation();
fillInformation.setOptions(new HashMap<>());
@ -41,18 +24,30 @@ public class C_MentorFillReview extends TempProcess {
String date=df.format(new Date());
vMap.put("review_opinion_date",date);
Map<String, String>limits = new HashMap<>();
limits.put("id",this.getTeacherID());
limits.put("id",this.getGraduationDesignId());
fillInformation.addOptions("limits",limits);
fillInformation.execute(null);
}
@Override
protected boolean check() {
if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null))
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
else
return true;
}
public String getGraduationDesignId() {
return graduationDesignId;
}
public void setGraduationDesignId(String graduationDesignId) {
this.graduationDesignId = graduationDesignId;
}
public void setVMap(Map<String, String> vMap) {
this.vMap = vMap;
}
public Map<String, String> getVMap() {
return vMap;
}
}

@ -0,0 +1,61 @@
package core.process;
import core.operation.FillInformation;
import error.GExcptInit;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
//评阅老师评阅
public class C_ReviewerFillReview extends TempProcess {
public String graduationDesignId;
public Map<String,String> vMap;
private static String buttonName ="评阅老师评阅";
static String table="graduation_design_finished_product_reviewer_score";
public void TeacherTeamFillOpeningReportOpinion() throws Exception{
if(!check()) throw new GExcptInit("ReviewerFillReview Attrs init error!");
FillInformation fillInformation=new FillInformation();
fillInformation.setOptions(new HashMap<>());
fillInformation.addOptions("table",table);
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
String date=df.format(new Date());
vMap.put("reviewer_score_date",date);
Map<String, String>limits = new HashMap<>();
limits.put("id",this.getGraduationDesignId());
fillInformation.addOptions("limits",limits);
fillInformation.execute(null);
}
@Override
protected boolean check() {
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;
}
}

@ -12,7 +12,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="学院老师评分";
static String table="graduation_design_reply_opinion_record_score";
public void fillInformation() throws Exception{
if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@ -28,7 +28,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
fillInformation.execute(null);
}
protected boolean check() {
if(this.getGraduationDesignId()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
return true;
}
@ -45,6 +45,10 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
this.vMap = vMap;
}
public Map<String, String> getVMap() {
return vMap;
}
}

@ -12,7 +12,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="提交开题纪要";
static String table="graduation_design_opening_report_opinion_record";
public void fillInformation() throws Exception{
@ -29,7 +29,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
fillInformation.execute(null);
}
protected boolean check() {
if(this.getGraduationDesignId()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
return true;
}
@ -46,5 +46,8 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
public void setVMap(Map<String, String> vMap) {
this.vMap = vMap;
}
public Map<String, String> getVMap() {
return vMap;
}
}

@ -12,7 +12,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="提交答辩记录";
static String table="graduation_design_reply_opinion_record_score";
public void fillInformation() throws Exception{
@ -30,7 +30,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
}
protected boolean check() {
if(this.getGraduationDesignId()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
return true;
}
@ -46,6 +46,9 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
this.vMap = vMap;
}
public Map<String, String> getVMap() {
return vMap;
}
}

@ -11,7 +11,7 @@ import java.util.Map;
public class C_StudentFillGraduationDesignInformation extends TempProcess{
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="填写选题信息";
static String table="graduation_design_opening_report_opinion_record";
public void fillInformation() throws Exception{
@ -25,7 +25,7 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{
fillInformation.execute(null);
}
protected boolean check() {
if(this.getGraduationDesignId()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
return true;
}
@ -43,5 +43,9 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{
this.vMap = vMap;
}
public Map<String, String> getVMap() {
return vMap;
}
}

@ -12,7 +12,7 @@ import java.util.Map;
public class C_StudentSelectTeacher extends TempProcess {
String studentId;
String teacherId;
private static String buttonName ="选择老师";
public void select()throws Exception{
if(!check()) throw new GExcptInit("ID Attrs init error!");
Select select=new Select();

@ -11,7 +11,7 @@ public class C_StudentUploadFinishedProduct {
File finishedProduct;
String graduationDesignId;
private static String buttonName ="提交定稿";
static String file_type = "finished_product";
public void uploadOpeningReport() throws Exception{
if(!check()) throw new GExcptInit("Upload FinishedProduct Attrs init error!");

@ -10,7 +10,7 @@ import java.util.Map;
public class C_StudentUploadOpeningReport extends TempProcess{
File openingReport;
String graduationDesignId;
private static String buttonName ="提交开题报告";
static String file_type = "opening_report";
public void uploadOpeningReport() throws Exception{

@ -12,6 +12,7 @@ import java.util.Map;
public class C_TeacherSelectStudent extends TempProcess {
String studentId;
String teacherId;
private static String buttonName ="选择学生";
public void select()throws Exception{
if(!check()) throw new GExcptInit("ID Attrs init error!");

@ -12,7 +12,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
String graduationDesignId;
Map<String,String> vMap;
private static String buttonName ="开题小组意见";
static String table="graduation_design_opening_report_opinion_record";
public void fillInformation() throws Exception{
@ -29,7 +29,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
fillInformation.execute(null);
}
protected boolean check() {
if(this.getGraduationDesignId()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
return true;
}
@ -47,4 +47,9 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
this.vMap = vMap;
}
public Map<String, String> getVMap() {
return vMap;
}
}

@ -10,6 +10,8 @@ import java.util.Map;
public class C_TeacherTeamFillScoreOpinion extends TempProcess {
private static String buttonName = "答辩小组评分";
String graduationDesignId;
Map<String,String> vMap;
@ -29,7 +31,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess {
fillInformation.execute(null);
}
protected boolean check() {
if(this.getGraduationDesignId()==null)
if(this.getGraduationDesignId()==null||this.getVMap()==null)
return false;
return true;
}
@ -45,5 +47,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess {
public void setVMap(Map<String, String> vMap) {
this.vMap = vMap;
}
public Map<String, String> getVMap() {
return vMap;
}
}

@ -5,5 +5,5 @@
"opening_report_opinion_deadline_date": "",
"finished_product_deadline_date": "",
"finished_product_review_deadline_date": "",
"reply_option_deadline_date": ""
"reply_opition_deadline_date": ""
}

@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/college-fill-opening-report-opinion")
@WebServlet("/home/college-fill-opening-report-opinion")
public class S_CollegeFillOpeningReportOpinion extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/college-fill-score-opinion")
@WebServlet("/home/college-fill-score-opinion")
public class S_CollegeFillScoreOpinion extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/mentor-fill-opening-report-opinion")
@WebServlet("/home/mentor-fill-opening-report-opinion")
public class S_MentorFillOpeningReportOpinion extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/mentor-fill-review")
@WebServlet("/home/mentor-fill-review")
public class S_MentorFillReview extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/reviewer-fill-review")
@WebServlet("/home/reviewer-fill-review")
public class S_ReviewerFillReview extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/school-fill-score-opinion")
@WebServlet("/home/school-fill-score-opinion")
public class S_SchoolFillScoreOpinion extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/secretary-fill-opening-report-record")
@WebServlet("/home/secretary-fill-opening-report-record")
public class S_SecretaryFillOpeningReportRecord extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/secretary-fill-reply-record")
@WebServlet("/home/secretary-fill-reply-record")
public class S_SecretaryFillReplyRecord extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/student-fill-graduation-design-information")
@WebServlet("/home/student-fill-graduation-design-information")
public class S_StudentFillGraduationDesignInformation extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@WebServlet("/student-select-teacher")
@WebServlet("/home/student-select-teacher")
public class S_StudentSelectTeacher extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
super.doPost(request, response);

@ -12,7 +12,7 @@ import javax.servlet.http.Part;
import java.io.IOException;
import java.util.UUID;
@WebServlet("/student-upload-opening-report")
@WebServlet("/home/student-upload-opening-report")
@MultipartConfig
public class S_StudentUploadOpeningReport extends HttpServlet {
static String fileType = "graduation_design_opening_report";

@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@WebServlet("/teacher-select-student")
@WebServlet("/home/teacher-select-student")
public class S_TeacherSelectStudent extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
super.doPost(request, response);

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/teacher-team-fill-opening-report-opinion")
@WebServlet("/home/teacher-team-fill-opening-report-opinion")
public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@WebServlet("/teacher-team-fill-score-opinion")
@WebServlet("/home/teacher-team-fill-score-opinion")
public class S_TeacherTeamFillScoreOpinion extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String id = request.getParameter("id");

Loading…
Cancel
Save