返回到上一页，新增用户导出，页面数量改为20，修复一些bug

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/common/BaseQuery.java

@@ -11,7 +11,7 @@ public class BaseQuery<T> implements Pageable {
 
     private int pageNumber = 1;
 
-    private int pageSize = 10;
+    private int pageSize = 20;
 
     private Sort sort;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/common/BaseQueryService.java

@@ -9,7 +9,7 @@ public class BaseQueryService<T> {
             query.setPageNumber(1);
         }
         if (query.getPageSize() < 1) {
-            query.setPageSize(10);
+            query.setPageSize(20);
         }
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/query/MarkerSearchQuery.java

@@ -16,14 +16,8 @@ public class MarkerSearchQuery extends BaseQuery<Marker> {
 
     private Integer groupNumber;
 
-    private Integer userId;
-
     private String loginName;
 
-    public void orderByUserId() {
-        setSort(new Sort(Direction.ASC, "userId"));
-    }
-
     public void orderById() {
         setSort(new Sort(Direction.ASC, "id"));
     }
@@ -60,14 +54,6 @@ public class MarkerSearchQuery extends BaseQuery<Marker> {
         this.groupNumber = groupNumber;
     }
 
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
     public String getLoginName() {
         return loginName;
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -55,7 +55,6 @@ import cn.com.qmth.stmms.biz.utils.PictureConfigTransform;
 import cn.com.qmth.stmms.biz.utils.PictureTag;
 import cn.com.qmth.stmms.biz.utils.ScoreItem;
 import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
-import cn.com.qmth.stmms.common.utils.BigDecimalUtils;
 
 @Service
 public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implements ExamStudentService {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerServiceImpl.java

@@ -1,5 +1,22 @@
 package cn.com.qmth.stmms.biz.exam.service.impl;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import cn.com.qmth.stmms.biz.common.BaseQueryService;
 import cn.com.qmth.stmms.biz.exam.dao.MarkerDao;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
@@ -8,26 +25,11 @@ import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
 import cn.com.qmth.stmms.biz.mark.dao.MarkLibraryDao;
+import cn.com.qmth.stmms.biz.user.dao.UserDao;
+import cn.com.qmth.stmms.biz.user.model.User;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
 import cn.com.qmth.stmms.common.enums.MarkStatus;
 
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
 @Service("markerService")
 public class MarkerServiceImpl extends BaseQueryService<Marker> implements MarkerService {
 
@@ -40,6 +42,9 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
     @Autowired
     private MarkGroupService groupService;
 
+    @Autowired
+    private UserDao userDao;
+
     @Transactional
     @Override
     public Marker save(Marker marker) {
@@ -127,8 +132,13 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
                 if (query.getGroupNumber() != null) {
                     predicates.add(cb.equal(root.get("groupNumber"), query.getGroupNumber()));
                 }
-                if (query.getUserId() != null) {
-                    predicates.add(cb.equal(root.get("userId"), query.getUserId()));
+                if (StringUtils.isNotBlank(query.getLoginName())) {
+                    List<User> users = userDao.findStartWithLoginName(query.getLoginName());
+                    List<Integer> list = new ArrayList<Integer>();
+                    for (User user : users) {
+                        list.add(user.getId());
+                    }
+                    predicates.add(root.get("userId").in(list));
                 }
                 return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
                         .size()]));

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/dao/UserDao.java

@@ -1,6 +1,9 @@
 package cn.com.qmth.stmms.biz.user.dao;
 
+import java.util.List;
+
 import cn.com.qmth.stmms.biz.user.model.User;
+
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
@@ -13,4 +16,7 @@ public interface UserDao extends PagingAndSortingRepository<User, Integer>, JpaS
 
     @Query(value = "select u from User u where u.id=(select m.userId from Marker m where m.id=?1)")
     User findByMarkerId(Integer markerId);
+
+    @Query(value = "select u from User u where u.loginName like ?1" + "%")
+    List<User> findStartWithLoginName(String loginName);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/model/User.java

@@ -1,10 +1,12 @@
 package cn.com.qmth.stmms.biz.user.model;
 
+import cn.com.qmth.stmms.common.annotation.ExcelField;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.enums.UserSource;
 import cn.com.qmth.stmms.common.utils.AccessControlUtils;
 
 import javax.persistence.*;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -26,12 +28,14 @@ public class User implements Serializable {
     /**
      * 登录名
      */
+    @ExcelField(title = "登录名", align = 2, sort = 10)
     @Column(name = "login_name", length = 64, nullable = false)
     private String loginName;
 
     /**
      * 名称
      */
+    @ExcelField(title = "名称", align = 2, sort = 20)
     @Column(name = "name", length = 64, nullable = false)
     private String name;
 
@@ -103,6 +107,10 @@ public class User implements Serializable {
     @Column(name = "access_token_refresh_time", nullable = true)
     private Date accessTokenRefreshTime;
 
+    @ExcelField(title = "角色", align = 2, sort = 30)
+    @Transient
+    private String roleName;
+
     public Integer getId() {
         return id;
     }
@@ -223,4 +231,12 @@ public class User implements Serializable {
     public String getAccount() {
         return source == UserSource.INTERNAL ? loginName : relatedAccount;
     }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/impl/UserServiceImpl.java

@@ -98,7 +98,7 @@ public class UserServiceImpl implements UserService {
             query.setPageNumber(1);
         }
         if (query.getPageSize() < 1) {
-            query.setPageSize(10);
+            query.setPageSize(20);
         }
 
         Page<User> result = userDao.findAll(new Specification<User>() {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/AnswerCheckController.java

@@ -156,7 +156,7 @@ public class AnswerCheckController extends BaseExamController {
                 obj.accumulate("subNumber", i + 1);
                 obj.accumulate("answer", answers.get(i));
                 obj.accumulate("exist", true);
-                obj.accumulate("multi", true);
+                obj.accumulate("multi", questions.get(i).getAnswer().length() > 1);
                 array.add(obj);
             }
             titles.put(1, "客观题");

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkGroupController.java

@@ -59,7 +59,6 @@ import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.enums.ScorePolicy;
 import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
 import cn.com.qmth.stmms.common.enums.ThirdPolicy;
-import cn.com.qmth.stmms.common.utils.BigDecimalUtils;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkerController.java

@@ -97,10 +97,6 @@ public class MarkerController extends BaseExamController {
         int examId = getSessionExamId(request);
         query.setExamId(examId);
         query.orderById();
-        if (StringUtils.isNotBlank(query.getLoginName())) {
-            User user = userService.findByLoginName(query.getLoginName());
-            query.setUserId(user != null && user.getSchoolId().equals(wu.getUser().getSchoolId()) ? user.getId() : null);
-        }
         query = markerService.findByQuery(query);
         for (Marker marker : query.getResult()) {
             marker.setSubject(subjectService.find(marker.getExamId(), marker.getSubjectCode()));

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -1,17 +1,11 @@
 package cn.com.qmth.stmms.admin.user;
 
-import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
-import cn.com.qmth.stmms.biz.user.model.User;
-import cn.com.qmth.stmms.biz.user.service.UserService;
-import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
-import cn.com.qmth.stmms.common.annotation.Logging;
-import cn.com.qmth.stmms.common.annotation.RoleRequire;
-import cn.com.qmth.stmms.common.controller.BaseController;
-import cn.com.qmth.stmms.common.enums.LogType;
-import cn.com.qmth.stmms.common.enums.Role;
-import cn.com.qmth.stmms.common.enums.UserSource;
-import cn.com.qmth.stmms.common.utils.EncryptUtils;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -22,16 +16,25 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import cn.com.qmth.stmms.admin.exam.BaseExamController;
+import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
+import cn.com.qmth.stmms.biz.user.model.User;
+import cn.com.qmth.stmms.biz.user.service.UserService;
+import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
+import cn.com.qmth.stmms.common.annotation.Logging;
+import cn.com.qmth.stmms.common.annotation.RoleRequire;
+import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.enums.Role;
+import cn.com.qmth.stmms.common.enums.UserSource;
+import cn.com.qmth.stmms.common.utils.EncryptUtils;
+import cn.com.qmth.stmms.common.utils.ExportExcel;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 @Controller
 @RequestMapping("/admin/user")
-public class UserController extends BaseController {
+public class UserController extends BaseExamController {
 
     public static final String SUBJECT_CODE_SPLIT = ",";
 
@@ -175,4 +178,26 @@ public class UserController extends BaseController {
         }
         return set;
     }
+
+    @Logging(menu = "导出用户", type = LogType.EXPORT)
+    @RequestMapping(value = "/export", method = RequestMethod.POST)
+    public String exportFile(UserSearchQuery query, HttpServletRequest request, HttpServletResponse response,
+            RedirectAttributes redirectAttributes) {
+        try {
+            User user = RequestUtils.getWebUser(request).getUser();
+            query.setSchoolId(user.getSchoolId());
+            query.setPageNumber(1);
+            query.setPageSize(Integer.MAX_VALUE);
+            query = userService.findByQuery(query);
+            for (User s : query.getResult()) {
+                s.setRoleName(s.getRole().getName());
+            }
+            String fileName = "用户数据.xlsx";
+            new ExportExcel("用户数据", User.class).setDataList(query.getResult()).write(response, fileName).dispose();
+            return null;
+        } catch (Exception e) {
+            addMessage(redirectAttributes, "导出考生数据失败！" + e.getMessage());
+        }
+        return "redirect:/admin/exam/student";
+    }
 }

stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

@@ -124,7 +124,7 @@ public class LoginController {
                 return new ModelAndView("redirect:/mark/reset");
             }
             u.setLastLoginTime(new Date());
-            u.setLastLoginIp(request.getRemoteAddr());
+            u.setLastLoginIp(RequestIPUtil.getIpAddress(request));
             u.refreshAccessToken();
             u = userService.save(u);
             WebUser wu = new WebUser(u);

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/checkAnswerEdit.jsp

@@ -194,7 +194,8 @@
                 dom.find('span.num').html('(' + count[q.mainNumber] + ')');
 
                 q.dom = $('<span class="input"><em>' + q.subNumber + '</em><input type="text" value="' + q.answer + '" number="' + i + '"/></span>').appendTo(dom.find('dd'));
-                if (title.indexOf('多项选择') >= 0 || title.indexOf('多选') >= 0) {
+                /* if (title.indexOf('多项选择') >= 0 || title.indexOf('多选') >= 0) { */
+                if(q.multi){
                     q.dom.find('input').addClass('large');
                 }
                 q.dom.find('input').on('input', onAnswerInput);

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/dataSync.jsp

@@ -132,7 +132,7 @@
 			</c:if>
 			
 			&nbsp;
-			<a href="${ctx}/admin/exam/list" class="btn"/>返回</a>
+			<a href="javascript:" onclick="history.go(-1);" class="btn"/>返回</a>
 		</div>
 	</form:form>
 </body>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examEdit.jsp

@@ -184,7 +184,7 @@
     <div class="form-actions">
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
         &nbsp;
-        <a href="${ctx}/admin/exam/list" class="btn">返回</a>
+        <a href="javascript:" onclick="history.go(-1);"  class="btn">返回</a>
     </div>
 </form:form>
 </body>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examForm.jsp

@@ -171,7 +171,7 @@
     <div class="form-actions">
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
         &nbsp;
-        <a href="${ctx}/admin/exam/list" class="btn">返回</a>
+        <a href="javascript:" onclick="history.go(-1);" class="btn">返回</a>
     </div>
 </form:form>
 </body>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupAdd.jsp

@@ -119,7 +119,7 @@
         </div>
     </div>
     </c:if>
-    <c:if test="${examType!='MULTI_MEDIA'}">
+    <c:if test="${exam.type!='MULTI_MEDIA' && exam.markMode!='TRACK'}">
 	    <div class="control-group">
 	        <label class="control-label">评卷模式</label>
 	        <div class="controls">

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupEditFull.jsp

@@ -141,7 +141,7 @@
             </select>
         </div>
     </div>
-    <c:if test="${examType!='MULTI_MEDIA'}">
+    <c:if test="${exam.type!='MULTI_MEDIA'}">
         <div class="control-group">
             <label class="control-label">图片显示</label>
             <div class="controls">

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupEditSimple.jsp

@@ -98,7 +98,7 @@
             </select>
         </div>
     </div>
-    <c:if test="${examType!='MULTI_MEDIA'}">
+    <c:if test="${exam.type!='MULTI_MEDIA'}">
         <div class="control-group">
             <label class="control-label">图片显示</label>
             <div class="controls">

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/markerAccount.jsp

@@ -37,7 +37,7 @@
             <a href="##" id="unbind-button" class="btn btn-warning">解绑</a>
         </c:if>
         &nbsp;&nbsp;
-        <a href="${ctx}/admin/exam/marker?subjectCode=${marker.subjectCode}&groupNumber=${marker.groupNumber}" class="btn">返回</a>
+        <a href="javascript:" onclick="history.go(-1);"  class="btn">返回</a>
     </div>
 </form>
 

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/markerClass.jsp

@@ -29,7 +29,7 @@
 		<div class="form-actions">
 			<a href="${ctx}/admin/exam/marker/class/delete?markerId=${marker.id}" class="btn btn-primary"/>清空全部</a>
 			&nbsp;
-			<a href="${ctx}/admin/exam/marker?subjectCode=${marker.subjectCode}&groupNumber=${marker.groupNumber}" class="btn"/>返回</a>
+			<a href="javascript:" onclick="history.go(-1);"  class="btn"/>返回</a>
 		</div>
 	</form:form>
 </body>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/paperDetail.jsp

@@ -23,7 +23,7 @@
 				<option value="false" <c:if test="${objective!=null && objective==false}">selected</c:if>>主观题</option>
 			</select>
 			&nbsp;		
-			<a class="btn" href="${ctx}/admin/exam/paper">返回</a>
+			<a class="btn" href="javascript:" onclick="history.go(-1);" >返回</a>
 		</div>
 	</form>
 	<tags:message content="${message}"/>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/questionEdit.jsp

@@ -26,7 +26,7 @@
 		<div class="form-actions">
 			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
 			&nbsp;
-			<a href="${ctx}/admin/exam/paper/detail?subjectCode=${examQuestion.subjectCode }" class="btn"/>返回</a>
+			<a href="javascript:" onclick="history.go(-1);"  class="btn"/>返回</a>
 		</div>
 	</form>
 </body>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/selectiveList.jsp

@@ -17,7 +17,7 @@
 			<label>主观总分：<fmt:formatNumber pattern="###.###" value="${subject.subjectiveScore}"/></label>
 			<label>试卷总分：<fmt:formatNumber pattern="###.###" value="${subject.totalScore}"/></label>
 			&nbsp;		
-			<a class="btn" href="${ctx}/admin/exam/paper">返回</a>
+			<a class="btn" href="javascript:" onclick="history.go(-1);" >返回</a>
 			&nbsp;
 			<a href="${ctx}/admin/exam/selectiveGroup/clear?subjectCode=${subject.code}" class="delete-button btn">清空选做题分组设置</a>
 		</div>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentForm.jsp

@@ -65,7 +65,7 @@
     </div>
     <div class="form-actions">
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-        <a href="${ctx}/admin/exam/student" class="btn">返回</a>
+        <a href="javascript:" onclick="history.go(-1);"  class="btn">返回</a>
     </div>
 </form:form>
 <script type="text/javascript">

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentList.jsp

@@ -122,9 +122,9 @@
                 </div>
             </c:if>
         </c:if>
-        <c:if test="${query.totalCount>0 && query.totalCount<=10000}">
+       <%--  <c:if test="${query.totalCount>0 && query.totalCount<=10000}"> --%>
             &nbsp;<input id="export-button" class="btn" type="button" value="导出"/>
-        </c:if>
+      <%--   </c:if> --%>
     </div>
 </form>
 <tags:message content="${message}"/>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/subjectEdit.jsp

@@ -48,7 +48,7 @@
         </div>
 		<div class="form-actions">
 			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
-			<a href="${ctx}/admin/exam/paper" class="btn"/>返回</a>
+			<a href="javascript:" onclick="history.go(-1);" class="btn"/>返回</a>
 		</div>
 	</form:form>
 <script type="text/javascript">

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacherClass.jsp

@@ -27,7 +27,7 @@
      
 	<input id="export-button" class="btn" type="button" value="导出" data-i18n-value="report.teacher.export"/>
 	&nbsp;
-    <a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" class="btn" data-i18n-text="report.teacher.return">返回</a>
+    <a href="javascript:" onclick="history.go(-1);"  class="btn" data-i18n-text="report.teacher.return">返回</a>
 </form>
 <tags:message content="${message}"/>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/login.jsp

@@ -30,10 +30,13 @@
 <div class="container">
     <div class="middle cl">
         <div class="left">
-            <div class="logo"><img
+            <%-- <div class="logo"><img
                     src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/>
-            </div>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169 2021 启明泰和 v1.3.5</p></a>
+            </div> --%>
+            <p>
+				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v1.3.6</a><br/>
+				<a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
+			</p>
         </div>
         <div class="right">
             <div class="title">

stmms-web/src/main/webapp/WEB-INF/views/modules/user/userEdit.jsp

@@ -98,7 +98,7 @@
     <div class="form-actions">
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
         &nbsp;
-        <a href="${ctx}/admin/user/list" class="btn">返回</a>
+        <a href="javascript:" onclick="history.go(-1);"  class="btn">返回</a>
     </div>
 </form:form>
 </body>

stmms-web/src/main/webapp/WEB-INF/views/modules/user/userList.jsp

@@ -91,6 +91,8 @@
             </div>
             &nbsp;
             <input id="btnImportClass" class="btn" type="button" value="导入评卷员班级"/>
+            &nbsp;
+            <input id="export-button" class="btn" type="button" value="导出"/>
         </c:if>
     </div>
 </form>
@@ -137,6 +139,7 @@
     function page(n, s) {
         $("#pageNumber").val(n);
         $("#pageSize").val(s);
+        $("#searchForm").attr("action", "${ctx}/admin/user/list");
         $("#searchForm").submit();
         return false;
     }
@@ -144,6 +147,7 @@
     function goSearch() {
         $("#pageNumber").val(1);
         $("#pageSize").val('${query.pageSize}');
+        $("#searchForm").attr("action", "${ctx}/admin/user/list");
         $("#searchForm").submit();
         return false;
     }
@@ -159,6 +163,10 @@
   	  $.jBox($("#importClassBox").html(), {title:"导入评卷员班级", buttons:{"关闭":true},
   	    bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
   });
+    $("#export-button").click(function () {
+        $("#searchForm").attr("action", "${ctx}/admin/user/export");
+        $("#searchForm").submit();
+    });
 </script>
 </body>
 </html>