yin 7 months ago
parent
commit
93b6d5b519

+ 2 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/SelectiveStudentDao.java

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import cn.com.qmth.stmms.biz.exam.model.SelectiveStudent;
+import org.springframework.transaction.annotation.Transactional;
 
 public interface SelectiveStudentDao extends JpaRepository<SelectiveStudent, Integer>,
         PagingAndSortingRepository<SelectiveStudent, Integer>, JpaSpecificationExecutor<SelectiveStudent> {
@@ -16,6 +17,7 @@ public interface SelectiveStudentDao extends JpaRepository<SelectiveStudent, Int
     void deleteByExamIdAndSubjectCode(Integer examId, String subjectCode);
 
     @Modifying(clearAutomatically = true)
+    @Transactional
     @Query("delete SelectiveStudent s where s.studentId=?1")
     void deleteByStudentId(Integer studentId);
     @Query("select count(s) from SelectiveStudent s where s.examId=?1 and s.subjectCode=?2 and (s.lessSelective=?3 or s.notSelective=?4)")

+ 1 - 1
stmms-common/src/main/java/cn/com/qmth/stmms/common/utils/VersionInfo.java

@@ -7,5 +7,5 @@ public class VersionInfo {
 
     public static final String NAME = "1.5.1";
 
-    public static final String DATE = "20241008";
+    public static final String DATE = "20241029";
 }

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

@@ -542,6 +542,10 @@
         var deleteCheck = '${deleteCheck}';
         if (deleteCheck == 'false') {
             deleteDivHide();
+            $("#doubleRate").removeClass("required");
+            $('.arbitrateThreshold-input').each(function () {
+                $(this).removeClass("required");
+            });
             $("#inputForm").attr("action", "${ctx}/admin/exam/group/delete");
             $("#inputForm").submit();
             return;
@@ -557,6 +561,10 @@
         }, function (initParams, deleteCode) {
             //这个回调方法里写进度小余10%的业务分支
             deleteDivHide();
+            $("#doubleRate").removeClass("required");
+            $('.arbitrateThreshold-input').each(function () {
+                $(this).removeClass("required");
+            });
             if (deleteCode != null && deleteCode != '') {
                 $("#inputForm").attr("action", "${ctx}/admin/exam/group/delete?deleteCode=" + deleteCode);
                 $("#inputForm").submit();