3.3.0 fix

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkUserGroup.java

@@ -56,7 +56,7 @@ public class MarkUserGroup implements Serializable {
     @ApiModelProperty(value = "有效数量")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer validCount;
-    @ApiModelProperty(value = "管理员直接打分数量")
+    @ApiModelProperty(value = "有效分数里-管理员直接打分数量")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer headerFinishCount;
 

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

@@ -253,11 +253,12 @@ public class MarkServiceImpl implements MarkService {
             if (!markTask.getStatus().equals(MarkTaskStatus.PROBLEM)) {
                 finishCount++;
             }
-            if (markTask.getHeaderId() != null) {
-                headerFinishCount++;
-            }
             if (markTask.getStatus() == MarkTaskStatus.MARKED) {
                 validCount++;
+                // 有效分数里，管理员打分数量（主观题检查）
+                if (markTask.getHeaderId() != null) {
+                    headerFinishCount++;
+                }
             }
             double score = markTask.getMarkerScore() != null && markTask.getMarkerScore() != UN_SELECTIVE_SCORE
                     ? markTask.getMarkerScore()

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

@@ -222,7 +222,7 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
                 qualityDto.setLoginName(sysUser.getLoginName());
                 qualityDto.setName(sysUser.getRealName());
                 qualityDto.setOrgName(sysUser.getOrgName());
-                qualityDto.setAdoptionRate(Calculator.divide2String(Calculator.multiply(qualityDto.getValidCount(), 100), Double.valueOf(qualityDto.getFinishCount()), 2));
+                qualityDto.setAdoptionRate(Calculator.divide2String(Calculator.multiply((qualityDto.getValidCount() - qualityDto.getHeaderFinishCount()), 100), Double.valueOf(qualityDto.getFinishCount()), 2));
                 qualityDto.setAvgScore(Calculator.round(qualityDto.getAvgScore(), 2));
             }
         }