3.3.0 update

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkUserGroupController.java

@@ -85,7 +85,7 @@ public class MarkUserGroupController {
      */
     @ApiOperation(value = "解绑评卷员")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public Result deleteMarker(@ApiParam(value = "考试ID", required = true) @RequestParam Long markUserGroupId) {
+    public Result deleteMarker(@ApiParam(value = "用户分组ID", required = true) @RequestParam Long markUserGroupId) {
         markUserGroupService.deleteMarker(markUserGroupId);
         return ResultUtil.ok(true);
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/entrance/MarkEntranceDto.java

@@ -15,7 +15,7 @@ public class MarkEntranceDto {
     private String courseName;
     private String paperNumber;
     private String groupQuestions;
-    private Integer libraryCount;
+    private Integer taskCount;
     private Integer markedCount;
     private Integer leftCount;
     /**
@@ -71,12 +71,12 @@ public class MarkEntranceDto {
         this.groupQuestions = groupQuestions;
     }
 
-    public Integer getLibraryCount() {
-        return libraryCount;
+    public Integer getTaskCount() {
+        return taskCount;
     }
 
-    public void setLibraryCount(Integer libraryCount) {
-        this.libraryCount = libraryCount;
+    public void setTaskCount(Integer taskCount) {
+        this.taskCount = taskCount;
     }
 
     public Integer getMarkedCount() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserGroupServiceImpl.java

@@ -74,10 +74,10 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
         IPage<MarkEntranceDto> markEntranceDtoIPage = this.baseMapper.listEntranceGroup(page, examId, courseCode, paperNumber, sysUser.getId());
         for (MarkEntranceDto record : markEntranceDtoIPage.getRecords()) {
             // 评卷进度
-            if (record.getLibraryCount().intValue() == 0) {
+            if (record.getTaskCount().intValue() == 0) {
                 record.setPercent(0D);
             } else {
-                BigDecimal bigDecimal = new BigDecimal(record.getMarkedCount()).divide(new BigDecimal(record.getLibraryCount()), 2, RoundingMode.HALF_UP);
+                BigDecimal bigDecimal = record.getMarkedCount() == null ? new BigDecimal("0") : new BigDecimal(record.getMarkedCount()).divide(new BigDecimal(record.getTaskCount()), 2, RoundingMode.HALF_UP);
                 record.setPercent(bigDecimal.doubleValue());
             }
 
@@ -146,7 +146,7 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
     @Override
     public void deleteMarker(Long markUserGroupId) {
         MarkUserGroup markUserGroup = this.getById(markUserGroupId);
-        if (markUserGroup != null) {
+        if (markUserGroup == null) {
             throw ExceptionResultEnum.ERROR.exception("评卷员不存在");
         }
         int count = markTaskService.countByExamIdAndPaperNumberAndGroupNumberAndUserId(markUserGroup.getExamId(), markUserGroup.getPaperNumber(), markUserGroup.getGroupNumber(), markUserGroup.getUserId());
@@ -275,13 +275,13 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
         return markQualityChartDtoList;
     }
 
-	@Override
-	public List<MarkUserGroup> listByExamIdAndPaperNumberAndUserId(Long examId, String paperNumber, Long userId) {
-		 QueryWrapper<MarkUserGroup> queryWrapper = new QueryWrapper<>();
-	     queryWrapper.lambda().eq(MarkUserGroup::getExamId, examId)
-	                .eq(MarkUserGroup::getPaperNumber, paperNumber)
-	                .eq(MarkUserGroup::getUserId, userId)
-	                .orderByAsc(MarkUserGroup::getId);
-	     return this.list(queryWrapper);
-	}
+    @Override
+    public List<MarkUserGroup> listByExamIdAndPaperNumberAndUserId(Long examId, String paperNumber, Long userId) {
+        QueryWrapper<MarkUserGroup> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(MarkUserGroup::getExamId, examId)
+                .eq(MarkUserGroup::getPaperNumber, paperNumber)
+                .eq(MarkUserGroup::getUserId, userId)
+                .orderByAsc(MarkUserGroup::getId);
+        return this.list(queryWrapper);
+    }
 }

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

@@ -27,7 +27,7 @@
             mg.course_code courseCode,
             mg.course_name courseName,
             mg.paper_number paperNumber,
-            mg.library_count libraryCount,
+            mg.task_count taskCount,
             mg.marked_count markedCoude,
             mg.left_count leftCount
         FROM