From 42369e5b496e0eff7f2254fdf4fbde442516e15f Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Mon, 14 Jan 2019 20:45:01 +0800
Subject: [PATCH 1/3] Merge remote-tracking branch 'remotes/origin/wmj' into
 wlf

# Conflicts:
#	src/core/process/C_StudentUploadOpeningReport.java
---
 .../Submit/S_StudentUploadOpeningReport.java  | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/servlet/Submit/S_StudentUploadOpeningReport.java b/src/servlet/Submit/S_StudentUploadOpeningReport.java
index 78afd75..8270f8d 100644
--- a/src/servlet/Submit/S_StudentUploadOpeningReport.java
+++ b/src/servlet/Submit/S_StudentUploadOpeningReport.java
@@ -1,5 +1,6 @@
 package servlet.Submit;
 
+import core.process.C_StudentUploadOpeningReport;
 import core.user.User;
 
 import javax.servlet.ServletException;
@@ -9,6 +10,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
+import java.io.File;
 import java.io.IOException;
 import java.util.UUID;
 
@@ -19,25 +21,6 @@ public class S_StudentUploadOpeningReport extends HttpServlet {
     private static final long serialVersionUID = 1L;
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
-        User user=(User) request.getSession().getAttribute("user");
-        String student_id=user.getId();
 
-        try {
-
-            //获取上传的文件
-            Part part=request.getPart("file");
-            //获取请求的信息
-            String name=part.getHeader("content-disposition");
-            //获取上传文件的目录
-            String root=request.getServletContext().getRealPath("/upload");
-
-
-            request.setAttribute("info", "上传文件成功");
-        } catch (Exception e) {
-            e.printStackTrace();
-            request.setAttribute("info", "上传文件失败");
-        }
-
-        request.getRequestDispatcher("/upload.jsp").forward(request, response);
     }
 }

From 687ce0df5bd7b4a0e6f26a9dbe5d932315cd007c Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Mon, 14 Jan 2019 21:11:54 +0800
Subject: [PATCH 2/3] Merge remote-tracking branch 'remotes/origin/wmj' into
 wlf

# Conflicts:
#	src/core/process/C_StudentUploadOpeningReport.java
---
 .idea/misc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9486b47..df60b67 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" 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>
\ No newline at end of file

From b3317a285026cd57f04414c9df6302eefc3bc572 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Mon, 14 Jan 2019 23:35:36 +0800
Subject: [PATCH 3/3] Merge remote-tracking branch 'remotes/origin/wmj' into
 wlf

# Conflicts:
#	src/core/process/C_StudentUploadOpeningReport.java
---
 src/core/process/C_MentorFillReview.java | 58 ++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 src/core/process/C_MentorFillReview.java

diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java
new file mode 100644
index 0000000..d9a3128
--- /dev/null
+++ b/src/core/process/C_MentorFillReview.java
@@ -0,0 +1,58 @@
+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_MentorFillReview extends TempProcess {
+    public String teacherID;
+    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 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{
+        if(!check()) throw new GExcptInit("MentorFillReview 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("review_opinion_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getTeacherID());
+        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))
+        return false;
+        else
+            return true;
+    }
+}
+