处理合并冲突

.idea/codeStyles/Project.xml

+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="SPACE_BEFORE_ANOTATION_PARAMETER_LIST" value="true" />
+      <option name="SPACE_WITHIN_ANNOTATION_PARENTHESES" value="true" />
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file

.idea/codeStyles/codeStyleConfig.xml

+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file

.idea/compiler.xml

@@ -11,6 +11,7 @@
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="rootTwo" target="1.7" />
+      <module name="Tianruan" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file

.idea/misc.xml

@@ -10,7 +10,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file

Tianruan.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

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

@@ -209,6 +209,15 @@ public class GoToCtrl {
         return "/education/questionnaire_information";
     }
 
+    @RequestMapping({"/education/questionnaire_Administration_list"})
+    public String getEducationQuestionnaire_Administration_list(HttpServletRequest request) {
+//        String recordId = request.getParameter("recordId");
+//        request.setAttribute("recordId", recordId);
+//        String processStatus = request.getParameter("processStatus");
+//        request.setAttribute("processStatus", processStatus);
+        return "/education/questionnaire_Administration_list";
+    }
+
     @RequestMapping({"/education/questionnaire_Information_list"})
     public String getEducationQuestionnaire_information_list(HttpServletRequest request) {
         String recordId = request.getParameter("recordId");
@@ -218,6 +227,7 @@ public class GoToCtrl {
         return "/education/questionnaire_Information_list";
     }
 
+
     @RequestMapping({"/space/questionnaire_information"})
     public String getSpaceQuestionnaire_information(HttpServletRequest request) {
         return "/space/questionnaire_information";

src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.metadata.style.WriteFont;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
+//import com.tiptimes.ctrl.ExcelFillCellMergeStrategy;
 import com.tiptimes.ctrl.ExcelFillCellMergeStrategy;
 import com.tiptimes.dao.QuestionnaireDao;
 import com.tiptimes.model.Answer;

src/main/resources/spring-session-redis.xml

@@ -21,7 +21,7 @@
           class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
           p:host-name="localhost"
           p:port="6379"
-          p:use-pool="true"
+          p:use-pool="true" p:password="12345"
           p:database="8" />
 
     <bean id="stringRedisSerializer"

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

@@ -143,7 +143,6 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
                                 </div>
                             </div>
                         </div>
-
                     </div>
                 </div>
             </div>

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

@@ -137,6 +137,7 @@
 					</ul></li>
 				 <li><a href="#" data-toggle="tooltip" data-placement="right" title="站内信息管理"><i class="fa fa-envelope"></i>
 					 <span 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/sitesInfromation_new">新建消息</a></li>
                         <li><a class="J_menuItem" href="<%=request.getContextPath()%>/goto/education/sitesInformation_collection">收件箱</a></li>
@@ -159,18 +160,20 @@
 						<li><a class="J_menuItem"
 							href="<%=request.getContextPath()%>/goto/education/action_log">行为查询</a></li>
 					</ul></li>
+
+
 				<li><a class="J_menuItem" href="<%=request.getContextPath()%>/goto/education/notice" data-index="0" data-toggle="tooltip" data-placement="right" title="公示公告"> <i class="fa fa-commenting"></i> <span class="nav-label">公示公告</span></a></li>
-				<li>
-					<a class="J_menuItem"
-					   href="<%=request.getContextPath()%>/goto/education/questionnaire_Information_list"
-					   data-index="0"
-					   data-toggle="tooltip"
-					   data-placement="right"
-					   title="问卷管理">
-						<i class="fa fa-commenting"></i>
-						<span class="nav-label">评估数据管理</span>
-					</a>
-				</li>
+
+				<li><a href="#" data-toggle="tooltip" data-placement="right" title="绩效评估"> <i class="fa fa fa-commenting"></i><span
+						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">2021年天津市高校众创空间绩效评估</a></li>
+						<li><a class="J_menuItem"
+							   href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_list">天津市高校众创空间绩效汇总</a></li>
+					</ul></li>
+
 				<%--  <li><a class="J_menuItem" href="<%=request.getContextPath()%>/goto/education/space_change_password" data-index="0"> <i class="fa fa-rotate-left"></i> <span class="nav-label">修改密码</span></a></li>
 				<li><a class="J_menuItem" href="<%=request.getContextPath()%>/user/Logout" data-index="0"> <i class="fa fa-power-off"></i> <span class="nav-label">安全退出</span></a></li> --%>
 			</ul>

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

+<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <title>众创空间</title>
+    <link rel="shortcut icon" href="favicon.ico">
+    <link href="<%=request.getContextPath()%>/res/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+    <link href="<%=request.getContextPath()%>/res/css/font-awesome.css?v=4.4.0" rel="stylesheet">
+    <link href="<%=request.getContextPath()%>/res/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
+    <link href="<%=request.getContextPath()%>/res/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
+    <link href="<%=request.getContextPath()%>/res/css/animate.css" rel="stylesheet">
+    <link href="<%=request.getContextPath()%>/res/css/style.css?v=4.1.0" rel="stylesheet">
+    <link href="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.css" rel="stylesheet">
+
+</head>
+<body>
+<script type="text/javascript">
+    var webroot = '<%=request.getContextPath()%>/';
+    var class_id = '<%=(String)request.getParameter("class_id")%>';
+    var className = '<%=(String)request.getParameter("className")%>';
+</script>
+<div class="wrapper wrapper-content animated fadeInRight">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <span style="font-size: 24px;">绩效汇总<span id="material_class_title"></span></span>
+                    <div class="ibox-content">
+                        <div class="form-inline pull-right  ">
+                            <input type="text" id="title" class="form-control" placeholder="众创空间"/>
+                            <button style="margin-top: 5px" class=" btn btn-sm btn-primary  m-t-n-xs"
+                                    onclick="search();">搜 索
+                            </button>
+                            <a onclick="reform_DIV_Export()">
+                                <button style="margin-top: 5px" class=" btn btn-sm btn-primary  m-t-n-xs">导 出</button>
+                            </a>
+                        </div>
+                    </div>
+                    <br>
+                    <br>
+                    <table id="hidden-table-score" width="100%"
+                           class="table table-striped table-bordered table-hover dataTables-example">
+                        <thead>
+                        <tr id="table-head">
+                            <td>序号</td>
+                            <td>众创空间名称</td>
+                            <td>基础指标得分</td>
+                            <td>引导指标得分</td>
+                            <td>奖励指标得分</td>
+                            <td>
+                                <div style="text-align: left;">
+                                    <div style="display: inline-block;padding-bottom: 22px;margin-right: 10px">
+                                        合计得分
+                                    </div>
+                                    <div style="display: inline-block;padding-top: 18px">
+                                        <div onclick="sortAsc()"
+                                             style=" width: 0px;height: 0px; border-bottom: 9px solid black;border-left: 10px solid transparent; border-right: 10px solid transparent;">
+                                        </div>
+                                        <div style="height: 18px"></div>
+                                        <div onclick="sortDesc()"
+                                             style=" width: 0px;height: 0px; border-top: 9px solid black;border-left: 10px solid transparent; border-right: 10px solid transparent;">
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </td>
+                        </tr>
+                        </thead>
+                        <tbody>
+
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 全局js -->
+<script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
+<script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>
+<script src="<%=request.getContextPath()%>/res/js/plugins/jeditable/jquery.jeditable.js"></script>
+<script src="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.js"></script>
+<script src="<%=request.getContextPath()%>/res/js/plugins/sweetalert/sweetalert.min.js"></script>
+<!-- layer javascript -->
+<script src="<%=request.getContextPath()%>/res/js/plugins/layer/layer.min.js"></script>
+<!-- Data Tables -->
+<%--<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/jquery.dataTables.js"></script>--%>
+<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/dataTables.bootstrap.js"></script>
+<!-- 自定义js -->
+<script src="<%=request.getContextPath()%>/res/js/education/questionnaire_Administration_list.js"></script>
+
+</body>
+</html>
+

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

@@ -14,7 +14,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
     <link href="<%=request.getContextPath()%>/res/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
     <link href="<%=request.getContextPath()%>/res/css/font-awesome.css?v=4.4.0" rel="stylesheet">
     <link href="<%=request.getContextPath()%>/res/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
-<link href="<%=request.getContextPath()%>/res/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
+    <link href="<%=request.getContextPath()%>/res/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
     <link href="<%=request.getContextPath()%>/res/css/animate.css" rel="stylesheet">
     <link href="<%=request.getContextPath()%>/res/css/style.css?v=4.1.0" rel="stylesheet">
     <link href="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.css" rel="stylesheet">
@@ -48,11 +48,9 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
                             </select>
                             <input type="text" id="title" class="form-control" placeholder="众创空间" />
                             <button style="margin-top: 5px" class=" btn btn-sm btn-primary  m-t-n-xs" onclick="search();">搜 索</button>
+                            <button style="margin-top: 5px" class=" btn btn-sm btn-primary  m-t-n-xs"  onclick="">导 出</button>
                         </div>
                         <table id="hidden-table-info" width="100%" class="table table-striped table-bordered table-hover dataTables-example"></table>
-
-                        </table>
-
                     </div>
                 </div>
             </div>

src/main/webapp/res/css/style.css

@@ -4034,6 +4034,20 @@ code {
     min-height: 48px;
 }
 
+.ibox-titlesun {
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-top-colors: none;
+    background-color: #ffffff;
+    -webkit-border-image: none;
+    border-width: 4px 0px 0;
+    color: inherit;
+    margin-bottom: 0;
+    padding: 14px 15px 7px;
+    min-height: 48px;
+}
+
 .ibox-content {
     background-color: #ffffff;
     color: inherit;
@@ -4099,7 +4113,7 @@ table.table-mail tr td {
     margin: 0 0 7px;
     padding: 0;
     text-overflow: ellipsis;
-    float: left;
+    /*float: left;*/
 }
 
 .ibox-title .label {
@@ -4109,7 +4123,7 @@ table.table-mail tr td {
 
 .ibox-tools {
     display: inline-block;
-    float: right;
+    /*float: left;*/
     margin-top: 0;
     position: relative;
     padding: 0;

src/main/webapp/res/js/education/questionnaire_Administration_list.js

+$(function () {
+    getTableData()
+})
+
+//降序排列
+function sortDesc() {
+    var sorting='desc'
+    if ($("#title").val().length > 50) {
+        swal("失败！",'输入字符过多!', "error")
+    } else {
+        $.ajax({
+            url: webroot + "questionnaire/selectPerformanceSummaryList",
+            method: "GET",
+            datatype: "json",
+            data: {
+                "optinName": $("#title").val(),
+                "sorting":sorting
+            },
+            success: (res) => {
+                $("tbody").empty()
+                for (let i = 0; i < res.data.performanceSummaryList.length; i++) {
+                    $("tbody").append(
+                        "<tr>" +
+                        "<td>" + (i + 1) + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].optinName + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].basicIndicators + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].guideIndicators + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].rewardIndicators + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].totalScore + "</td>" +
+                        "</tr>"
+                    )
+                }
+
+            },
+            error: () => {
+                swal("失败！",'网络有问题，稍后再试', "error")
+            }
+        })
+    }
+
+}
+
+//升序排列
+function sortAsc() {
+    var sorting='asc'
+    if ($("#title").val().length > 50) {
+        swal("失败！",'输入字符过多', "error")
+    } else {
+        $.ajax({
+            url:webroot + "questionnaire/selectPerformanceSummaryList",
+            method: "GET",
+            datatype: "json",
+            data: {
+                "optinName": $("#title").val(),
+                "sorting":sorting
+            },
+            success: (res) => {
+                $("tbody").empty()
+                for (let i = 0; i < res.data.performanceSummaryList.length; i++) {
+                    $("tbody").append(
+                        "<tr>" +
+                        "<td>" + (i + 1) + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].optinName + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].basicIndicators + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].guideIndicators + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].rewardIndicators + "</td>" +
+                        "<td>" + res.data.performanceSummaryList[i].totalScore + "</td>" +
+                        "</tr>"
+                    )
+                }
+
+            },
+            error: () => {
+                swal("失败！",'网络有问题，稍后再试', "error")
+            }
+        })
+    }
+
+}
+
+
+
+//导出汇总文件
+function reform_DIV_Export() {
+    $.ajax({
+        url: webroot + "questionnaire/exportPerformanceSummary",
+        method: "GET",
+        responseType: "blob",
+        success: (res) => {
+            window.location.href = webroot+"questionnaire/exportPerformanceSummary"
+        },
+        error: () => {
+            swal("失败！",'网络有问题，稍后再试', "error")
+        }
+    })
+}
+
+//搜索标题内容
+function search() {
+    if ($("#title").val().length > 50) {
+        swal("失败！",'输入字符过多', "error")
+    } else {
+        getTableData()
+    }
+}
+
+//获取列表详细信息
+function getTableData() {
+    $.ajax({
+        url: webroot + "questionnaire/selectPerformanceSummaryList",
+        method: "GET",
+        datatype: "json",
+        data:{
+            "optinName": $("#title").val(),
+        },
+        success: (res) => {
+            $("tbody").empty()
+            for (let i = 0; i < res.data.performanceSummaryList.length; i++) {
+                $("tbody").append(
+                    "<tr>" +
+                    "<td>" + (i + 1) + "</td>" +
+                    "<td>" + res.data.performanceSummaryList[i].optinName + "</td>" +
+                    "<td>" + res.data.performanceSummaryList[i].basicIndicators + "</td>" +
+                    "<td>" + res.data.performanceSummaryList[i].guideIndicators + "</td>" +
+                    "<td>" + res.data.performanceSummaryList[i].rewardIndicators + "</td>" +
+                    "<td>" + res.data.performanceSummaryList[i].totalScore + "</td>" +
+                    "</tr>"
+                )
+            }
+
+        },
+        error: () => {
+            swal("失败！",'网络有问题，稍后再试', "error")
+        }
+    })
+
+}
\ No newline at end of file

src/main/webapp/res/js/education/questionnaire_Information_list.js

@@ -9,6 +9,10 @@ function search() {
     var processStatus = $("#processStatus").val();
     searchMessage(title,processStatus);
 }
+
+function sort() {
+
+}
 function searchMessage(title, status) {
 	if (title !== null && title !== '' && status !== null && status !== ''){
 		var url=webroot+"questionnaire/selectRecordList?questionnaireUuid=1&createBy="+title+"&processStatus="+status;
@@ -23,6 +27,19 @@ function searchMessage(title, status) {
 	$('#hidden-table-info').DataTable().ajax.url( url).load();
 }
 
+function reform_DIV_Show(id) {
+	console.log(1);
+	if (id == "0") {
+		$("#Reform_DIV_name").val("");
+		$("#Reform_DIV_account").val("");
+		$("#Reform_DIV_password").val("");
+		$("#Reform_DIV_password2").val("");
+		$("#material_img").val(webroot + "res/image/team.jpg");
+		$("#img").attr('src', webroot + "res/image/team.jpg");
+	}
+	$('#reform_DIV').modal('show');
+}
+
 function testListApi() {
 	var url=webroot+"questionnaire/selectRecordList?questionnaireUuid=1";
 	$(document).ready(function() {