修复特殊标记打回未清除

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

@@ -17,5 +17,14 @@ public interface MarkSpecialTagDao extends PagingAndSortingRepository<MarkSpecia
     public void deleteByLibraryId(Integer libraryId);
 
     public List<MarkSpecialTag> findByLibraryIdOrderByIdAsc(Integer libraryId);
+    
+    @Modifying
+    @Query("delete from MarkSpecialTag s where s.libraryId in (select m.id from MarkLibrary m where m.markerId=?1)")
+	public void deleteByMarkerId(Integer markerId);
+
+    @Modifying
+    @Query("delete from MarkSpecialTag s where s.libraryId in (select m.id from MarkLibrary m where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3)")
+	public void deleteByExamAndSubjectAndGroup(Integer examId,
+			String subjectCode, Integer groupNumber);
 
 }

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

@@ -25,6 +25,7 @@ import cn.com.qmth.stmms.biz.mark.dao.MarkLibraryDao;
 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.MarkSpecialTagService;
 import cn.com.qmth.stmms.biz.mark.service.MarkTrackService;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
 
@@ -39,10 +40,14 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
 
     @Autowired
     private ExamQuestionService questionService;
+    
+    @Autowired
+    private MarkSpecialTagService markSpecialTagService;
 
     @Transactional
     @Override
     public void delete(MarkLibrary library) {
+    	markSpecialTagService.deleteByLibraryId(library.getId());
         libraryDao.delete(library);
         if (library != null) {
             List<ExamQuestion> examQuestions = questionService.findByExamAndSubjectAndObjectiveAndMainNumber(
@@ -60,6 +65,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
         List<MarkLibrary> library = findByStudentId(studentId);
         if (library != null) {
             for (MarkLibrary markLibrary : library) {
+            	markSpecialTagService.deleteByLibraryId(markLibrary.getId());
                 this.delete(markLibrary);
             }
         }
@@ -69,6 +75,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
     @Transactional
     @Override
     public void deleteByGroup(MarkGroup group) {
+    	markSpecialTagService.deleteByExamAndSubjectAndGroup(group.getExamId(), group.getSubjectCode(), group.getNumber());
         libraryDao.deleteByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
                 group.getNumber());
         trackService.deleteByExamAndSubjectAndGroup(group.getExamId(), group.getSubjectCode(), group.getNumber());
@@ -121,6 +128,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
     @Override
     @Transactional
     public void resetByGroup(MarkGroup group) {
+    	markSpecialTagService.deleteByExamAndSubjectAndGroup(group.getExamId(), group.getSubjectCode(), group.getNumber());
         libraryDao.resetByExamIdAndSubjectCodeAndNumber(group.getExamId(), group.getSubjectCode(), group.getNumber(),
                 LibraryStatus.WAITING);
         trackService.deleteByExamAndSubjectAndGroup(group.getExamId(), group.getSubjectCode(), group.getNumber());
@@ -131,6 +139,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
     public void resetByMarker(Marker marker) {
         libraryDao.resetByMarkerId(marker.getId(), LibraryStatus.WAITING);
         trackService.deleteByMarkerId(marker.getId());
+        markSpecialTagService.deleteByMarkerId(marker.getId());
     }
 
     @Override
@@ -145,6 +154,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                 trackService.deleteByStudentIdAndQuestionNumber(library.getStudentId(),
                         examQuestion.getQuestionNumber());
             }
+            markSpecialTagService.deleteByLibraryId(id);
         }
     }
 
@@ -160,6 +170,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                 trackService.deleteByStudentIdAndQuestionNumber(library.getStudentId(),
                         examQuestion.getQuestionNumber());
             }
+            markSpecialTagService.deleteByLibraryId(id);
         }
     }
 

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

@@ -4,6 +4,7 @@ import cn.com.qmth.stmms.biz.common.BaseQueryService;
 import cn.com.qmth.stmms.biz.mark.dao.MarkSpecialTagDao;
 import cn.com.qmth.stmms.biz.mark.model.MarkSpecialTag;
 import cn.com.qmth.stmms.biz.mark.service.MarkSpecialTagService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,4 +30,14 @@ public class MarkSpecialTagServiceImpl extends BaseQueryService<MarkSpecialTag>
     public List<MarkSpecialTag> findByLibraryId(Integer libraryId){
         return markSpecialTagDao.findByLibraryIdOrderByIdAsc(libraryId);
     }
+	@Override
+	public void deleteByMarkerId(Integer markerId) {
+		markSpecialTagDao.deleteByMarkerId(markerId);
+	}
+	@Override
+	public void deleteByExamAndSubjectAndGroup(Integer examId,
+			String subjectCode, Integer groupNumber) {
+		markSpecialTagDao.deleteByExamAndSubjectAndGroup(examId,subjectCode,groupNumber);
+		
+	}
 }

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

@@ -5,7 +5,14 @@ import java.util.List;
 import cn.com.qmth.stmms.biz.mark.model.MarkSpecialTag;
 
 public interface MarkSpecialTagService {
-    public MarkSpecialTag save(MarkSpecialTag tag);
-    public void deleteByLibraryId(Integer libraryId);
-    public List<MarkSpecialTag> findByLibraryId(Integer libraryId);
+	public MarkSpecialTag save(MarkSpecialTag tag);
+
+	public void deleteByLibraryId(Integer libraryId);
+
+	public List<MarkSpecialTag> findByLibraryId(Integer libraryId);
+
+	public void deleteByMarkerId(Integer markerId);
+
+	public void deleteByExamAndSubjectAndGroup(Integer examId,
+			String subjectCode, Integer number);
 }

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

@@ -13,7 +13,7 @@
 		<input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize}"/>
 		<div>
 			<label>名称</label>
-			<input type="text" name="loginName" value="${query.name}"  maxlength="20" class="input-medium"/>
+			<input type="text" name="name" value="${query.name}"  maxlength="20" class="input-medium"/>
 			
 			&nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>