Merge remote-tracking branch 'origin/master'

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -3,21 +3,17 @@ package com.tiptimes.ctrl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tiptimes.model.*;
-
 import com.tiptimes.model.YearId;
 import com.tiptimes.service.FileService;
 import com.tiptimes.service.QuestionnaireService;
 import com.tiptimes.util.*;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -114,10 +110,10 @@ public class QuestionnaireCtrl {
         if (record.getReviews() != null) {
             //1.通过记录id删除原有备注
             this.questionnaireService.delView(record.getReviews().get(0).getRecordId(), record.getReviews().get(0).getQuestionsId());
+
             //2.添加新的备注
             result = this.questionnaireService.insertReview(record.getReviews(), record.getReviews().get(0).getRecordId());
 
-
             //更新t_answer表里的分数字段，用户绩效统计使用
             Answer answer = new Answer();
             answer.setScore(record.getReviews().get(0).getScore());
@@ -243,7 +239,6 @@ public class QuestionnaireCtrl {
 
             map_temp_i.put("createBy", educationQuestionnaireInformation_list_i.getCreateBy());
 
-//                map_temp_i.put("createTime" ,educationQuestionnaireInformation_list_i.getCreateTime());
 
             if (educationQuestionnaireInformation_list_i.getWritePeople().equals("")) {
                 map_temp_i.put("writePeople", "暂无");

src/main/webapp/WEB-INF/page/education/index.jsp

@@ -168,14 +168,14 @@
 						class="nav-label">绩效评估</span> <span class="fa arrow"></span>
 				</a>
 					<ul class="nav nav-second-level">
+<%--						<li><a class="J_menuItem"--%>
+<%--							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Information_list">2022年前天津市高校众创空间绩效评估</a></li>--%>
+<%--						<li><a class="J_menuItem"--%>
+<%--							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_list">2022年前天津市高校众创空间绩效汇总</a></li>--%>
 						<li><a class="J_menuItem"
-							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Information_list">2022年前天津市高校众创空间绩效评估</a></li>
-						<li><a class="J_menuItem"
-							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_list">2022年前天津市高校众创空间绩效汇总</a></li>
-						<li><a class="J_menuItem"
-							   href="<%=request.getContextPath()%>/goto/education/questionnaier_Information_new">2022年后天津市高校众创空间绩效评估</a></li>
+							   href="<%=request.getContextPath()%>/goto/education/questionnaier_Information_new">天津市高校众创空间绩效评估</a></li>
 						<li><a class="J_menuItem"
-							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_new">2022年后天津市高校众创空间绩效汇总</a></li>
+							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_new">天津市高校众创空间绩效汇总</a></li>
 <%--						<li><a class="J_menuItem"--%>
 <%--							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_Tnew">2022年后天津市高校众创空间绩效汇总(用户登录应显示页面)</a></li>--%>
 					</ul></li>