update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/TrialLibraryDao.java

@@ -50,7 +50,7 @@ public interface TrialLibraryDao extends JpaRepository<TrialLibrary, Integer>, J
             Integer groupNumber, Integer markerId, Pageable page);
 
     @Query("select l from TrialLibrary l where l.examId=?1 and l.subjectCode=?2 and l.groupNumber=?3 "
-            + "and l.markerId=?4 and l.secretNumber=?5 and l.markerScore!=-1  ")
+            + "and l.markerId=?4 and l.secretNumber like ?5 and l.markerScore!=-1  ")
     List<TrialLibrary> findByExamIdAndSubjectCodeAndGroupNumberAndMarkerIdAndSecretNumber(Integer examId,
             String subjectCode, Integer groupNumber, Integer markerId, String secretNumber, Pageable query);
 

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

@@ -84,8 +84,10 @@ public class RejectController extends BaseExamController {
                 library.setMarkerLoginName(user.getLoginName() + "/" + user.getName());
             }
             RejectHistory h = historyService.findLastByLibraryId(library.getId());
-            User header = userService.findById(h.getUserId());
-            library.setHeaderLoginName(header.getLoginName() + "/" + header.getName());
+            if (h != null) {
+                User header = userService.findById(h.getUserId());
+                library.setHeaderLoginName(header.getLoginName() + "/" + header.getName());
+            }
             library.setSubject(subjectService.find(examId, library.getSubjectCode()));
             MarkGroup group = groupService.findOne(examId, library.getSubjectCode(), library.getGroupNumber());
             group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -166,6 +166,7 @@ public class MarkController extends BaseController {
             return modelAndView;
         }
         current.setName(user.getName());
+        current.setEmpno(user.getEmpno());
         current.setPassword(EncryptUtils.md5(user.getPassword()));
         current.setRandomPassword(null);
         current.setLastLoginIp(RequestIPUtil.getIpAddress(request));
@@ -601,6 +602,9 @@ public class MarkController extends BaseController {
             if (StringUtils.isNotBlank(secretNumber)) {
                 historyList = trialService.findHistory(marker.getExamId(), marker.getSubjectCode(),
                         marker.getGroupNumber(), marker.getId(), secretNumber, pageNumber, pageSize, querySort);
+            } else if (markerScore != null) {
+                historyList = trialService.findHistory(marker.getExamId(), marker.getSubjectCode(),
+                        marker.getGroupNumber(), marker.getId(), pageNumber, pageSize, querySort, markerScore);
             } else {
                 historyList = trialService.findHistory(marker.getExamId(), marker.getSubjectCode(),
                         marker.getGroupNumber(), marker.getId(), pageNumber, pageSize, querySort, null);

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

@@ -145,7 +145,7 @@
                                     
                                     <c:if test="${web_user.subjectHeader==true}">
                                         <li><a href="${ctx}/admin/exam/mark" target="mainFrame"><i class="icon-pencil"></i><span data-i18n-text="index.mark">评卷管理</span></a></li>
-                                        <li><a href="${ctx}/admin/exam/reject/list" target="mainFrame"><i class="fa-undo"></i><span data-i18n-text="index.reject">打回试卷</span></a></li>
+                                        <li><a href="${ctx}/admin/exam/reject/list" target="mainFrame"><i class="icon-bookmark"></i><span data-i18n-text="index.reject">打回试卷</span></a></li>
                                         <li><a href="${ctx}/admin/exam/problem/history" target="mainFrame"><i class="icon-tag"></i><span data-i18n-text="index.problem">问题试卷</span></a></li>
                                         <li><a href="${ctx}/admin/exam/inspected/info" target="mainFrame"><i class="icon-flag"></i><span data-i18n-text="index.inspected">成绩复核</span></a></li>
                                         <c:if test="${forbiddenScore!=true}">

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/reset.jsp

@@ -85,7 +85,7 @@
                         <input type="text" class="form-control required" id="empno" name="empno" placeholder="请输入工号" autocomplete="off"/>
                     </div>
                     <div class="input-group">
-                        <input type="password" class="form-control required" id="password" name="password" placeholder="请输入密码" autocomplete="off" data-i18n-placeholder="user.reset.password"/>
+                        <input type="password" class="form-control required" id="password" name="password" placeholder="请输入4位以上新密码" autocomplete="off" data-i18n-placeholder="user.reset.password"/>
                     </div>
                     <div class="input-group">
                         <input type="password" class="form-control required" id=password2 name="password2" placeholder="再次输入密码" autocomplete="off" data-i18n-placeholder="user.reset.password.again"/>

stmms-web/src/main/webapp/static/common/login.css

@@ -108,7 +108,7 @@ input {
 	float: left;
 	width: 100%;
 	height: 540px;
-	padding: 90px 130px;
+	padding: 45px 130px;
 }
 /*title*/
 .title h1 {

stmms-web/src/main/webapp/static/i18n/messages.properties

@@ -18,7 +18,7 @@ user.reset.submit=\u786e\u5b9a
 user.reset.logout=\u9000\u51fa
 user.reset.title=\u9996\u6b21\u767b\u5f55\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
 user.reset.name=\u8f93\u5165\u59d3\u540d
-user.reset.password=\u8f93\u5165\u65b0\u5bc6\u7801
+user.reset.password=\u8f93\u51654\u4f4d\u4ee5\u4e0a\u65b0\u5bc6\u7801
 user.reset.password.again=\u518d\u6b21\u8f93\u5165\u65b0\u5bc6\u7801
 user.reset.name.length=\u957f\u5ea6\u4e0d\u80fd\u8d85\u8fc710\u4e2a\u5b57
 user.reset.name.chinese=\u8bf7\u8f93\u5165\u4e2d\u6587

stmms-web/src/main/webapp/static/i18n/messages_en.properties

@@ -18,7 +18,7 @@ user.reset.submit=Submit
 user.reset.logout=Logout
 user.reset.title=Supplement personal information
 user.reset.name=press your name
-user.reset.password=press new password
+user.reset.password=press new password more than 4 word
 user.reset.password.again=press new password again
 user.reset.name.length=length cannot exceed 10 words
 user.reset.name.chinese=\u8bf7\u8f93\u5165\u4e2d\u6587

stmms-web/src/main/webapp/static/i18n/messages_zh.properties

@@ -18,7 +18,7 @@ user.reset.submit=\u786e\u5b9a
 user.reset.logout=\u9000\u51fa
 user.reset.title=\u9996\u6b21\u767b\u5f55\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
 user.reset.name=\u8f93\u5165\u59d3\u540d
-user.reset.password=\u8f93\u5165\u65b0\u5bc6\u7801
+user.reset.password=\u8f93\u51654\u4f4d\u4ee5\u4e0a\u65b0\u5bc6\u7801
 user.reset.password.again=\u518d\u6b21\u8f93\u5165\u65b0\u5bc6\u7801
 user.reset.name.length=\u957f\u5ea6\u4e0d\u80fd\u8d85\u8fc710\u4e2a\u5b57
 user.reset.name.chinese=\u8bf7\u8f93\u5165\u4e2d\u6587