删除标记卷前后端相关代码；重构问题卷

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/TagDao.java

@@ -1,15 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import cn.com.qmth.stmms.biz.exam.model.Tag;
-
-public interface TagDao extends PagingAndSortingRepository<Tag, Integer>, JpaSpecificationExecutor<Tag> {
-
-    @Query("select t from Tag t")
-    public List<Tag> list();
-}

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/Tag.java

@@ -1,38 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "b_tag")
-public class Tag implements Serializable {
-
-    private static final long serialVersionUID = -8796053015319816326L;
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    private String name;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-}

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

@@ -1,19 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service;
-
-import java.util.List;
-
-import cn.com.qmth.stmms.biz.exam.model.Tag;
-
-/**
- * 试卷标记基础信息类
- * 
- * @author LS
- * 
- */
-public interface TagService {
-
-    List<Tag> findAll();
-
-    Tag findById(Integer id);
-
-}

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

@@ -1,31 +0,0 @@
-package cn.com.qmth.stmms.biz.exam.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.stmms.biz.common.BaseQueryService;
-import cn.com.qmth.stmms.biz.exam.dao.TagDao;
-import cn.com.qmth.stmms.biz.exam.model.Tag;
-import cn.com.qmth.stmms.biz.exam.service.TagService;
-
-@Service
-public class TagServiceImpl extends BaseQueryService<Tag> implements TagService {
-
-    @Autowired
-    private TagDao tagDao;
-
-    @Override
-    // @Cacheable(value = "tag_cache")
-    public List<Tag> findAll() {
-        return tagDao.list();
-    }
-
-    @Override
-    // @Cacheable(value = "tag_cache", key = "#id", condition = "#id!=null")
-    public Tag findById(Integer id) {
-        return tagDao.findOne(id);
-    }
-
-}

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

@@ -65,26 +65,20 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
     @Query("select count(*) from MarkLibrary f where f.studentId=?1 and f.markerId=?2 and f.id!=?3")
     long countByStudentIdAndMarkerIdAndIdNotEqual(Integer studentId, Integer markerId, Integer id);
 
-    @Query("select distinct l.campusId from MarkLibrary l where l.examId=?1 and l.tags is not null")
-    List<Integer> findTagCampusId(Integer examId);
-
-    @Query("select distinct l.subjectCode from MarkLibrary l where l.examId=?1 and l.tags is not null")
-    List<String> findTagSubjectCode(Integer examId);
-
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary m set m.status=?4, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null, m.markerSpent=null, "
+    @Query("update MarkLibrary m set m.status=?4, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null, m.markerSpent=null, "
             + "m.headerId=null , m.headerTime=null , m.headerScore=null , m.headerScoreList=null where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3")
     void resetByExamIdAndSubjectCodeAndGroupNumber(Integer examId, String subjectCode, Integer groupNumber,
             LibraryStatus status);
 
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null, m.markerSpent=null, "
+    @Query("update MarkLibrary m set m.status=?2, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null, m.markerSpent=null, "
             + "m.headerId=null , m.headerTime=null , m.headerScore=null , m.headerScoreList=null  where m.markerId=?1 and m.status!=?3 and m.status not in (?4) ")
     void resetByMarkerId(Integer markerId, LibraryStatus status, LibraryStatus libraryStatus1,
             LibraryStatus... libraryStatus);
 
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null, m.markerSpent=null, "
+    @Query("update MarkLibrary m set m.status=?2, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null, m.markerSpent=null, "
             + "m.headerId=null , m.headerTime=null , m.headerScore=null , m.headerScoreList=null where m.id=?1 and m.status in (?3)")
     int resetById(Integer id, LibraryStatus newStatus, LibraryStatus... previousStatus);
 
@@ -120,9 +114,9 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
 
     @Modifying(clearAutomatically = true)
     @Query("update MarkLibrary l set l.status=?2, l.markerId=?3, l.markerScore=?4, l.markerScoreList=?5, l.markerTime=?6, "
-            + "l.markerSpent=?7, l.tags=?8 where l.id=?1 and l.status in (?9) and (l.markerId=null or l.markerId=?3)")
+            + "l.markerSpent=?7 where l.id=?1 and l.status in (?8) and (l.markerId=null or l.markerId=?3)")
     int updateMarkerResult(Integer id, LibraryStatus newStatus, Integer markerId, Double markerScore,
-            String markerScoreList, Date markerTime, Integer spent, String tags, LibraryStatus... previousStatus);
+            String markerScoreList, Date markerTime, Integer spent, LibraryStatus... previousStatus);
 
     @Query("select m.markerScore ,count(*) from MarkLibrary m where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3 and m.markerId=?4 and m.status in (?5) group by m.markerScore ")
     List<Object[]> findScoreCount(int examId, String subjectCode, Integer groupNumber, Integer markerId,
@@ -136,4 +130,10 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
     void deleteByExamIdAndSubjectCodeAndGroupNumberAndTaskNumber(Integer examId, String subjectCode,
             Integer groupNumber, Integer taskNumber);
 
+    @Modifying(clearAutomatically = true)
+    @Query("update MarkLibrary l set l.status=?2, l.markerId=?3, l.markerTime=?4, "
+            + "l.markerSpent=?5 where l.id=?1 and l.status in (?6) and (l.markerId=null or l.markerId=?3)")
+    int updateProblemResult(Integer id, LibraryStatus newStatus, Integer markerId, Date markerTime, Integer spent,
+            LibraryStatus... previousStatus);
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/MarkLibrary.java

@@ -102,12 +102,6 @@ public class MarkLibrary implements Serializable {
     @Column(name = "marker_spent")
     private Integer markerSpent;
 
-    /**
-     * 试卷标记信息
-     */
-    @Column(name = "tags")
-    private String tags;
-
     /**
      * 任务状态
      */
@@ -253,14 +247,6 @@ public class MarkLibrary implements Serializable {
         this.campusId = campusId;
     }
 
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
     public Integer getGroupNumber() {
         return groupNumber;
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/Task.java

@@ -96,11 +96,6 @@ public class Task extends MarkResult implements Serializable {
      */
     private boolean isExist;
 
-    /**
-     * 试卷标记信息
-     */
-    private String tags;
-
     private String message;
 
     private Integer headerId;
@@ -194,14 +189,6 @@ public class Task extends MarkResult implements Serializable {
         this.sheetUrls = sheetUrls;
     }
 
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
     public boolean isSelf() {
         return isSelf;
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/query/MarkLibrarySearchQuery.java

@@ -26,10 +26,6 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
 
     private int markerId;
 
-    private int tagId;
-
-    private Boolean tagNotNull;
-
     private int groupNumber;
 
     private Double markerScore;
@@ -95,22 +91,6 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
         this.markerId = markerId;
     }
 
-    public int getTagId() {
-        return tagId;
-    }
-
-    public void setTagId(int tagId) {
-        this.tagId = tagId;
-    }
-
-    public Boolean getTagNotNull() {
-        return tagNotNull;
-    }
-
-    public void setTagNotNull(Boolean tagNotNull) {
-        this.tagNotNull = tagNotNull;
-    }
-
     public int getCampusId() {
         return campusId;
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkLibraryServiceImpl.java

@@ -54,19 +54,8 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
         query.setPageNumber(pageNumber);
         query.setPageSize(pageSize);
 
-        return filterClass
-                ? libraryDao.findUnMarkedFilterClass(examId, subjectCode, groupNumber, markerId, statusSet, query)
-                : libraryDao.findUnMarked(examId, subjectCode, groupNumber, markerId, statusSet, query);
-    }
-
-    @Override
-    public List<Integer> findTagCampusId(int examId) {
-        return libraryDao.findTagCampusId(examId);
-    }
-
-    @Override
-    public List<String> findTagSubjectCode(int examId) {
-        return libraryDao.findTagSubjectCode(examId);
+        return filterClass ? libraryDao.findUnMarkedFilterClass(examId, subjectCode, groupNumber, markerId, statusSet,
+                query) : libraryDao.findUnMarked(examId, subjectCode, groupNumber, markerId, statusSet, query);
     }
 
     @Override
@@ -135,12 +124,6 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                     }
                     predicates.add(cb.or(sub.toArray(new Predicate[sub.size()])));
                 }
-                if (query.getTagNotNull() != null && query.getTagNotNull().booleanValue()) {
-                    predicates.add(cb.isNotNull(root.get("tags")));
-                }
-                if (query.getTagId() > 0) {
-                    predicates.add(cb.like(root.get("tags").as(String.class), "%" + query.getTagId() + "%"));
-                }
                 if (query.getMarkerScore() != null) {
                     predicates.add(cb.equal(root.get("markerScore"), query.getMarkerScore()));
                 }
@@ -149,8 +132,8 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                     Predicate predicate2 = cb.le(root.get("markerScore"), query.getEndScroe());
                     predicates.add(cb.and(predicate1, predicate2));
                 }
-                return predicates.isEmpty() ? cb.conjunction()
-                        : cb.and(predicates.toArray(new Predicate[predicates.size()]));
+                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
+                        .size()]));
             }
         };
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -438,11 +438,13 @@ public class MarkServiceImpl implements MarkService {
                 history.setStatus(HistoryStatus.WAITING);
                 problemHistoryService.save(history);
                 // 状态更新
-                libraryDao.updateByStudentIdAndGroupNumber(library.getStudentId(), library.getGroupNumber(),
-                        LibraryStatus.PROBLEM);
-                updateMarkedCount(group);
-                releaseLibrary(library, marker);
-                return true;
+                Date now = new Date();
+                if (libraryDao.updateProblemResult(library.getId(), LibraryStatus.PROBLEM, marker.getId(), now,
+                        result.getSpent(), LibraryStatus.WAITING, LibraryStatus.MARKED, LibraryStatus.INSPECTED) == 0) {
+                    updateMarkedCount(group);
+                    releaseLibrary(library, marker);
+                    return true;
+                }
             }
             if (library != null && library.getExamId().equals(group.getExamId())
                     && library.getSubjectCode().equals(group.getSubjectCode())
@@ -515,7 +517,7 @@ public class MarkServiceImpl implements MarkService {
         // 尝试提交评卷结果
         Date now = new Date();
         if (libraryDao.updateMarkerResult(library.getId(), LibraryStatus.MARKED, marker.getId(),
-                result.getTotalScore(), result.getScoreList(), now, result.getSpent(), null, LibraryStatus.WAITING,
+                result.getTotalScore(), result.getScoreList(), now, result.getSpent(), LibraryStatus.WAITING,
                 LibraryStatus.MARKED, LibraryStatus.INSPECTED) == 0) {
             // 条件不符更新失败，直接返回
             return false;

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TaskServiceImpl.java

@@ -152,7 +152,6 @@ public class TaskServiceImpl implements TaskService {
         task.setPaperUrl(PictureUrlBuilder.getPaperUrl(library.getExamId(), library.getSubjectCode()));
         task.setObjectiveScore(student != null ? student.getObjectiveScore() : 0);
         task.setMarkTime(library.getMarkerTime());
-        task.setTags(library.getTags());
         task.setTagList(getMarkSpecialTagList(library.getId()));
         if (library.getMarkerScore() != null) {
             task.setTotalScore(library.getMarkerScore());
@@ -362,7 +361,6 @@ public class TaskServiceImpl implements TaskService {
                 stepTask.setBack(task.isBack());
                 stepTask.setLibraryId(library.getId());
                 stepTask.setHeaderId(task.getHeaderId());
-                stepTask.setTags(task.getTags());
                 List<ExamQuestion> sList = questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(
                         library.getExamId(), library.getSubjectCode(), false, library.getGroupNumber());
                 if (start == end) {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/MarkLibraryService.java

@@ -23,10 +23,6 @@ public interface MarkLibraryService {
 
     long countByMarker(int markerId);
 
-    List<Integer> findTagCampusId(int examId);
-
-    List<String> findTagSubjectCode(int examId);
-
     List<MarkLibrary> findByStudentAndGroup(int studentId, int groupNumber);
 
     List<MarkLibrary> findByStudentIdAndStatus(int studentId, LibraryStatus status);

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

@@ -92,22 +92,6 @@ public class BaseExamController extends BaseController {
         return list;
     }
 
-    protected List<ExamSubject> getTagSubject(int examId, WebUser wu) {
-        List<ExamSubject> list = new LinkedList<ExamSubject>();
-        List<String> codes = libraryService.findTagSubjectCode(examId);
-        for (String code : codes) {
-            ExamSubject subject = subjectService.find(examId, code);
-            if (subject != null) {
-                if (wu.isSubjectHeader() && subject.getCode().equals(wu.getUser().getSubjectCode())) {
-                    list.add(subject);
-                } else if (wu.isSchoolAdmin()) {
-                    list.add(subject);
-                }
-            }
-        }
-        return list;
-    }
-
     @SuppressWarnings("rawtypes")
     protected BaseQuery subjectFilter(BaseQuery query, WebUser wu) {
         if (wu.isSubjectHeader()) {
@@ -131,7 +115,7 @@ public class BaseExamController extends BaseController {
             return true;
         }
     }
-    
+
     protected String buildPictureConfig(String sheetConfig) {
         String json = "";
         if (StringUtils.isNotBlank(sheetConfig)) {

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

@@ -1,72 +0,0 @@
-package cn.com.qmth.stmms.admin.exam;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-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 cn.com.qmth.stmms.biz.exam.service.MarkerService;
-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.common.domain.WebUser;
-import cn.com.qmth.stmms.common.utils.RequestUtils;
-
-@Controller("tagController")
-@RequestMapping("/admin/exam/tag")
-public class TagController extends BaseExamController {
-
-    protected static Logger log = LoggerFactory.getLogger(TagController.class);
-
-    @Autowired
-    private MarkLibraryService libraryService;
-
-    @Autowired
-    private MarkerService markerService;
-
-    @Autowired
-    private TagService tagService;
-
-    @Value("${sheet.image.server}")
-    private String imageServer;
-
-    /**
-     * 标记试卷处理
-     * 
-     * @param request
-     * @param model
-     * @param query
-     * @return
-     */
-    @RequestMapping
-    public String list(HttpServletRequest request, Model model, MarkLibrarySearchQuery query) {
-        WebUser wu = RequestUtils.getWebUser(request);
-        int examId = getSessionExamId(request);
-        query.setExamId(examId);
-        query.setTagNotNull(true);
-        query.orderByExamNumber();
-        if (query.getTagId() == 0) {
-            query.setTagId(1);
-        }
-        subjectFilter(query, wu);
-        query = libraryService.findByQuery(query);
-        for (MarkLibrary library : query.getResult()) {
-            if (library.getMarkerId() != null) {
-                library.setMarker(markerService.findById(library.getMarkerId()));
-            }
-        }
-
-        model.addAttribute("query", query);
-        model.addAttribute("subjectList", getTagSubject(examId, wu));
-        model.addAttribute("tagList", tagService.findAll());
-        model.addAttribute("imageServer", imageServer);
-        return "modules/exam/tagInfo";
-    }
-
-}

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

@@ -6,7 +6,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringEscapeUtils;
@@ -29,12 +28,10 @@ import cn.com.qmth.stmms.biz.exam.model.Exam;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
-import cn.com.qmth.stmms.biz.exam.model.Tag;
 import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
-import cn.com.qmth.stmms.biz.exam.service.TagService;
 import cn.com.qmth.stmms.biz.lock.LockService;
 import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
 import cn.com.qmth.stmms.biz.mark.model.MarkResult;
@@ -80,9 +77,6 @@ public class MarkController extends BaseController {
     @Autowired
     private TaskService taskService;
 
-    @Autowired
-    private TagService tagService;
-
     @Autowired
     private MarkService markService;
 
@@ -413,7 +407,6 @@ public class MarkController extends BaseController {
             query.addStatus(LibraryStatus.MARKED);
             query.addStatus(LibraryStatus.INSPECTED);
             query.setGroupNumber(marker.getGroupNumber());
-            query.setTagNotNull(isTag);
             query.setPageNumber(pageNumber);
             query.setPageSize(pageSize);
             if (querySort != null) {
@@ -479,20 +472,6 @@ public class MarkController extends BaseController {
         return result;
     }
 
-    @RequestMapping("/tags")
-    @ResponseBody
-    public JSONArray getTags(HttpServletRequest request) {
-        JSONArray array = new JSONArray();
-        List<Tag> list = tagService.findAll();
-        for (Tag tag : list) {
-            JSONObject obj = new JSONObject();
-            obj.accumulate("value", tag.getId());
-            obj.accumulate("name", tag.getName());
-            array.add(obj);
-        }
-        return array;
-    }
-
     private void releaseMarker(Marker marker) {
         if (marker == null) {
             return;

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

@@ -1,172 +0,0 @@
-<%@ 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-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>
-                <th>给分明细</th>
-				<th>评卷时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-        <c:forEach items="${query.result}" var="result">
-            <tr>
-                <td>${result.subjectCode}</td>
-                <td>${result.groupNumber}</td>
-                <td>${result.examNumber}</td>
-                <td>${result.status.name}</td>
-                <td>
-                    <c:if test="${result.marker!=null}">
-                    ${result.marker.loginName}
-                    </c:if>
-                    <c:if test="${result.marker==null}">
-                    &nbsp;
-                    </c:if>
-                </td>
-                <td>
-                    <c:if test="${result.markerScore!=null}">
-                    <fmt:formatNumber pattern="###.#" value="${result.markerScore}"/>
-                    </c:if>
-                    <c:if test="${result.markerScore==null}">
-                    &nbsp;
-                    </c:if>
-                </td>
-                <td>
-                    <c:if test="${result.markerScoreList!=null}">
-                    ${result.markerScoreList}
-                    </c:if>
-                    <c:if test="${result.markerScoreList==null}">
-                    &nbsp;
-                    </c:if>
-                </td>
-                <td>
-                    <c:if test="${result.markerTime!=null}">
-                    <fmt:formatDate value="${result.markerTime}" pattern="yyyy-MM-dd HH:mm:ss" />
-                    </c:if>
-                    <c:if test="${result.markerTime==null}">
-                    &nbsp;
-                    </c:if>
-                </td>
-                <td>
-                    <c:if test="${result.status.value==1 || result.status.value==3}">
-                    <a class="track-link" href="##" data-image-url="${ctx}/admin/exam/track/byLibrary?libraryId=${result.id}" data-title="${result.examNumber}">阅卷轨迹</a>
-                    </c:if>
-                    <c:if test="${result.status.value==1}">
-                    &nbsp;
-                    <a href="##" data-id="${result.id}" class="back-link">打回</a>
-                    </c:if>
-                </td>
-            </tr>
-        </c:forEach>
-        </tbody>
-	</table>
-	<div class="pagination">${query}</div>
-	<%@include file="/WEB-INF/views/include/trackView.jsp" %>
-	<%@include file="/WEB-INF/views/include/imageView.jsp" %>
-<script type="text/javascript">
-var searchSubjectCode = '${query.subjectCode}';
-var searchGroupNumber = '${query.groupNumber}';
-$(document).ready(function() {
-    $('.sheet-link').click(function(){
-    	initImagePopover($(this).attr('data-title'), '${imageServer}', $(this).attr('data-sheet-url'), $(this).attr('data-answer-url'));
-    	return false;
-    });
-    $('.back-link').click(function(){
-        if(!confirm('确定要打回该评卷任务吗?')){
-            return;
-        }
-        $.post('${ctx}/admin/exam/library/back', {id: $(this).attr('data-id')}, function(result){
-            if(result.success==true){
-                alert('打回成功');
-                $("#searchForm").submit();
-            }else{
-                alert(result.message);
-            }
-        });
-    });
-    $('.track-link').click(function(){
-        initTrackPopover($(this).attr('data-title'),$(this).attr('data-image-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>

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

@@ -82,9 +82,6 @@
 					'change-name':{
 						url : '${ctx}/mark/change-name'
 					},
-				/* 	'tag-process':{
-						url : '${ctx}/mark/tags'
-					}, */
                     'specialTag':{
                     },
                     <c:if test="${sheetView==true}">

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -47,29 +47,6 @@ CREATE TABLE `b_school` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学校表';
 
 
-
-# Dump of table b_tag
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `b_tag`;
-
-CREATE TABLE `b_tag` (
-  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `name` varchar(128) NOT NULL COMMENT '标记类型',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='标记类型表';
-
-LOCK TABLES `b_tag` WRITE;
-
-INSERT INTO `b_tag` (`id`, `name`)
-VALUES
-	(1,'试卷雷同'),
-	(2,'科目错误'),
-	(3,'贴错条码');
-
-UNLOCK TABLES;
-
-
 # Dump of table b_user
 # ------------------------------------------------------------
 
@@ -390,7 +367,6 @@ CREATE TABLE `m_library` (
   `marker_time` datetime DEFAULT NULL COMMENT '评卷时间',
   `marker_score` double DEFAULT NULL COMMENT '评卷总分',
   `marker_score_list` varchar(256) DEFAULT NULL COMMENT '评卷给分明细',
-  `tags` varchar(16) DEFAULT NULL COMMENT '评卷标记',
   `status` int(11) NOT NULL COMMENT '状态',
   `header_id` int(11) DEFAULT NULL COMMENT '科组长ID',
   `header_score` double DEFAULT NULL COMMENT '科组长总分',

stmms-web/src/main/webapp/static/mark-new/js/modules/tag-process.js

@@ -1,88 +0,0 @@
-//试卷标记处理模块
-var tag_process = function(option, success) {
-    var object = new TagProcess(option);
-    success();
-    return object;
-}
-
-function TagProcess(option) {
-    this.markControl = option.markControl;
-    this.url = option.url;
-    this.init();
-    this.markControl.on('task.get.before', this, function(event, context, eventObject) {
-        this.task = undefined;
-        this.reset();
-    });
-    this.markControl.on('task.get.success', this, function(event, context, eventObject) {
-        this.task = context.task;
-        this.reset();
-    });
-    this.markControl.on('task.get.none', this, function(event, context, eventObject) {
-        this.reset();
-    });
-    this.markControl.on('task.get.error', this, function(event, context, eventObject) {
-        this.reset();
-    });
-}
-
-TagProcess.prototype.init = function() {
-    this.container = getDom(this.container_dom, this.markControl).appendTo(this.markControl.container.assistant);
-    this.container.list = this.container.find('#type-list');
-    this.container.title = this.container.find('.popover-title');
-
-    var self = this;
-    $.post(this.url, function(result) {
-        for (var i = 0; i < result.length; i++) {
-            var button = getDom(self.button_dom, self.markControl).appendTo(self.container.list);
-            button.attr('data-value', result[i].value);
-            button.html(result[i].name);
-        }
-
-        self.container.list.find('.tag-button').click(function(event) {
-            $(this).toggleClass('curr');
-            self.onTypeSelect();
-        });
-    });
-}
-
-TagProcess.prototype.reset = function() {
-    //this.container.list.find('.tag-button').removeClass('curr');
-	var self = this;
-    if (this.task != undefined) {
-        this.container.list.find('.tag-button').each(function(index, obj) {
-            var value = $(obj).attr('data-value');
-            if (self.task.tags != undefined && self.task.tags.indexOf(value) != -1) {
-                $(obj).addClass('curr');
-            } else {
-                $(obj).removeClass('curr');
-            }
-        });
-        this.container.show();
-    } else {
-        this.container.hide();
-    }
-}
-
-TagProcess.prototype.onTypeSelect = function() {
-    var self = this;
-    if (this.task != undefined) {
-        var array = [];
-        this.container.list.find('.tag-button').each(function(index, obj) {
-            if ($(obj).hasClass('curr')) {
-                array.push($(obj).attr('data-value'));
-            }
-        });
-
-        if (array.length > 0) {
-            this.task.tags = array.join(',');
-        } else {
-            this.task.tags = undefined;
-        }
-    }
-}
-
-TagProcess.prototype.container_dom = '<h3 class="popover-title">标记试卷</h3>\
-<div class="popover-content"><p id="type-list" class="popover-list">\
-</p></div>';
-
-TagProcess.prototype.button_dom = '<a class="tag-button" href="#"></a>';