Merge branch 'stmms_ft_dev' of http://git.qmth.com.cn/luoshi/stmms-ft into stmms_ft_dev

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

@@ -59,7 +59,7 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
             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.headerId=null , m.headerTime=null , m.headerScore=null , m.headerScoreList=null where m.markerId=?1")
+    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null where m.markerId=?1 and m.headerId!=null ")
     void resetByMarkerId(Integer markerId, LibraryStatus status);
 
     @Modifying(clearAutomatically = true)

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

@@ -251,13 +251,13 @@ public class MarkServiceImpl implements MarkService {
     }
 
     /**
-     * 删除某个评卷员
+     * 重置某个评卷员
      * 
      * @param marker
      */
     @Override
     @Transactional
-    public void deleteMarker(Marker marker) {
+    public void resetMarker(Marker marker) {
         try {
             lockService.lockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
             releaseByMarker(marker);
@@ -265,7 +265,6 @@ public class MarkServiceImpl implements MarkService {
             trackDao.deleteByMarkerId(marker.getId());
             specialTagDao.deleteByMarkerId(marker.getId());
             updateLibraryCount(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-            markerDao.delete(marker);
         } catch (Exception e) {
             throw e;
         } finally {

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

@@ -75,11 +75,11 @@ public interface MarkService {
     void releaseByMarker(Marker marker);
 
     /**
-     * 删除某个评卷员
+     * 重置某个评卷员
      * 
      * @param marker
      */
-    void deleteMarker(Marker marker);
+    void resetMarker(Marker marker);
 
     /**
      * 根据考生删除评卷任务

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

@@ -163,28 +163,28 @@ public class MarkerController extends BaseExamController {
         return view;
     }
 
-    @RequestMapping(value = "/delete")
+    @RequestMapping(value = "/reset")
     @Transactional
     @RoleRequire(Role.SCHOOL_ADMIN)
     public String delete(@RequestParam Integer id, Model model, RedirectAttributes redirectAttributes) {
         Marker marker = markerService.findById(id);
         if (marker != null && !isMarking(marker.getExamId(), marker.getSubjectCode())) {
-            markService.deleteMarker(marker);
+            markService.resetMarker(marker);
         }
         redirectAttributes.addAttribute("subjectCode", marker.getSubjectCode());
         redirectAttributes.addAttribute("groupNumber", marker.getGroupNumber());
         return "redirect:/admin/exam/marker";
     }
 
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    @RequestMapping(value = "/reset", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
     @RoleRequire(Role.SCHOOL_ADMIN)
-    public JSONObject deleteMarker(@RequestParam Integer id) {
+    public JSONObject resetMarker(@RequestParam Integer id) {
         Marker marker = markerService.findById(id);
         JSONObject obj = new JSONObject();
         if (marker != null) {
-            markService.deleteMarker(marker);
+            markService.resetMarker(marker);
             obj.accumulate("success", true);
         } else {
             obj.accumulate("success", false);

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

@@ -168,7 +168,7 @@
 				<td>${marker.topCount}</td>
 				<td>
 				    <c:if test="${web_user.schoolAdmin==true}">
-					<a href="javascript:void(0)" class="delete-button" data-id="${marker.id}">删除</a>
+					<a href="javascript:void(0)" class="reset-button" data-id="${marker.id}">重置</a>
 					<c:if test="${marker.enable==true}">
 					<a href="javascript:void(0)" class="toggle-button" data-id="${marker.id}" data-value="false">禁用</a>
 					</c:if>
@@ -221,14 +221,14 @@ $("#btnExport").click(function(){
 	},{buttonsFocus:1});
 	top.$('.jbox-body .jbox-icon').css('top','55px');
 });
-$('.delete-button').click(function(){
-	if(!confirm("确定要删除改评卷员吗？")){
+$('.reset-button').click(function(){
+	if(!confirm("确定要重置改评卷员吗？")){
 	    return;
 	}
 	var id = $(this).attr('data-id');
-	$.post('${ctx}/admin/exam/marker/delete', {id: id}, function(result){
+	$.post('${ctx}/admin/exam/marker/reset', {id: id}, function(result){
 		if(result.success==true){
-			alert('删除成功');
+			alert('重置成功');
 			$("#searchForm").submit();
 		}else{
 			alert(result.message);