fixbugs

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

@@ -1121,7 +1121,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
 
     @Override
     public Set<String> findSubjectUnInspectedByExamId(int examId) {
-        return studentDao.findSubjectUnInspectedByExamId(examId, SubjectiveStatus.UNMARK, SubjectiveStatus.MARKED);
+        return studentDao.findSubjectUnInspectedByExamId(examId, SubjectiveStatus.MARKED);
     }
 
     @Override

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

@@ -32,7 +32,7 @@ public interface UserService {
 
     void batchSaveMarker(int examId, Set<String> subjectCodes, Integer number, String password);
 
-    void batchSaveSubjectUser(int examId, Role role, Set<String> subjectCodes, Integer number);
+    void batchSaveSubjectUser(int examId, Role role, Set<String> subjectCodes, Integer number, String password);
 
     public int findMaxNumberByLoginNameStart(String prefix);
 

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

@@ -265,7 +265,6 @@ public class UserServiceImpl implements UserService {
                     user = new User();
                     user.setLoginName(loginName);
                     user.setName(loginName);
-                    user.setPassword(EncryptUtils.md5(USER_PASSWORD));
                     user.setRole(Role.MARKER);
                     user.setSource(UserSource.INTERNAL);
                     user.setEnable(true);
@@ -273,6 +272,8 @@ public class UserServiceImpl implements UserService {
                     user.setCreatedTime(new Date());
                     if (StringUtils.isNotBlank(password)) {
                         user.setPassword(EncryptUtils.md5(password));
+                    } else {
+                        user.setPassword(EncryptUtils.md5(USER_PASSWORD));
                     }
                     userDao.save(user);
                     Marker marker = new Marker();
@@ -291,20 +292,20 @@ public class UserServiceImpl implements UserService {
 
     @Transactional
     @Override
-    public void batchSaveSubjectUser(int examId, Role role, Set<String> subjectCodes, Integer number) {
+    public void batchSaveSubjectUser(int examId, Role role, Set<String> subjectCodes, Integer number, String password) {
         if (subjectCodes.size() == 0) {
             List<ExamSubject> subjects = subjectService.list(examId);
             for (ExamSubject subject : subjects) {
-                saveSubjectUserBySubject(examId, number, role, subject.getCode());
+                saveSubjectUserBySubject(examId, number, role, subject.getCode(), password);
             }
         } else {
             for (String subjectCode : subjectCodes) {
-                saveSubjectUserBySubject(examId, number, role, subjectCode);
+                saveSubjectUserBySubject(examId, number, role, subjectCode, password);
             }
         }
     }
 
-    private void saveSubjectUserBySubject(int examId, Integer number, Role role, String subjectCode) {
+    private void saveSubjectUserBySubject(int examId, Integer number, Role role, String subjectCode, String password) {
         Exam exam = examService.findById(examId);
         List<SubjectUser> saveList = new ArrayList<SubjectUser>();
         int createNumber = 1;
@@ -320,7 +321,11 @@ public class UserServiceImpl implements UserService {
                 user = new User();
                 user.setLoginName(loginName);
                 user.setName(loginName);
-                user.setPassword(EncryptUtils.md5(USER_PASSWORD));
+                if (StringUtils.isNotBlank(password)) {
+                    user.setPassword(EncryptUtils.md5(password));
+                } else {
+                    user.setPassword(EncryptUtils.md5(USER_PASSWORD));
+                }
                 user.setRole(role);
                 user.setSource(UserSource.INTERNAL);
                 user.setEnable(true);

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

@@ -390,7 +390,7 @@ public class UserController extends BaseExamController {
         if (Role.MARKER.equals(role)) {
             userService.batchSaveMarker(examId, getSubjectCodeSet(subjectCodeString), number, password);
         } else {
-            userService.batchSaveSubjectUser(examId, role, getSubjectCodeSet(subjectCodeString), number);
+            userService.batchSaveSubjectUser(examId, role, getSubjectCodeSet(subjectCodeString), number, password);
         }
         return "redirect:/admin/user/list";
     }

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

@@ -63,7 +63,7 @@
     <div class="control-group">
         <label class="control-label">考试名称</label>
         <div class="controls">
-            <form:input path="name" htmlEscape="false" maxlength="200" class="required"/>
+            <form:input path="name" htmlEscape="false" maxlength="63" class="required"/>
         </div>
     </div>
     <div class="control-group">
@@ -190,7 +190,7 @@
     <div class="control-group">
         <label class="control-label">描述</label>
         <div class="controls">
-            <form:textarea path="description" htmlEscape="false" rows="4" maxlength="200" class="input-xxlarge"/>
+            <form:textarea path="description" htmlEscape="false" rows="4" maxlength="127" class="input-xxlarge"/>
         </div>
     </div>
     <div class="form-actions">

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

@@ -60,7 +60,7 @@
     <div class="control-group">
         <label class="control-label">考试名称</label>
         <div class="controls">
-            <form:input path="name" htmlEscape="false" maxlength="200" class="required"/>
+            <form:input path="name" htmlEscape="false" maxlength="63" class="required"/>
         </div>
     </div>
     <div class="control-group">
@@ -177,7 +177,7 @@
     <div class="control-group">
         <label class="control-label">描述</label>
         <div class="controls">
-            <form:textarea path="description" htmlEscape="false" rows="4" maxlength="200" class="input-xxlarge"/>
+            <form:textarea path="description" htmlEscape="false" rows="4" maxlength="127" class="input-xxlarge"/>
         </div>
     </div>
     <div class="form-actions">

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

@@ -64,10 +64,10 @@
     <div class="middle cl">
         <div class="left">
             <%-- <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> --%>
-            <p>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright&#169 2021 启明泰和 v1.3.8</p></a>
-            <a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
-            </p>
+             <p>
+				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v1.3.8</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/exam/libraryList.jsp

@@ -358,7 +358,7 @@
         $('.rejectWindow').hide();
     });
     $('.task-btn').click(function () {
-        var rejectReason =$("input[name='rejectReasonSelect']").val();
+        var rejectReason =$("input[name='rejectReasonSelect']:checked").val();
         var rejectReasonInput = $('#rejectReasonInput').val();
         var rejectId=$("#rejectId").val();
         if(rejectReasonInput!="" ||rejectReasonInput!=null){

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

@@ -68,7 +68,7 @@
     <div class="middle cl">
         <div class="left">
             <%-- <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.8</p></a>
+            <a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)"><p>Copyright &#169 2021 启明泰和 v1.3.8</p></a>
         </div>
         <div class="right">
             <div class="title">

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

@@ -101,10 +101,10 @@
     <div class="middle cl">
         <div class="left">
             <%-- <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> --%>
-            <p>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright&#169 2021 启明泰和 v1.3.8</p></a>
-            <a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
-            </p>
+             <p>
+				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v1.3.8</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/sys/reset.jsp

@@ -68,10 +68,10 @@
     <div class="middle cl">
         <div class="left">
             <%-- <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> --%>
-            <p>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright&#169 2021 启明泰和 v1.3.8</p></a>
-            <a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
-            </p>
+             <p>
+				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v1.3.8</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/sys/schoolAdminEdit.jsp

@@ -48,25 +48,25 @@
 		<div class="control-group">
 			<label class="control-label">帐号</label>
 			<div class="controls">
-				<form:input path="loginName" htmlEscape="false" maxlength="200" class="required"/>
+				<form:input path="loginName" htmlEscape="false" maxlength="63" class="required"/>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">名称</label>
 			<div class="controls">
-				<form:input path="name" htmlEscape="false" maxlength="200" class="required"/>
+				<form:input path="name" htmlEscape="false" maxlength="63" class="required"/>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">密码</label>
 			<div class="controls">
-				<input type="password" name="password" id="password-input"/>
+				<input type="password" name="password" id="password-input" maxlength="128"/>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">重复输入</label>
 			<div class="controls">
-				<input type="password" id="password2-input"/>
+				<input type="password" id="password2-input" maxlength="128"/>
 			</div>
 		</div>
 		<div class="form-actions">

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

@@ -33,7 +33,7 @@
     <div class="control-group">
         <label class="control-label">名称</label>
         <div class="controls">
-            <form:input path="name" htmlEscape="false" maxlength="200" class="required"/>
+            <form:input path="name" htmlEscape="false" maxlength="63" class="required"/>
         </div>
     </div>
     <div class="control-group">