xiaofei hai 1 ano
pai
achega
c1f1533623

+ 2 - 0
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkGroupServiceImpl.java

@@ -393,6 +393,8 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
 
         // 增加或减少分组内题目数量和题目变动、单双评切换、开启双评且双评比例值修改过。则删除任务
         if (isClear) {
+            this.updateMarkedCount(examId, paperNumber, markGroupDto.getGroupNumber(), 0);
+            this.updateTaskCount(examId, paperNumber, markGroupDto.getGroupNumber(), 0);
             if (lockService.trylock(LockType.GROUP_DELETE, examId, paperNumber, markGroupDto.getGroupNumber())) {
                 markSyncService.deleteMarkGroup(markGroup, false);
             }

+ 0 - 1
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -831,7 +831,6 @@ public class MarkServiceImpl implements MarkService {
             // 更新MarkPaper中groupStatus
             updateMarkGroupStatus(markGroup.getExamId(), markGroup.getPaperNumber());
         }
-        this.updateMarkedCount(markGroup.getExamId(), markGroup.getPaperNumber(), markGroup.getNumber());
 
         // 未分组的题目
         long unGroupQuestionCount = markQuestionService.countByExamIdAndPaperNumberAndObjectiveAndGroupNumberIsNull(

+ 1 - 1
teachcloud-mark/src/main/resources/mapper/MarkUserGroupMapper.xml

@@ -43,7 +43,7 @@
             <if test="paperNumber != null and paperNumber != ''">
                 and mg.paper_number = #{paperNumber}
             </if>
-            and mug.user_id = #{userId}
+            and mug.user_id = #{userId} and mg.task_count > 0
         </where>
     </select>
     <select id="listGroupUserByExamIdAndPaperNumberAndGroupNumber"