feats

src/main/java/com/example/civilizedcity/common/NumberUtil.java

@@ -0,0 +1,8 @@
+package com.example.civilizedcity.common;
+
+public class NumberUtil {
+
+    public static boolean isZero(double d) {
+        return d > 0 && d < 1e-6;
+    }
+}

src/main/java/com/example/civilizedcity/service/impl/TaCheckItemServiceImpl.java

@@ -2,6 +2,7 @@ package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.NumberUtil;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.mapper.*;
@@ -145,24 +146,15 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             TaCheckItemQu qu = getQu(quList, item.getQuId());
             // 如果是选择题, 对应的答案
             TaCheckItemAn standAn = null;
+            // 是否扣分题
+            String computeType = qu.getComputeType();
 
             if (Constants.QU_OF_FILL.equals(qu.getQuType())) {
                 // 如果是填空题, 用户填的应该是数字, 没填就是 0
                 Double fillNum = StringUtils.isEmpty(item.getAnswer()) ? 0.0 : Double.parseDouble(item.getAnswer());
 
                 // 填空得分 = 填空的数字 * 每个数字的分数
-                Double fillScore = fillNum * qu.getAnScore();
-
-                // 如果是扣分项, 那么得分 = 总分 - 扣分
-                if (fillScore < 0) {
-                    score = qu.getMaxScore() + fillScore;
-                    if (score < 0) {
-                        score = 0;
-                    }
-                } else {
-                    // 如果是得分项， 那么 分数 = 得分
-                    score = fillScore;
-                }
+                score = fillNum * qu.getAnScore();
             } else if (Constants.QU_OF_RADIO.equals(qu.getQuType())) {
                 // 如果是选择题, 找到对应的答案
                 standAn = taCheckItemAnMapper.getOneBy(qu.getQuId(), item.getAnswerCode());
@@ -174,6 +166,14 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
                 score = qu.getMaxScore();
             }
 
+            // 如果是扣分项
+            if ("-".equals(computeType)) {
+                score = qu.getMaxScore() + score;
+                if (score < 0) {
+                    score = 0;
+                }
+            }
+
             // 判断是否需要生成问题单
             boolean isIssue = false;
             if (score < qu.getMaxScore()) {

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -121,24 +121,9 @@
     </select>
     <select id="sumScore" resultType="java.lang.Double">
         SELECT
-            IF (
-                sum( m.cnt ) IS NULL OR sum( m.cnt ) = 0 ,
-                0 ,
-                SUM( t.score ) / SUM( m.cnt )
-            )
+            SUM( t.score )
         FROM
             ta_check_item t
-                LEFT JOIN (
-                SELECT
-                    s.item_id,
-                    count(*) AS cnt
-                FROM
-                    ta_check_answer s
-                WHERE
-                    s.`status` > - 1
-                GROUP BY
-                    s.item_id
-                ) m ON t.item_id = m.item_id
         WHERE
             t.check_id = #{checkId}
           AND t.item_type = #{itemType}