From 139d16b702cb5b3cd13e822dc1ecca4f1cd774b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=A5=9A?= <823169880@qq.com>
Date: Wed, 16 Jan 2019 12:20:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 hechu1

# Conflicts:
#	src/gdms/GDMS.java
---
 src/core/process/C_StudentSearchTeacher.java | 10 +++++-----
 src/core/process/C_TeacherSearchStudent.java |  9 ++++-----
 src/core/process/Process.java                |  2 ++
 web/home/home.jsp                            |  5 +++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java
index 6bd755f..d2b4109 100644
--- a/src/core/process/C_StudentSearchTeacher.java
+++ b/src/core/process/C_StudentSearchTeacher.java
@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class C_StudentSearchTeacher extends TempProcess{
+public class C_StudentSearchTeacher{
     String teacherID;
 
     protected static String buttonName = "";
@@ -71,22 +71,22 @@ public class C_StudentSearchTeacher extends TempProcess{
     public void setTeacherID(String teacherID){
         this.teacherID=teacherID;
     }
-    @Override
+
     public String getInfo() {
         return info;
     }
 
-    @Override
+
     public String getTargetURL() {
         return targetURL;
     }
 
-    @Override
+
     public String getIconURL() {
         return iconURL;
     }
 
-    @Override
+
     public String getButtonName() {
         return buttonName;
     }
diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java
index 9ad9010..5a67461 100644
--- a/src/core/process/C_TeacherSearchStudent.java
+++ b/src/core/process/C_TeacherSearchStudent.java
@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class C_TeacherSearchStudent extends TempProcess  {
+public class C_TeacherSearchStudent {
      String studentId;
 
     protected static String buttonName = "";
@@ -71,22 +71,21 @@ public class C_TeacherSearchStudent extends TempProcess  {
         this.studentId=studentId;
     }
 
-    @Override
     public String getInfo() {
         return info;
     }
 
-    @Override
+
     public String getTargetURL() {
         return targetURL;
     }
 
-    @Override
+
     public String getIconURL() {
         return iconURL;
     }
 
-    @Override
+
     public String getButtonName() {
         return buttonName;
     }
diff --git a/src/core/process/Process.java b/src/core/process/Process.java
index d7ff13d..628e940 100644
--- a/src/core/process/Process.java
+++ b/src/core/process/Process.java
@@ -9,6 +9,8 @@ public abstract class Process{
     private String permission;
     private Operation operation;
 
+    public abstract String getJspURL();
+
 
     protected abstract boolean check();
     public String getPermission() {
diff --git a/web/home/home.jsp b/web/home/home.jsp
index f270357..bd69845 100644
--- a/web/home/home.jsp
+++ b/web/home/home.jsp
@@ -2,7 +2,8 @@
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="core.user.User" %>
 <%@ page import="core.process.Condition" %>
-<%@ page import="core.process.Process" %><%--
+<%@ page import="core.process.Process" %>
+<%@ page import="core.process.C_FillInformation" %><%--
   Created by IntelliJ IDEA.
   User: lenovo
   Date: 2019/1/9
@@ -92,7 +93,7 @@
                 </div>
                 <c:forEach items="${list}">
                     <div class="a-process">
-                        <a href="<!%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
+                        <a href="<%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
                             <div class="a-process-decoration">
                                 <img src=<%=condition.get(num).getIconURL()%>>
                             </div>