feats

db/.back_文明创办/文明创办-backup-202312223659.pdma.json → db/.back_文明创办/文明创办-backup-202317194605.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.2.0",
+  "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-2 20:52:56",
+  "updatedTime": "2023-1-4 09:07:35",
   "dbConns": [],
   "profile": {
     "default": {
@@ -8108,6 +8108,23 @@
           "uiHint": "",
           "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
         },
+        {
+          "defKey": "msg_type",
+          "defName": "消息类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "92ACF22A-5638-4B62-9656-71D9089F7D7E"
+        },
         {
           "defKey": "title",
           "defName": "消息标题",

db/.back_文明创办/文明创办-backup-202312205256.pdma.json → db/.back_文明创办/文明创办-backup-202317202536.pdma.json

@@ -2,9 +2,9 @@
   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.2.0",
+  "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-2 20:51:00",
+  "updatedTime": "2023-1-7 19:46:05",
   "dbConns": [],
   "profile": {
     "default": {
@@ -7985,9 +7985,38 @@
       "id": "430EE745-314D-48CE-A20B-ED2C4D79BC92",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaMessage"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": true
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": true
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": true
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_message",
       "defName": "消息通知",
@@ -8063,7 +8092,7 @@
       ],
       "fields": [
         {
-          "defKey": "id",
+          "defKey": "msg_id",
           "defName": "ID",
           "comment": "",
           "type": "",
@@ -8079,6 +8108,23 @@
           "uiHint": "",
           "id": "FC7B9B05-7D57-4818-8266-F8A4D62DB212"
         },
+        {
+          "defKey": "msg_type",
+          "defName": "消息类型",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "92ACF22A-5638-4B62-9656-71D9089F7D7E"
+        },
         {
           "defKey": "title",
           "defName": "消息标题",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-1-4 09:07:35",
+  "updatedTime": "2023-1-7 20:25:36",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4748,6 +4748,40 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
+        {
+          "defKey": "loc_score",
+          "defName": "实地测评得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "D4F39D10-19B6-49F6-A398-D9278355E747"
+        },
+        {
+          "defKey": "survey_score",
+          "defName": "调查问卷得分",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "F2E17D81-03A9-42C4-8DD7-732C8D40DC59"
+        },
         {
           "defKey": "start_date",
           "defName": "开始日期",

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

@@ -8,11 +8,6 @@ public class Constants {
     public final static int STATUS_READY = 0;
     public final static int STATUS_NORMAL = 1;
 
-
-    public final static String CHECK_ITEM_LOC = "loc";  // 实例调研
-    public final static String CHECK_ITEM_SURVEY = "survey";  // 问卷调研
-
-
     // 操作员身份
     // 督察员
     public final static String DUTY_INSPECTOR = "inspector";
@@ -87,4 +82,8 @@ public class Constants {
     public final static String MESSAGE_TARGET_ISSUE = "issue";
     // 申请流程
     public final static String MESSAGE_TARGET_APPLY = "apply";
+
+    // 调查问卷
+    public final static String CHECK_OF_LOC = "loc"; // 实地调查
+    public final static String CHECK_OF_SURVEY = "survey"; // 调查问卷
 }

src/main/java/com/example/civilizedcity/controller/TaCheckController.java

@@ -108,6 +108,25 @@ public class TaCheckController extends BaseController {
         return ResponseBean.success(taCheck);
     }
 
+
+    /**
+     * 计算分数
+     *
+     * @param id 实例ID
+     * @return 实例对象
+     */
+    @ApiOperation("计算分数")
+    @PutMapping("/taCheck/{id}/score")
+    public ResponseBean calcScore(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaCheck taCheck = taCheckService.getById(id);
+        if (null == taCheck || taCheck.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到模拟测评信息");
+        }
+
+        taCheckService.calcScore(taCheck);
+        return ResponseBean.success(taCheck);
+    }
+
     /**
      * 通过主键删除数据
      *

src/main/java/com/example/civilizedcity/controller/TaCheckItemController.java

@@ -67,7 +67,7 @@ public class TaCheckItemController extends BaseController {
      private TaCheckItem getByCheckAndType(String checkId, String typeId) {
          QueryWrapper<TaCheckItem> queryWrapper = new QueryWrapper<>();
          queryWrapper.eq("check_id", checkId);
-         queryWrapper.eq("item_type", Constants.CHECK_ITEM_LOC); // 只查点位
+         queryWrapper.eq("item_type", Constants.CHECK_OF_LOC); // 只查点位
          queryWrapper.eq("type_id", typeId);
          queryWrapper.gt("status", Constants.STATUS_DELETE);
 
@@ -108,7 +108,7 @@ public class TaCheckItemController extends BaseController {
             return ResponseBean.error("测评类型不能为空");
         }
 
-        if ("loc".equals(taCheckItem.getItemType()) && StringUtils.isEmpty(taCheckItem.getTypeId())) {
+        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType()) && StringUtils.isEmpty(taCheckItem.getTypeId())) {
             return ResponseBean.error("测评点位不能为空");
         }
 

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

@@ -33,6 +33,12 @@ public class TaCheck implements Serializable,Cloneable{
       /** 总分 */
       @ApiModelProperty(name = "总分",notes = "")
       private Integer score ;
+       /** 实地测评得分 */
+       @ApiModelProperty(name = "实地测评得分",notes = "")
+       private Double locScore ;
+       /** 调查问卷得分 */
+       @ApiModelProperty(name = "调查问卷得分",notes = "")
+       private Double surveyScore ;
       /** 开始日期;YYYY-MM-DD */
       @ApiModelProperty(name = "开始日期",notes = "YYYY-MM-DD")
       private String startDate ;

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

@@ -5,12 +5,15 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckAnswerItem;
 
- /**
+import java.util.List;
+
+/**
  * 测评作答详情;(ta_check_answer_item)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 @Mapper
 public interface TaCheckAnswerItemMapper  extends BaseMapper<TaCheckAnswerItem>{
-    
-}
+
+     List<TaCheckAnswerItem> getListBy(@Param("answerId") String answerId);
+ }

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

@@ -5,12 +5,19 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckAnswer;
 
- /**
+import java.util.List;
+
+/**
  * 测评作答;(ta_check_answer)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 @Mapper
 public interface TaCheckAnswerMapper  extends BaseMapper<TaCheckAnswer>{
-    
+
+     Integer countByItem(@Param("itemId") String itemId);
+
+     List<TaCheckAnswer> getListBy(@Param("itemId") String itemId);
+
+    Double sumScore(@Param("itemId") String itemId, @Param("num") Integer num);
 }

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

@@ -6,7 +6,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckItem;
 
- /**
+import java.util.List;
+
+/**
  * 测评点位;(ta_check_item)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
@@ -17,4 +19,6 @@ public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
      IPage<TaCheckItem> getPageBy(IPage<TaCheckItem> pg, @Param("checkId") String checkId, @Param("itemType") String itemType);
 
      int createNewLocItems(@Param("checkId") String checkId);
+
+     List<TaCheckItem> getListBy(@Param("checkId") String checkId, @Param("itemType") String itemType);
  }

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

@@ -5,12 +5,17 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaCheckItemQu;
 
- /**
+import java.util.List;
+
+/**
  * 点位问题;(ta_check_item_qu)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 @Mapper
 public interface TaCheckItemQuMapper  extends BaseMapper<TaCheckItemQu>{
-    
-}
+
+     Integer countByItem(@Param("itemId") String itemId);
+
+     List<TaCheckItemQu> getListBy(@Param("itemId") String itemId);
+ }

src/main/java/com/example/civilizedcity/service/TaCheckService.java

@@ -8,5 +8,6 @@ import com.example.civilizedcity.entity.TaCheck;
  * @date : 2022-12-12
  */
 public interface TaCheckService extends IBaseService<TaCheck> {
-    
-}
+
+     TaCheck calcScore(TaCheck taCheck);
+ }

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

@@ -1,6 +1,7 @@
 package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.entity.TaCheck;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,7 +30,7 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
         // 再创建调查问卷
         TaCheckItem taCheckItem = new TaCheckItem();
         taCheckItem.setCheckId(taCheck.getCheckId());
-        taCheckItem.setItemType("survey");
+        taCheckItem.setItemType(Constants.CHECK_OF_SURVEY);
         taCheckItem.setName("调查问卷");
         save(taCheckItem);
     }

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

@@ -1,15 +1,170 @@
 package com.example.civilizedcity.service.impl;
 
+import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.*;
+import com.example.civilizedcity.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.entity.TaCheck;
-import com.example.civilizedcity.mapper.TaCheckMapper;
 import com.example.civilizedcity.service.TaCheckService;
- /**
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
  * 模拟测评;(ta_mock_check)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-12-12
  */
 @Service
 public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck> implements TaCheckService {
-    
+
+    @Autowired
+    TaCheckItemMapper taCheckItemMapper;
+
+    @Autowired
+    TaCheckItemQuMapper taCheckItemQuMapper;
+
+    @Autowired
+    TaCheckAnswerMapper taCheckAnswerMapper;
+
+    @Autowired
+    TaCheckAnswerItemMapper taCheckAnswerItemMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public TaCheck calcScore(TaCheck taCheck) {
+
+        // 调查问卷分数
+        double surveyScore = calcSurveyScore(taCheck);
+
+        // 计算点位分数
+        double locScore = calcLocScore(taCheck);
+
+        taCheck.setLocScore(locScore);
+        taCheck.setSurveyScore(surveyScore);
+
+        updateById(taCheck);
+
+        return taCheck;
+    }
+
+    /**
+     * 计算点位分数
+     * 计算的前提是, 每份试卷（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.getListBy(checkItem.getItemId());
+            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 maxStandScore = 100.00 / copyNum / 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 = Math.abs(answerItem.getScore()) > qu.getMaxScore() ?  qu.getMaxScore() : answerItem.getScore();
+                    if (answerItem.getScore() < 0) {
+                        // 在与最大值的比较过程中, 最大值是正数, 有可能改变得分的符号
+                        // 所以此处要纠正过来
+                        s = 0 - Math.abs(s);
+                    }
+
+                    // 分值
+                    quScore += s * ratio;
+                }
+
+                answer.setScore(quScore);
+                taCheckAnswerMapper.updateById(answer);
+
+                // 分值
+                score += quScore;
+            }
+
+            checkItem.setScore(score);
+            taCheckItemMapper.updateById(checkItem);
+
+            totalScore += score;
+        }
+
+        return totalScore;
+    }
+
+    private TaCheckItemQu getQu(List<TaCheckItemQu> quList, String quId) {
+        for (TaCheckItemQu qu : quList) {
+            if (qu.getQuId().equals(quId)) {
+                return qu;
+            }
+        }
+
+        return null;
+    }
+
+    private boolean isZero(Double d) {
+        return Math.abs(d) < 0.0001;
+    }
 }

src/main/resources/mapper/TaCheckAnswerItemMapper.xml

@@ -2,5 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckAnswerItemMapper">
-    
+
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckAnswerItem">
+        SELECT
+            *
+        FROM
+            ta_check_answer_item t
+        WHERE
+            t.answer_id = #{answerId}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaCheckAnswerMapper.xml

@@ -2,5 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckAnswerMapper">
-    
+
+    <select id="countByItem" resultType="java.lang.Integer">
+        SELECT
+            count( 1 )
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckAnswer">
+        SELECT
+            *
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.`status` &gt; -1
+    </select>
+    <select id="sumScore" resultType="java.lang.Double">
+        SELECT
+            sum( t.score )
+        FROM
+            ta_check_answer t
+        WHERE
+            t.item_id = #{itemId}
+          AND t.`status` &gt; - 1
+        ORDER BY
+            t.create_date ASC
+        LIMIT #{num}
+    </select>
 </mapper>

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -29,6 +29,7 @@
         WHERE
             t.check_id = #{checkId}
           AND t.item_type = #{itemType}
+          AND t.`status` > -1
         ORDER BY
         <if test="itemType != null and itemType == 'loc'">
             s.sort_no ASC
@@ -37,4 +38,14 @@
             t.create_date ASC
         </if>
     </select>
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
+        SELECT
+            t.*
+        FROM
+            ta_check_item t
+        WHERE
+            t.check_id = #{checkId}
+          AND t.item_type = #{itemType}
+          AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaCheckItemQuMapper.xml

@@ -2,5 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckItemQuMapper">
-    
+
+    <select id="countByItem" resultType="java.lang.Integer">
+        SELECT
+            count( 1 )
+        FROM
+            ta_check_item_qu t
+        WHERE
+            t.item_id = #{itemId}
+    </select>
+    <select id="getListBy" resultType="com.example.civilizedcity.entity.TaCheckItemQu">
+        SELECT
+            *
+        FROM
+            ta_check_item_qu t
+        WHERE
+            t.item_id = #{itemId}
+    </select>
 </mapper>