Răsfoiți Sursa

不限制是否生成任务,待完成任务为0的分组就可以关闭

ting.yin 1 an în urmă
părinte
comite
785ea0fcc1

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkController.java

@@ -244,7 +244,7 @@ public class MarkController extends BaseExamController {
                 }
                 try {
                     lockService.waitlock(LockType.GROUP, group.getExamId(), group.getSubjectCode(), group.getNumber());
-                    if (group.getStatus() == MarkStatus.FORMAL && group.getLeftCount() == 0 && group.getLibraryCount() != 0) {
+                    if (group.getStatus() == MarkStatus.FORMAL && group.getLeftCount() == 0) {
                         groupService
                                 .updateStatus(examId, code, group.getNumber(), MarkStatus.FINISH, group.getStatus());
                     }

+ 7 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkGroupController.java

@@ -270,7 +270,7 @@ public class MarkGroupController extends BaseExamController {
         if (markGroup.getStatus() == MarkStatus.TRIAL && status == MarkStatus.FORMAL) {
             allow = true;
         } else if (markGroup.getStatus() == MarkStatus.FORMAL && status == MarkStatus.FINISH
-                && markGroup.getLeftCount() == 0 && markGroup.getLibraryCount() != 0) {
+                && markGroup.getLeftCount() == 0) {
             allow = true;
         } else if (markGroup.getStatus() == MarkStatus.FINISH && status == MarkStatus.FORMAL) {
             allow = true;
@@ -398,6 +398,11 @@ public class MarkGroupController extends BaseExamController {
             }
             int percent = group.getLibraryCount() > 0 ? (int) (group.getMarkedCount() * 100.00 / group
                     .getLibraryCount()) : 0;
+            if (group.getMarkedCount() > 0 && percent == 0) {
+                percent = 1;
+            } else if (group.getLeftCount() > 0 && percent == 100) {
+                percent = 99;
+            }
             group.setPercent(percent);
             model.addAttribute("group", group);
             model.addAttribute("questionList", questions);
@@ -774,7 +779,7 @@ public class MarkGroupController extends BaseExamController {
             }
             try {
                 lockService.waitlock(LockType.GROUP, group.getExamId(), group.getSubjectCode(), group.getNumber());
-                if (group.getStatus() == MarkStatus.FORMAL && group.getLeftCount() == 0 && group.getLibraryCount() != 0) {
+                if (group.getStatus() == MarkStatus.FORMAL && group.getLeftCount() == 0) {
                     groupService.updateStatus(examId, subjectCode, number, MarkStatus.FINISH, group.getStatus());
                 }
             } finally {

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

@@ -238,6 +238,11 @@ public class MarkController extends BaseController {
                 item.accumulate("groupNumber", group.getNumber());
                 int percent = group.getLibraryCount() > 0 ? (int) (group.getMarkedCount() * 100.00 / group
                         .getLibraryCount()) : 0;
+                if (group.getMarkedCount() > 0 && percent == 0) {
+                    percent = 1;
+                } else if (group.getLeftCount() > 0 && percent == 100) {
+                    percent = 99;
+                }
                 item.accumulate("percent", percent);
                 array.add(item);
             }