3.3.0 fix

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TBSyncTaskService.java

@@ -17,7 +17,7 @@ public interface TBSyncTaskService extends IService<TBSyncTask> {
 
     TBSyncTask saveTask(Long schoolId, Long objectId, PushTypeEnum type, String remark);
 
-    TBSyncTask saveTask(Long schoolId, Long semesterId, Long examId, String paperNumber, String paperType, PushTypeEnum type, String remark);
+    TBSyncTask saveTask(Long schoolId, Long semesterId, Long examId, String courseCode, String courseName, String paperNumber, String paperType, PushTypeEnum type, String remark);
 
     void updateStatusAndResultById(Long id, TaskStatusEnum status, TaskResultEnum result, String errorMessage);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TBSyncTaskServiceImpl.java

@@ -77,7 +77,7 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
     }
 
     @Override
-    public TBSyncTask saveTask(Long schoolId, Long semesterId, Long examId, String paperNumber, String paperType, PushTypeEnum type, String remark) {
+    public TBSyncTask saveTask(Long schoolId, Long semesterId, Long examId, String courseCode, String courseName, String paperNumber, String paperType, PushTypeEnum type, String remark) {
         QueryWrapper<TBSyncTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TBSyncTask::getSchoolId, schoolId)
                 .eq(TBSyncTask::getSemesterId, semesterId)
@@ -100,6 +100,8 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
             tbSyncTask.setSchoolId(schoolId);
             tbSyncTask.setSemesterId(semesterId);
             tbSyncTask.setExamId(examId);
+            tbSyncTask.setCourseCode(courseCode);
+            tbSyncTask.setCourseName(courseName);
             tbSyncTask.setPaperNumber(paperNumber);
             tbSyncTask.setPaperType(paperType);
             tbSyncTask.setType(type);

distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -216,6 +216,7 @@
                 (SELECT *
                     from exam_detail t
                     <where>
+                        and t.normal = 1
                         <choose>
                             <when test="status != null and status != ''">
                                 and t.status = #{status}

distributed-print/install/config.ini

@@ -1,5 +1,5 @@
 [app]
-version=3.2.7
+version=3.3.0
 name=知学知考
 //浏览器访问入口
 portal=http://localhost:7400/
@@ -18,7 +18,7 @@ after=
 
 [upgrade]
 //升级支持的最小版本号，可以为空
-minmum_version=3.2.4
+minmum_version=3.2.7
 
 //与module配置对应，一个模块一组配置
 [print]

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkGroupClassProgressDto.java

@@ -8,7 +8,7 @@ public class MarkGroupClassProgressDto {
     private Integer markedCount;
     private Integer leftCount;
     private Integer currentCount;
-    private Double percent;
+    private String percent;
     private Integer arbitrateCount;
     private Integer groupNumber;
     private String groupQuestions;
@@ -61,11 +61,11 @@ public class MarkGroupClassProgressDto {
         this.currentCount = currentCount;
     }
 
-    public Double getPercent() {
+    public String getPercent() {
         return percent;
     }
 
-    public void setPercent(Double percent) {
+    public void setPercent(String percent) {
         this.percent = percent;
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkGroupProgressDto.java

@@ -9,7 +9,7 @@ public class MarkGroupProgressDto {
     private Integer markedCount;
     private Integer leftCount;
     private Integer currentCount;
-    private Double percent;
+    private String percent;
     private Integer arbitrateCount;
     private String groupQuestions;
 
@@ -69,11 +69,11 @@ public class MarkGroupProgressDto {
         this.currentCount = currentCount;
     }
 
-    public Double getPercent() {
+    public String getPercent() {
         return percent;
     }
 
-    public void setPercent(Double percent) {
+    public void setPercent(String percent) {
         this.percent = percent;
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkGroupTotalProgressDto.java

@@ -5,7 +5,7 @@ public class MarkGroupTotalProgressDto {
     private Integer studentCount;
     private Integer uploadCount;
     private Integer absentCount;
-    private Double percent;
+    private String percent;
 
     public Integer getStudentCount() {
         return studentCount;
@@ -31,11 +31,11 @@ public class MarkGroupTotalProgressDto {
         this.absentCount = absentCount;
     }
 
-    public Double getPercent() {
+    public String getPercent() {
         return percent;
     }
 
-    public void setPercent(Double percent) {
+    public void setPercent(String percent) {
         this.percent = percent;
     }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkManageDto.java

@@ -21,7 +21,7 @@ public class MarkManageDto {
      * 识别缺考未确认数量
      */
     private Integer omrAbsentCount;
-    private Double percent;
+    private String percent;
     private MarkPaperStatus status;
     private String statusDisplay;
 
@@ -89,11 +89,11 @@ public class MarkManageDto {
         this.omrAbsentCount = omrAbsentCount;
     }
 
-    public Double getPercent() {
+    public String getPercent() {
         return percent;
     }
 
-    public void setPercent(Double percent) {
+    public void setPercent(String percent) {
         this.percent = percent;
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkQualityDto.java

@@ -13,8 +13,9 @@ public class MarkQualityDto {
     private Integer groupNumber;
     private String groupQuestions;
     private Integer finishCount;
+    private Integer validCount;
     private Integer headerFinishCount;
-    private Double adoptionRate;
+    private String adoptionRate;
     private Integer avgSpeed;
     private Double avgScore;
     private Double maxScore;
@@ -76,6 +77,14 @@ public class MarkQualityDto {
         this.finishCount = finishCount;
     }
 
+    public Integer getValidCount() {
+        return validCount;
+    }
+
+    public void setValidCount(Integer validCount) {
+        this.validCount = validCount;
+    }
+
     public Integer getHeaderFinishCount() {
         return headerFinishCount;
     }
@@ -84,11 +93,11 @@ public class MarkQualityDto {
         this.headerFinishCount = headerFinishCount;
     }
 
-    public Double getAdoptionRate() {
+    public String getAdoptionRate() {
         return adoptionRate;
     }
 
-    public void setAdoptionRate(Double adoptionRate) {
+    public void setAdoptionRate(String adoptionRate) {
         this.adoptionRate = adoptionRate;
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkTaskService.java

@@ -29,8 +29,6 @@ public interface MarkTaskService extends IService<MarkTask> {
 
     Integer markedCount(List<MarkTask> groupNumberMarkTask);
 
-    Double calcPercent(Integer markedCount, Integer taskCount);
-
     int countByExamIdAndPaperNumberAndGroupNumberAndUserId(Long examId, String paperNumber, Integer groupNumber, Long userId);
 
     List<MarkTask> listByExamIdAndPaperNumberAndGroupNumberAndUserIdAndStatusNotIn(Long examId, String paperNumber, Integer groupNumber, Long userId, List<MarkTaskStatus> statusList);

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

@@ -160,6 +160,9 @@ public class MarkArbitrateHistoryServiceImpl extends ServiceImpl<MarkArbitrateHi
         MarkArbitrateHistory markArbitrateHistory;
         if (arbitrateId != null) {
             markArbitrateHistory = this.getById(arbitrateId);
+            if (MarkArbitrateStatus.MARKED.equals(markArbitrateHistory.getStatus())) {
+                throw ExceptionResultEnum.ERROR.exception("数据已处理，请刷新数据列表");
+            }
         } else {
             if (examId == null || StringUtils.isBlank(paperNumber) || groupNumber == null) {
                 throw ExceptionResultEnum.ERROR.exception("参数有误");

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

@@ -26,6 +26,7 @@ import com.qmth.teachcloud.mark.enums.ScorePolicy;
 import com.qmth.teachcloud.mark.lock.LockService;
 import com.qmth.teachcloud.mark.mapper.MarkGroupMapper;
 import com.qmth.teachcloud.mark.service.*;
+import com.qmth.teachcloud.mark.utils.Calculator;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -179,7 +180,7 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
 
         int totalCount = markStudentService.countByExamIdAndPaperNumberAndMarkStatus(examId, paperNumber, null);
         int markedCount = markStudentService.countByExamIdAndPaperNumberAndMarkStatus(examId, paperNumber, SubjectiveStatus.MARKED);
-        markGroupTotalProgressDto.setPercent(markTaskService.calcPercent(markedCount, totalCount));
+        markGroupTotalProgressDto.setPercent(Calculator.divide2String(Calculator.multiply(markedCount, 100), Double.valueOf(totalCount), 2));
         markGroupSummaryProgressDto.setTotalInfo(markGroupTotalProgressDto);
 
         // groupInfo
@@ -197,7 +198,7 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
             markGroupProgressDto.setMarkedCount(markGroup.getMarkedCount());
             markGroupProgressDto.setLeftCount(markGroupProgressDto.getTaskCount() - markGroupProgressDto.getMarkedCount());
             markGroupProgressDto.setCurrentCount(markService.applyCurrentCount(markGroup));
-            markGroupProgressDto.setPercent(markTaskService.calcPercent(markGroupProgressDto.getMarkedCount(), markGroupProgressDto.getTaskCount()));
+            markGroupProgressDto.setPercent(Calculator.divide2String(Calculator.multiply(markGroupProgressDto.getMarkedCount(), 100), Double.valueOf(markGroupProgressDto.getTaskCount()), 2));
             markGroupProgressDto.setArbitrateCount(markArbitrateHistoryService.waitArbitrateCount(examId, paperNumber, markGroup.getNumber(), null));
             markGroupProgressDtoList.add(markGroupProgressDto);
         }
@@ -238,7 +239,7 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
                 markGroupClassProgressDto.setMarkedCount(markTaskService.markedCount(totalMarkTaskList));
                 markGroupClassProgressDto.setLeftCount(markGroupClassProgressDto.getTaskCount() - markGroupClassProgressDto.getMarkedCount());
                 markGroupClassProgressDto.setCurrentCount(count);
-                markGroupClassProgressDto.setPercent(markTaskService.calcPercent(markGroupClassProgressDto.getMarkedCount(), markGroupClassProgressDto.getTaskCount()));
+                markGroupClassProgressDto.setPercent(Calculator.divide2String(Calculator.multiply(markGroupClassProgressDto.getMarkedCount(), 100), Double.valueOf(markGroupClassProgressDto.getTaskCount()), 2));
                 markGroupClassProgressDto.setArbitrateCount(arbitrateCount);
             }
             return markGroupClassProgressDtoIPage;
@@ -294,8 +295,7 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
             if (markGroupDto.getScorePolicy() == null) {
                 throw ExceptionResultEnum.ERROR.exception("开启双评，合分规则必填");
             }
-            String format = new DecimalFormat("####.##").format(markGroupDto.getDoubleRate());
-            markGroup.setDoubleRate(Double.parseDouble(format));
+            markGroup.setDoubleRate(Calculator.round(markGroupDto.getDoubleRate(), 2));
             markGroup.setArbitrateThreshold(markGroupDto.getArbitrateThreshold());
             markGroup.setScorePolicy(markGroupDto.getScorePolicy());
         } else {

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

@@ -250,7 +250,7 @@ public class MarkServiceImpl implements MarkService {
         double maxScore = 0;
         double minScore = 0;
         for (MarkTask markTask : list) {
-            if (!markTask.getStatus().equals(MarkTaskStatus.PROBLEM) && !markTask.getStatus().equals(MarkTaskStatus.WAIT_ARBITRATE)) {
+            if (!markTask.getStatus().equals(MarkTaskStatus.PROBLEM)) {
                 finishCount++;
             }
             if (markTask.getHeaderId() != null) {

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

@@ -198,9 +198,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         }
         Page<StudentScoreDetailDto> page = new Page<>(pageNumber, pageSize);
         MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(examId, paperNumber);
-        Double objectiveScoreLt = objectiveScoreRateLt == null ? null
-                : Double.parseDouble(new DecimalFormat("####.##")
-                .format(markPaper.getObjectiveScore() * objectiveScoreRateLt / 100));
+        Double objectiveScoreLt = objectiveScoreRateLt == null ? null : Calculator.round(Calculator.divide(Calculator.multiply(markPaper.getObjectiveScore(), Double.parseDouble(String.valueOf(objectiveScoreRateLt))), 100), 2);
         IPage<StudentScoreDetailDto> studentScoreDetailDtoIPage = this.baseMapper.pageStudentScore(page, examId,
                 paperNumber, college, className, teacher, filter, absent, breach, startScore, endScore, subScore,
                 objectiveScoreLt, studentName, studentCode, orderType, orderField);

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

@@ -21,6 +21,7 @@ import com.qmth.teachcloud.mark.entity.MarkTask;
 import com.qmth.teachcloud.mark.enums.MarkTaskStatus;
 import com.qmth.teachcloud.mark.mapper.MarkTaskMapper;
 import com.qmth.teachcloud.mark.service.*;
+import com.qmth.teachcloud.mark.utils.Calculator;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -63,7 +64,7 @@ public class MarkTaskServiceImpl extends ServiceImpl<MarkTaskMapper, MarkTask> i
             record.setMarkedCount(markedCount);
             record.setStatusDisplay(record.getStatus() == null ? null : record.getStatus().getName());
             record.setOmrAbsentCount(markStudentService.countOmrAbsentStudent(record.getExamId(), record.getPaperNumber(), record.getPaperType(), false));
-            record.setPercent(calcPercent(record.getMarkedCount(), record.getTotalCount()));
+            record.setPercent(Calculator.divide2String(Calculator.multiply(record.getMarkedCount(), 100), Double.valueOf(record.getTotalCount()), 2));
         }
         return markManageDtoIPage;
     }
@@ -98,12 +99,6 @@ public class MarkTaskServiceImpl extends ServiceImpl<MarkTaskMapper, MarkTask> i
         return (int) count;
     }
 
-    @Override
-    public Double calcPercent(Integer markedCount, Integer taskCount) {
-        String percent = taskCount > 0 ? new DecimalFormat("####.##").format(markedCount * 100.0 / taskCount) : "0";
-        return Double.parseDouble(percent);
-    }
-
     @Override
     public int countByExamIdAndPaperNumberAndGroupNumberAndUserId(Long examId, String paperNumber, Integer groupNumber, Long userId) {
         QueryWrapper<MarkTask> queryWrapper = new QueryWrapper<>();

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

@@ -25,6 +25,7 @@ import com.qmth.teachcloud.mark.enums.LockType;
 import com.qmth.teachcloud.mark.lock.LockService;
 import com.qmth.teachcloud.mark.mapper.MarkUserGroupMapper;
 import com.qmth.teachcloud.mark.service.*;
+import com.qmth.teachcloud.mark.utils.Calculator;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -221,10 +222,8 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
                 qualityDto.setLoginName(sysUser.getLoginName());
                 qualityDto.setName(sysUser.getRealName());
                 qualityDto.setOrgName(sysUser.getOrgName());
-                String percent = qualityDto.getFinishCount() > 0 ? new DecimalFormat("####.##").format((qualityDto.getFinishCount() - qualityDto.getHeaderFinishCount()) * 100.0 / qualityDto.getFinishCount()) : "0";
-                qualityDto.setAdoptionRate(Double.parseDouble(percent));
-                String avgScore = qualityDto.getAvgScore() != null && qualityDto.getAvgScore() > 0 ? new DecimalFormat("####.##").format(qualityDto.getAvgScore()) : "0";
-                qualityDto.setAvgScore(Double.parseDouble(avgScore));
+                qualityDto.setAdoptionRate(Calculator.divide2String(Calculator.multiply(qualityDto.getValidCount(), 100), Double.valueOf(qualityDto.getFinishCount()), 2));
+                qualityDto.setAvgScore(Calculator.round(qualityDto.getAvgScore(), 2));
             }
         }
         return markQualityDtoIPage;
@@ -283,10 +282,10 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
             SysUser sysUser = sysUserService.getById(markUserGroup.getUserId());
             markQualityChartDto.setLoginName(sysUser.getLoginName());
             markQualityChartDto.setName(sysUser.getRealName());
-            markQualityChartDto.setTotalAvgScore(Double.parseDouble(new DecimalFormat("####.##").format(totalAvgScore)));
-            markQualityChartDto.setAvgScore(markUserGroup.getAvgScore() == null ? null : Double.parseDouble(new DecimalFormat("####.##").format(markUserGroup.getAvgScore())));
-            markQualityChartDto.setMaxScore(markUserGroup.getMaxScore() == null ? null : Double.parseDouble(new DecimalFormat("####.##").format(markUserGroup.getMaxScore())));
-            markQualityChartDto.setMinScore(markUserGroup.getMinScore() == null ? null : Double.parseDouble(new DecimalFormat("####.##").format(markUserGroup.getMinScore())));
+            markQualityChartDto.setTotalAvgScore(Calculator.round(totalAvgScore, 2));
+            markQualityChartDto.setAvgScore(markUserGroup.getAvgScore() == null ? null : Calculator.round(markUserGroup.getAvgScore(), 2));
+            markQualityChartDto.setMaxScore(markUserGroup.getMaxScore() == null ? null : Calculator.round(markUserGroup.getMaxScore(), 2));
+            markQualityChartDto.setMinScore(markUserGroup.getMinScore() == null ? null : Calculator.round(markUserGroup.getMinScore(), 2));
             markQualityChartDtoList.add(markQualityChartDto);
         }
         return markQualityChartDtoList;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/utils/Calculator.java

@@ -169,11 +169,11 @@ public class Calculator {
 
     public static String divide2String(Double v1, Double v2, int len) {
         if (v1 == null || v2 == null || v2 == 0) {
-            return "-";
+            return "0";
         }
         BigDecimal b1 = new BigDecimal(v1);
         BigDecimal b2 = new BigDecimal(v2);
-        return String.valueOf(b1.divide(b2, len, BigDecimal.ROUND_HALF_UP).doubleValue());
+        return b1.divide(b2, len, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
     }
 
     public static Double round(Double value, int length) {

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

@@ -115,6 +115,7 @@
             mug.user_id userId,
             mug.group_number groupNumber,
             ifnull(mug.finish_count, 0) finishCount,
+            ifnull(mug.valid_count, 0) validCount,
             ifnull(mug.header_finish_count, 0) headerFinishCount,
             mug.avg_score avgScore,
             mug.max_score maxScore,

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/impl/JobServiceImpl.java

@@ -151,7 +151,7 @@ public class JobServiceImpl implements JobService {
         List<ExamDetailCourseInitMarkDto> examDetailCourseInitMarkDtoList = examDetailService.listPrintFinishExamDetailCourse(ExamDetailStatusEnum.FINISH.name(), startTime, MarkPaperStatus.FINISH.name());
         for (ExamDetailCourseInitMarkDto dto : examDetailCourseInitMarkDtoList) {
             for (String paperType : dto.getPaperType().split(",")) {
-                TBSyncTask tbSyncTask = tbSyncTaskService.saveTask(dto.getSchoolId(), dto.getSemesterId(), dto.getExamId(), dto.getPaperNumber(), paperType, PushTypeEnum.INIT_MARK_DATA, "");
+                TBSyncTask tbSyncTask = tbSyncTaskService.saveTask(dto.getSchoolId(), dto.getSemesterId(), dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber(), paperType, PushTypeEnum.INIT_MARK_DATA, "");
                 try {
                     printFinishService.insertMarkPaper(dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber(), dto.getCoursePaperId(), dto.getPackageCodes(), dto.getCreateId(), paperType);
                     printFinishService.insertMarkStudent(dto, paperType);