Sfoglia il codice sorgente

屏蔽标记试卷功能模块的打回功能

luoshi 6 anni fa
parent
commit
ca3933a44c

+ 1 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/MarkLibraryDao.java

@@ -19,6 +19,7 @@ import cn.com.qmth.stmms.common.enums.LibraryStatus;
 public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, JpaSpecificationExecutor<MarkLibrary> {
 
     @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("select l from MarkLibrary l where l.id=?1")
     MarkLibrary findByIdForLock(Integer id);
 
     List<MarkLibrary> findByExamId(Integer examId, Pageable page);

+ 0 - 30
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/TagController.java

@@ -12,8 +12,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.qmth.stmms.biz.campus.model.Campus;
 import cn.com.qmth.stmms.biz.campus.service.CampusService;
@@ -23,14 +21,10 @@ import cn.com.qmth.stmms.biz.exam.service.TagService;
 import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
 import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
 import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
-import cn.com.qmth.stmms.biz.mark.service.MarkService;
-import cn.com.qmth.stmms.common.auth.annotation.RoleRequire;
 import cn.com.qmth.stmms.common.domain.WebUser;
-import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.DateUtils;
 import cn.com.qmth.stmms.common.utils.PictureUrlBuilder;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import net.sf.json.JSONObject;
 
 @Controller("tagController")
 @RequestMapping("/admin/exam/tag")
@@ -50,9 +44,6 @@ public class TagController extends BaseExamController {
     @Autowired
     private TagService tagService;
 
-    @Autowired
-    private MarkService markService;
-
     @Value("${sheet.image.server}")
     private String imageServer;
 
@@ -95,27 +86,6 @@ public class TagController extends BaseExamController {
         return "modules/exam/tagInfo";
     }
 
-    @RequestMapping("/back")
-    @ResponseBody
-    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
-    public Object back(HttpServletRequest request, @RequestParam Integer libraryId) {
-        JSONObject result = new JSONObject();
-        MarkLibrary library = libraryService.findById(libraryId);
-        if (library != null) {
-            if (subjectCheck(library.getSubjectCode(), RequestUtils.getWebUser(request))) {
-                markService.backLibrary(library);
-                result.accumulate("success", true);
-            } else {
-                result.accumulate("success", false);
-                result.accumulate("message", "没有操作该评卷任务的权限");
-            }
-        } else {
-            result.accumulate("success", false);
-            result.accumulate("message", "找不到对应的评卷任务");
-        }
-        return result;
-    }
-
     private List<Campus> getTagCampus(int examId) {
         List<Campus> list = new LinkedList<Campus>();
         List<Integer> ids = libraryService.findTagCampusId(examId);

+ 126 - 138
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/tagInfo.jsp

@@ -1,139 +1,127 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
-<html>
-<head>
-	<title>标记试卷处理</title>
-	<meta name="decorator" content="default"/>
-	<%@include file="/WEB-INF/views/include/head.jsp" %>
-	<style type="text/css">.sort{color:#0663A2;cursor:pointer;}</style>
-</head>
-<body>
-	<form id="searchForm" action="${ctx}/admin/exam/tag" method="post" class="breadcrumb form-search">
-		<input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
-		<input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
-		<div>
-			<label>科目</label>
-			<select class="input-large" id="subject-select" name="subjectCode">
-				<option value="">请选择</option>
-				<c:forEach items="${subjectList}" var="subject">
-				<option value="${subject.code}" <c:if test="${subject.code==query.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
-				</c:forEach>
-			</select>
-			<label>大题</label>
-			<select class="input-medium" id="group-select" name="groupNumber">
-				<option value="0">请选择</option>
-			</select>
-			<label>学习中心</label>
-			<select class="input-large" name="campusId">
-				<option value="0">请选择</option>
-				<c:forEach items="${campusList}" var="campus">
-				<option value="${campus.id}" <c:if test="${campus.id==query.campusId}">selected</c:if>>${campus.name}</option>
-				</c:forEach>
-			</select>
-			<label>标记类型</label>
-			<select class="input-medium" name="tagId">
-				<c:forEach items="${tagList}" var="tag">
-				<option value="${tag.id}" <c:if test="${tag.id==query.tagId}">selected</c:if>>${tag.name}</option>
-				</c:forEach>
-			</select>
-			<br/><br/>
-			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
-		</div>
-	</form>
-	<tags:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>科目</th>
-				<th>学习中心</th>
-				<th>准考证号</th>
-				<th>姓名</th>
-				<th>提交时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${resultList}" var="result">
-			<tr>
-				<td>${result.subjectCode}-${result.subjectName}</td>
-				<td>${result.campusName}</td>
-				<td>${result.examNumber}</td>
-				<td>${result.name}</td>
-				<td>${result.markTime}</td>
-				<td>
-					<a class="sheet-link" href="##" data-sheet-url="${result.sheetUrlString}" data-answer-url="<c:if test="${result.answerUrl!=null}">${cardServer}${result.answerUrl}</c:if>" data-title="${result.examNumber}&nbsp;&nbsp;${result.name}&nbsp;&nbsp;客观总分${result.objectiveScoreString}&nbsp;&nbsp;主观总分${result.subjectiveScoreString}&nbsp;&nbsp;全卷总分${result.totalScoreString}">原图</a>
-					<a href="##" class="back-button" data-library-id="${result.libraryId}">打回</a>
-				</td>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${query}</div>
-	<%@include file="/WEB-INF/views/include/imageView.jsp" %>
-<script type="text/javascript">
-var searchSubjectCode = '${query.subjectCode}';
-var searchGroupNumber = '${query.groupNumber}';
-$(document).ready(function() {
-    /* new jBox('Image', {
-    	imageFade: 0,
-    	delayOpen: 0,
-    	delayClose: 0,
-    	maxHeight: $(window).height()*0.88
-    }); */
-    $('.sheet-link').click(function(){
-    	initImagePopover($(this).attr('data-title'), '${imageServer}', $(this).attr('data-sheet-url'), $(this).attr('data-answer-url'));
-    	return false;
-    });
-    $('.back-button').click(function(){
-        if(confirm('确定要打回改试卷?')){  
-        $.post('${ctx}/admin/exam/tag/back', {libraryId: $(this).attr('data-library-id')}, function(result){
-            if(result.success==true){
-            	$("#searchForm").submit();
-            }else{
-                alert(result.message || '提交失败,请稍后重试');
-            }
-        });
-        }
-    });
-
-    $('#subject-select').change(function(){
-        var code = $(this).val();
-        if(code==''){
-            $('#group-select').empty();
-            return;
-        }
-        $.post('${ctx}/admin/exam/group/query', {subjectCode: code}, function(result){
-            var parent = $('#group-select');
-            parent.empty();
-            for(var i=0;i<result.length;i++){
-                var group = result[i];
-                $('<option value="'+group.number+'">'+group.number+'-'+group.title+'</option>').appendTo(parent);
-            }
-            if(searchSubjectCode==code && searchGroupNumber!=''){
-                parent.val(searchGroupNumber);
-            }
-            parent.trigger('change');
-        });
-    });
-    $('#subject-select').trigger('change');
-});
-function page(n,s){
-	$("#pageNumber").val(n);
-	$("#searchForm").attr('action', '${ctx}/admin/exam/tag');
-	$("#searchForm").submit();
-	return false;
-}
-function goSearch(){
-	$("#pageNumber").val(1);
-	$("#searchForm").attr('action', '${ctx}/admin/exam/tag');
-	$("#searchForm").submit();
-	return false;
-}
-function goExport(){
-	$("#searchForm").attr('action', '${ctx}/admin/exam/tag/export');
-	$("#searchForm").submit();
-	return false;
-}
-</script>	
-</body>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>标记试卷处理</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/WEB-INF/views/include/head.jsp" %>
+	<style type="text/css">.sort{color:#0663A2;cursor:pointer;}</style>
+</head>
+<body>
+	<form id="searchForm" action="${ctx}/admin/exam/tag" method="post" class="breadcrumb form-search">
+		<input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
+		<input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
+		<div>
+			<label>科目</label>
+			<select class="input-large" id="subject-select" name="subjectCode">
+				<option value="">请选择</option>
+				<c:forEach items="${subjectList}" var="subject">
+				<option value="${subject.code}" <c:if test="${subject.code==query.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
+				</c:forEach>
+			</select>
+			<label>大题</label>
+			<select class="input-medium" id="group-select" name="groupNumber">
+				<option value="0">请选择</option>
+			</select>
+			<label>学习中心</label>
+			<select class="input-large" name="campusId">
+				<option value="0">请选择</option>
+				<c:forEach items="${campusList}" var="campus">
+				<option value="${campus.id}" <c:if test="${campus.id==query.campusId}">selected</c:if>>${campus.name}</option>
+				</c:forEach>
+			</select>
+			<label>标记类型</label>
+			<select class="input-medium" name="tagId">
+				<c:forEach items="${tagList}" var="tag">
+				<option value="${tag.id}" <c:if test="${tag.id==query.tagId}">selected</c:if>>${tag.name}</option>
+				</c:forEach>
+			</select>
+			<br/><br/>
+			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
+		</div>
+	</form>
+	<tags:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>科目</th>
+				<th>学习中心</th>
+				<th>准考证号</th>
+				<th>姓名</th>
+				<th>提交时间</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${resultList}" var="result">
+			<tr>
+				<td>${result.subjectCode}-${result.subjectName}</td>
+				<td>${result.campusName}</td>
+				<td>${result.examNumber}</td>
+				<td>${result.name}</td>
+				<td>${result.markTime}</td>
+				<td>
+					<a class="sheet-link" href="##" data-sheet-url="${result.sheetUrlString}" data-answer-url="<c:if test="${result.answerUrl!=null}">${cardServer}${result.answerUrl}</c:if>" data-title="${result.examNumber}&nbsp;&nbsp;${result.name}&nbsp;&nbsp;客观总分${result.objectiveScoreString}&nbsp;&nbsp;主观总分${result.subjectiveScoreString}&nbsp;&nbsp;全卷总分${result.totalScoreString}">原图</a>
+				</td>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${query}</div>
+	<%@include file="/WEB-INF/views/include/imageView.jsp" %>
+<script type="text/javascript">
+var searchSubjectCode = '${query.subjectCode}';
+var searchGroupNumber = '${query.groupNumber}';
+$(document).ready(function() {
+    /* new jBox('Image', {
+    	imageFade: 0,
+    	delayOpen: 0,
+    	delayClose: 0,
+    	maxHeight: $(window).height()*0.88
+    }); */
+    $('.sheet-link').click(function(){
+    	initImagePopover($(this).attr('data-title'), '${imageServer}', $(this).attr('data-sheet-url'), $(this).attr('data-answer-url'));
+    	return false;
+    });
+
+    $('#subject-select').change(function(){
+        var code = $(this).val();
+        if(code==''){
+            $('#group-select').empty();
+            return;
+        }
+        $.post('${ctx}/admin/exam/group/query', {subjectCode: code}, function(result){
+            var parent = $('#group-select');
+            parent.empty();
+            for(var i=0;i<result.length;i++){
+                var group = result[i];
+                $('<option value="'+group.number+'">'+group.number+'-'+group.title+'</option>').appendTo(parent);
+            }
+            if(searchSubjectCode==code && searchGroupNumber!=''){
+                parent.val(searchGroupNumber);
+            }
+            parent.trigger('change');
+        });
+    });
+    $('#subject-select').trigger('change');
+});
+function page(n,s){
+	$("#pageNumber").val(n);
+	$("#searchForm").attr('action', '${ctx}/admin/exam/tag');
+	$("#searchForm").submit();
+	return false;
+}
+function goSearch(){
+	$("#pageNumber").val(1);
+	$("#searchForm").attr('action', '${ctx}/admin/exam/tag');
+	$("#searchForm").submit();
+	return false;
+}
+function goExport(){
+	$("#searchForm").attr('action', '${ctx}/admin/exam/tag/export');
+	$("#searchForm").submit();
+	return false;
+}
+</script>	
+</body>
 </html>