f

db/.back_文明创办/文明创办-backup-2023323142415.pdma.json → db/.back_文明创办/文明创办-backup-2023415134743.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-23 14:23:34",
+  "updatedTime": "2023-3-30 10:05:54",
   "dbConns": [],
   "profile": {
     "default": {
@@ -493,7 +493,8 @@
         "refKey": "extProps",
         "hideInGraph": true
       }
-    ]
+    ],
+    "modelType": "modalGroup"
   },
   "entities": [
     {
@@ -3911,6 +3912,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "7FF626A4-AF1C-4CF5-B356-D46DB6D534B3"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "复制来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
         }
       ],
       "correlations": [],
@@ -5471,6 +5489,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "4D9B5070-3252-4714-86D7-34928A0C5552"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "0279B08D-E12C-4409-8253-A5D7766A7133"
         }
       ],
       "correlations": [],
@@ -6460,6 +6495,23 @@
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "A8365D64-DE0A-4F0E-9427-83DFF0ED66C6"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "E2BA367C-D262-43FB-A729-D26D6453D20C"
         }
       ],
       "correlations": [],
@@ -7685,6 +7737,23 @@
           "refDict": "",
           "extProps": {},
           "id": "90218D19-7731-4AFE-8883-74944A66D6C8"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "拷贝来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "id": "C0B26905-831F-4891-9B83-F84E4D111C44"
         }
       ],
       "correlations": [],

db/文明创办.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-30 10:05:54",
+  "updatedTime": "2023-4-15 13:47:43",
   "dbConns": [],
   "profile": {
     "default": {
@@ -494,7 +494,8 @@
         "hideInGraph": true
       }
     ],
-    "modelType": "modalGroup"
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {

src/main/java/com/example/civilizedcity/entity/TdQuestion.java

@@ -37,7 +37,7 @@ public class TdQuestion implements Serializable,Cloneable{
      private String title ;
      /** 正确答案 */
      @ApiModelProperty(name = "正确答案",notes = "")
-     private String rightAnswers ;
+          private String rightAnswers ;
      /** 状态 */
      @ApiModelProperty(name = "状态",notes = "")
      private Integer status ;

src/main/java/com/example/civilizedcity/mapper/TaCheckItemMapper.java

@@ -26,4 +26,6 @@ public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
      List<TaCheckItem> getListBy(@Param("checkId") String checkId, @Param("itemType") String itemType);
 
     long copyItems(@Param("oldCheckId") String oldCheckId, @Param("newCheckId") String newCheckId);
+
+    double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
 }

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

@@ -84,95 +84,88 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             throw new Exception("验证部分题干信息出错");
         }
 
-        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
-            // 如果是实地问卷, 试卷份数不能多于规定份数
-            int count = taCheckAnswerMapper.countByItem(taCheckItem.getItemId());
-            if (count >= taCheckItem.getNum()) {
-                throw new Exception("当前实地问卷已收齐, 无须作答");
-            }
-        }
-
-        // 答题的时候, 顺便把问题单生成好
-        double[] scores = answerItems(taCheckItem, taCheckAnswer, quList, answerItemList, sysUser);
-
-        if (Constants.CHECK_OF_SURVEY.equals(taCheckItem.getItemType())) {
-            // 调查问卷不需要计算当前试卷的分数, 最后才能计算出来
-            taCheckAnswerMapper.insert(taCheckAnswer);
-
-//            // 但是需要更新答卷份数
+//        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+//            // 如果是实地问卷, 试卷份数不能多于规定份数
 //            int count = taCheckAnswerMapper.countByItem(taCheckItem.getItemId());
-//            taCheckItem.setNum(count);
-//            updateById(taCheckItem);
-            return;
-        }
-
-        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
-            // 实地调查, 需要计算当前这份试卷的分数
-            double positiveScore = scores[0];
-            double negativeScore = scores[1];
-
-            // 每份试卷的得分 = 总分 / 份数
-            double maxScore = taCheckItem.getFullScore()  / taCheckItem.getNum();
-            double score = negativeScore + positiveScore;
-//
-            if (score > 0) {
-                // 没有扣分就是满分
-                score = maxScore;
-            } else {
-                // 有扣分项, 总分 - 扣分
-                score = maxScore + score;
-            }
-
-            // 如果得分超过总分
-            if (score > maxScore) {
-                score = maxScore;
-            }
-
-            taCheckAnswer.setScore(score);
-            taCheckAnswerMapper.insert(taCheckAnswer);
-        }
+//            if (count >= taCheckItem.getNum()) {
+//                throw new Exception("当前实地问卷已收齐, 无须作答");
+//            }
+//        }
+
+        // 计算每一题的得分， 以及总分
+        // 并同步生成问题单
+        double score = calcAnswerItems(sysUser, taCheckItem, taCheckAnswer, quList, answerItemList);
+        taCheckAnswer.setScore(score);
+        taCheckAnswerMapper.insert(taCheckAnswer);
     }
 
     /**
-     * 计算每份试卷份数
+     * 作答计算分数
+     * 试卷总分 = 每一题分数求和
+     * 选择题分数 = 选中的选项分数
+     * 填空题分数 = 填写的数字 * 对应的分值
+     * @param sysUser
      * @param taCheckItem
      * @param taCheckAnswer
+     * @param quList
+     * @param answerItemList
      * @throws Exception
      */
-    private double[] answerItems(TaCheckItem taCheckItem,
-                                 TaCheckAnswer taCheckAnswer,
-                                 List<TaCheckItemQu> quList,
-                                 List<TaCheckAnswerItem> answerItemList,
-                                 SysUser sysUser
-    ) throws Exception {
+    private double calcAnswerItems(
+            SysUser sysUser,
+            TaCheckItem taCheckItem,
+            TaCheckAnswer taCheckAnswer,
+            List<TaCheckItemQu> quList,
+            List<TaCheckAnswerItem> answerItemList
+    ) throws Exception{
         LocalDateTime now = LocalDateTime.now();
-        double negativeScore = 0.0; // 扣分
-        double positiveScore = 0.0; // 得分
+        //题目分值
+        double totalScore = 0.0;
         for(TaCheckAnswerItem item : answerItemList) {
-            boolean mustCreateIssue = false;
+            // 每一题分值
+            double score = 0.0;
             // 找到对应的题目
             TaCheckItemQu qu = getQu(quList, item.getQuId());
             // 如果是选择题, 对应的答案
             TaCheckItemAn standAn = null;
-            // + 代表得分, 否则代表扣分
-            int sign = "+".equals(qu.getComputeType()) ? 1 : -1;
 
-            double score = 0.0;
             if (Constants.QU_OF_FILL.equals(qu.getQuType())) {
                 // 如果是填空题, 用户填的应该是数字, 没填就是 0
-                Double an = StringUtils.isEmpty(item.getAnswer()) ? 0.0 : Double.parseDouble(item.getAnswer());
-                score = an * qu.getAnScore();
+                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;
+                }
             } else if (Constants.QU_OF_RADIO.equals(qu.getQuType())) {
                 // 如果是选择题, 找到对应的答案
                 standAn = taCheckItemAnMapper.getOneBy(qu.getQuId(), item.getAnswerCode());
-
                 score = standAn.getScore();
             }
 
+            // 如果得分超过最大值
             if (score > qu.getMaxScore()) {
                 score = qu.getMaxScore();
             }
-            score *= sign;
+
+            // 判断是否需要生成问题单
+            boolean isIssue = false;
+            if (score < qu.getMaxScore()) {
+                // 如果当前这个题目, 没有得到满分, 就生成问题单
+                isIssue = true;
+            }
+
+            // 每份试卷的分数 = 各题目的分数求和
+            totalScore += score;
 
             item.setItemId(StringUtils.uuid());
             item.setAnswerId(taCheckAnswer.getAnswerId());
@@ -182,13 +175,6 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             item.setStatus(Constants.STATUS_NORMAL);
             taCheckAnswerItemMapper.insert(item);
 
-            if (score > 0) {
-                positiveScore += score;
-            } else {
-                mustCreateIssue = true;
-                negativeScore += score;
-            }
-
             // 保存附件
             if (null != item.getAttachList()) {
                 for (TaAttach taAttach : item.getAttachList()) {
@@ -202,13 +188,13 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
                 }
             }
 
-            // 如果得分小于0, 说明是扣分项, 生成问题单
-            if (mustCreateIssue && Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+            // 点位问题，生成问题单
+            if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType()) && isIssue) {
                 createNewIssue(sysUser, taCheckItem, qu, standAn, taCheckAnswer, item);
             }
         }
 
-        return new double[] {positiveScore, negativeScore};
+        return totalScore;
     }
 
     private void createNewIssue(SysUser sysUser,

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

@@ -38,16 +38,15 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
     public TaCheck calcScore(TaCheck taCheck) {
 
         // 调查问卷分数
-        double surveyScore = calcSurveyScore(taCheck);
+        double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
 
         // 计算点位分数
-        double locScore = calcLocScore(taCheck);
+        double locScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
 
         taCheck.setLocScore(locScore);
         taCheck.setSurveyScore(surveyScore);
 
         updateById(taCheck);
-
         return taCheck;
     }
 
@@ -78,132 +77,4 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
         return newCheck;
     }
 
-    /**
-     * 计算点位分数
-     * 计算的前提是, 每份试卷（ta_check_answer）的分数已经计算好了
-     * @param taCheck
-     * @return
-     */
-    private double calcLocScore(TaCheck taCheck) {
-        List<TaCheckItem> checkItemList = taCheckItemMapper.getListBy(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
-        if (null == checkItemList || checkItemList.size() == 0) return 0.0;
-
-        // 所有试卷得分的和
-        double totalScore = 0.0;
-        for (TaCheckItem checkItem : checkItemList) {
-            Double score = taCheckAnswerMapper.sumScore(checkItem.getItemId(), checkItem.getNum());
-            double s = null == score ? 0.0 : score;
-
-            checkItem.setScore(s);
-            taCheckItemMapper.updateById(checkItem);
-
-            totalScore += s;
-        }
-
-        return totalScore;
-    }
-
-    /**
-     * 计算调查问卷分数
-     * 计算的前提是, 每个题目（ta_check_answer_item）的分数已经计算好了
-     * 暂仅支持选择题算法
-     * 总分数 = 100 / 问卷分数 / 每份问卷的题数
-     * @param taCheck
-     * @return
-     */
-    private double calcSurveyScore(TaCheck taCheck) {
-        // 目前的需求, 此处应该只能查询到一条数据
-        List<TaCheckItem> checkItemList = taCheckItemMapper.getListBy(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
-        if (null == checkItemList || checkItemList.size() == 0) return 0.0;
-
-        // 所有问卷得分的和
-        double totalScore = 0.0;
-        for (TaCheckItem checkItem : checkItemList) {
-            // 问卷份数
-            List<TaCheckAnswer> answerList = taCheckAnswerMapper.getListByLimit(checkItem.getItemId(), checkItem.getNum());
-            if (answerList == null || answerList.size() == 0) continue;
-            int copyNum = answerList.size();
-
-            // 题目数
-            List<TaCheckItemQu> quList = taCheckItemQuMapper.getListBy(checkItem.getItemId());
-            if (quList == null || quList.size() == 0) continue;
-            int quNum = quList.size();
-
-            // 每份试卷的最大分数
-            double maxItemScore = 100.00 / copyNum;
-            // 每题的最大分数
-            double maxStandScore = maxItemScore / quNum;
-
-            // 总分
-            double score = 0.0;
-            for (TaCheckAnswer answer : answerList) {
-                // 获取答案列表
-                List<TaCheckAnswerItem> answerItemList = taCheckAnswerItemMapper.getListBy(answer.getAnswerId());
-                if (null == answerItemList || answerItemList.size() == 0) continue;
-
-                // 每份试卷得分
-                double quScore = 0.0;
-                for (TaCheckAnswerItem answerItem : answerItemList) {
-                    if (null == answerItem.getScore() || isZero(answerItem.getScore())) {
-                        // 如果得分是 0
-                        continue;
-                    }
-
-                    // 查询对应的问题
-                    TaCheckItemQu qu = getQu(quList, answerItem.getQuId());
-                    if (null == qu) continue;   // 找不到对应题目不计算
-                    if (null == qu.getMaxScore() || isZero(qu.getMaxScore())) continue; // 题目没有维护最大分数, 不计算
-
-                    // 计算转换比
-                    double ratio = maxStandScore / qu.getMaxScore();
-
-                    // 当前得分
-                    double s = answerItem.getScore();
-//                    double s = Math.abs(answerItem.getScore()) > qu.getMaxScore() ?  qu.getMaxScore() : answerItem.getScore();
-//                    if (answerItem.getScore() < 0) {
-//                        // 在与最大值的比较过程中, 最大值是正数, 有可能改变得分的符号
-//                        // 所以此处要纠正过来
-//                        s = 0 - Math.abs(s);
-//                    }
-
-                    // 分值
-                    quScore += s * ratio;
-                }
-
-                // 不能超过试卷的最大分数
-                if (quScore > maxItemScore) {
-                    quScore = maxItemScore;
-                }
-
-                answer.setScore(quScore);
-                taCheckAnswerMapper.updateById(answer);
-
-                // 分值
-                score += quScore;
-            }
-
-            // 调查问卷理论上不会出现分数为负的情况
-            if (score < 0) {
-                score = maxItemScore + score;
-                if (score < 0) {
-                    score = 0;
-                }
-            }
-
-            checkItem.setScore(score);
-            taCheckItemMapper.updateById(checkItem);
-
-            totalScore += score;
-        }
-
-        return totalScore;
-    }
-
-    private TaCheckItemQu getQu(List<TaCheckItemQu> quList, String quId) {
-        return quList.stream().filter(q -> q.getQuId().equals(quId)).findFirst().orElse(null);
-    }
-
-    private boolean isZero(Double d) {
-        return Math.abs(d) < 0.0001;
-    }
 }

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -89,4 +89,14 @@
           AND t.item_type = #{itemType}
           AND t.`status` > -1
     </select>
+    <select id="sumScore" resultType="java.lang.Double">
+        SELECT
+            SUM(t.score)
+        FROM
+            ta_check_item t
+        WHERE
+            t.check_id = #{checkId}
+          AND t.item_type = #{itemType}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>