1
0
ting.yin 6 жил өмнө
parent
commit
ef86e41517

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

@@ -4,6 +4,7 @@ import java.sql.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -27,6 +28,7 @@ import cn.com.qmth.stmms.biz.exam.dao.MarkerDao;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
+import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
 import cn.com.qmth.stmms.biz.mark.dao.MarkLibraryDao;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
@@ -39,6 +41,9 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
 
     @Autowired
     private MarkLibraryDao libraryDao;
+    
+    @Autowired
+    private ExamSubjectService subjectService;
 
     @Transactional
     @Override
@@ -171,6 +176,10 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
                 if (save(marker) != null) {
                     result++;
                 }
+                Set<Marker> markers = subject.getMarkers();
+                markers.add(marker);
+                subject.setMarkers(markers);
+                subjectService.save(subject);
             }
         }
         return result;

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/parameter/ExamMarkerController.java

@@ -198,7 +198,7 @@ public class ExamMarkerController extends BaseParameterController {
     public String createInit(Model model, HttpServletRequest request) {
         int examId = getSessionExamId(request);
         if (examId > 0) {
-//            model.addAttribute("subjectList", getMarkExamSubject(examId));
+            model.addAttribute("subjectList", getMarkExamSubject(examId));
             return "modules/exam/param/markerCreate";
         } else {
             return "redirect:/admin/exam/list";

+ 8 - 8
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/param/markerCreate.jsp

@@ -34,15 +34,15 @@
 	</ul><br/>
 	<form id="inputForm" action="${ctx}/admin/exam-param/marker/batch-create" method="post" class="form-horizontal">
 		<tags:message content="${message}"/>
-<!-- 		<div class="control-group"> -->
-<!-- 			<label class="control-label">帐号类型</label> -->
-<!-- 			<div class="controls"> -->
-<!-- 				<select id="common" name="common"> -->
+		<div class="control-group">
+			<label class="control-label">帐号类型</label>
+			<div class="controls">
+				<select id="common" name="common">
 <!-- 					<option value="true">不限科目</option> -->
-<!-- 					<option value="false">绑定科目</option> -->
-<!-- 				</select> -->
-<!-- 			</div> -->
-<!-- 		</div> -->
+					<option value="false">绑定科目</option>
+				</select>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label">科目选择</label>
 			<div class="controls">

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/param/markerList.jsp

@@ -116,8 +116,8 @@
 			
 			&nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
-			<c:if test="${showBtnImport}">
 				&nbsp;<input id="btnImport" class="btn" type="button" value="导入"/>
+			<c:if test="${showBtnImport}">
 				&nbsp;<input id="btnUpdateImport" class="btn" type="button" value="批量修改评卷员账号"/>
 			</c:if>
 			&nbsp;