diff --git a/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java b/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java index 92f4aa9..0503324 100644 --- a/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java +++ b/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java @@ -137,10 +137,11 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { */ @Override public void hashLearningAssessmentScore(StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO) { + //查询做题记录 StuAssessmentQuestionDetailsExample detailsExample = new StuAssessmentQuestionDetailsExample(); detailsExample.createCriteria().andUserIdEqualTo(stuLearningAssessmentScoreDTO.getUserId()); List stuAssessmentQuestionDetails = stuAssessmentQuestionDetailsMapper.selectByExample(detailsExample); - if (stuAssessmentQuestionDetails.size() != 0) { + if (!stuAssessmentQuestionDetails.isEmpty()) { StuLearningAssessmentExample example1 = new StuLearningAssessmentExample(); StuLearningAssessmentExample.Criteria criteria1 = example1.createCriteria(); criteria1.andModuleEqualTo(stuLearningAssessmentScoreDTO.getModule()); @@ -226,9 +227,9 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { details.setModule(stuLearningAssessmentScoreDTO.getModule()); if (saw.equals(string)) { details.setRightOrWrong("正确"); + count++; } else { details.setRightOrWrong("错误"); - count++; } stuAssessmentQuestionDetailsMapper.insert(details); } diff --git a/src/main/java/com/sztzjy/marketing/util/compute/ScoringUtil.java b/src/main/java/com/sztzjy/marketing/util/compute/ScoringUtil.java index 7e6013b..1fbc23b 100644 --- a/src/main/java/com/sztzjy/marketing/util/compute/ScoringUtil.java +++ b/src/main/java/com/sztzjy/marketing/util/compute/ScoringUtil.java @@ -61,18 +61,17 @@ public class ScoringUtil { /** * 计算学习测评分数 - * @param v1 错误个数 - * @param v2 每对错一题所扣分数 + * @param v1 正确个数 + * @param v2 每对一题所得分数 * @return */ public double getStuLearningAssessmentScoring(int v1,double v2){ - Double fraction=0.00; + double mul = bigDecimalUtils.mul(v1, v2, 1); - fraction=100-mul; - if(fraction<0){ - return 0; + if(mul>100){ + return 100; } - return fraction; + return mul; } public double getStuTrainingScoring(int v1,double v2){