feats

db/.back_文明创办/文明创办-backup-2023323142510.pdma.json → db/.back_文明创办/文明创办-backup-202358163328.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-23 14:24:15",
+  "updatedTime": "2023-4-15 13:47:43",
   "dbConns": [],
   "profile": {
     "default": {
@@ -493,7 +493,9 @@
         "refKey": "extProps",
         "hideInGraph": true
       }
-    ]
+    ],
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {
@@ -3911,6 +3913,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": [],
@@ -6477,6 +6496,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": [],
@@ -7702,6 +7738,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.1",
+  "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-4-15 13:47:43",
+  "updatedTime": "2023-5-8 16:33:28",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4937,6 +4937,40 @@
           "domain": "",
           "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
+        {
+          "defKey": "loc_num",
+          "defName": "实地测评份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FC14EB4B-E1C2-411A-A051-0D3C15002B61"
+        },
+        {
+          "defKey": "survey_num",
+          "defName": "调查问卷份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "DAA70103-78D7-46A9-98F8-87963984C229"
+        },
         {
           "defKey": "status",
           "defName": "状态",

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.16</version>
+    <version>0.0.17</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>

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

@@ -39,6 +39,12 @@ public class TaCheck implements Serializable,Cloneable{
        /** 调查问卷得分 */
        @ApiModelProperty(name = "调查问卷得分",notes = "")
        private Double surveyScore ;
+     /** 实地测评得分 */
+     @ApiModelProperty(name = "实地测评份数",notes = "")
+     private Integer locNum ;
+     /** 调查问卷得分 */
+     @ApiModelProperty(name = "调查问卷份数",notes = "")
+     private Integer surveyNum ;
      /** 实地测评得分占比 */
      @ApiModelProperty(name = "实地测评得分占比",notes = "")
      private Double locScorePercent ;

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

@@ -28,7 +28,7 @@ public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
 
     long copyItems(@Param("oldCheckId") String oldCheckId, @Param("newCheckId") String newCheckId);
 
-    double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
+    Double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
 
     double sumEvlScore(@Param("itemId") String itemId);
 

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

@@ -3,13 +3,15 @@ package com.example.civilizedcity.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.example.civilizedcity.entity.TaCheck;
+import org.apache.ibatis.annotations.Param;
 
- /**
+/**
  * 模拟测评;(ta_mock_check)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
 @Mapper
 public interface TaCheckMapper extends BaseMapper<TaCheck>{
-    
-}
+
+     int updateScore(@Param("checkId") String checkId);
+ }

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

@@ -39,16 +39,24 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
 
         taCheckItemMapper.calcScore(taCheck.getCheckId());
 
-        // 调查问卷分数
-        double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
-
-        // 计算点位分数
-        double locScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
-
-        taCheck.setLocScore(locScore);
-        taCheck.setSurveyScore(surveyScore);
-
-        updateById(taCheck);
+        baseMapper.updateScore(taCheck.getCheckId());
+
+//        // 调查问卷分数
+//        Double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
+//        if (surveyScore == null) {
+//            surveyScore = 0.0;
+//        }
+//
+//        // 计算点位分数
+//        Double locScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
+//        if (locScore == null) {
+//            locScore = 0.0;
+//        }
+//
+//        taCheck.setLocScore(locScore);
+//        taCheck.setSurveyScore(surveyScore);
+//
+//        updateById(taCheck);
 
         return taCheck;
     }

src/main/resources/mapper/TaCheckMapper.xml

@@ -2,5 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaCheckMapper">
-    
+
+    <update id="updateScore">
+        UPDATE ta_check t
+            INNER JOIN (
+                SELECT
+                a.check_id,
+                sum( a.score ) AS score,
+                count( 1 ) AS num
+                FROM
+                ta_check_item a
+                WHERE
+                a.check_id = #{checkId}
+                AND a.item_type = 'loc'
+                AND a.`status` = 1
+            ) m ON m.check_id = t.check_id
+            INNER JOIN (
+                SELECT
+                a.check_id,
+                sum( a.score ) AS score,
+                count( 1 ) AS num
+                FROM
+                ta_check_item a
+                WHERE
+                a.check_id = #{checkId}
+                AND a.item_type = 'survey'
+                AND a.`status` = 1
+            ) n ON n.check_id = t.check_id
+            SET t.loc_score = m.score,
+                t.loc_num = m.num,
+                t.survey_score = n.score,
+                t.survey_num = n.num
+        WHERE
+            t.check_id = #{checkId}
+    </update>
 </mapper>