feats

db/.back_文明创办/文明创办-backup-2023216160334.pdma.json → db/.back_文明创办/文明创办-backup-2023217134109.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-13 11:18:21",
+  "updatedTime": "2023-2-16 16:03:34",
   "dbConns": [],
   "profile": {
     "default": {
@@ -5219,7 +5219,7 @@
       "fields": [
         {
           "defKey": "item_id",
-          "defName": "点位ID",
+          "defName": "测评项目ID",
           "comment": "",
           "type": "",
           "len": 32,

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-2-16 16:03:34",
+  "updatedTime": "2023-2-17 13:41:09",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4833,6 +4833,40 @@
           "domain": "",
           "id": "F2E17D81-03A9-42C4-8DD7-732C8D40DC59"
         },
+        {
+          "defKey": "loc_score_percent",
+          "defName": "实地测评得分占比",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DE02FAE0-A53F-4F6F-BB1B-B1669DD46C82"
+        },
+        {
+          "defKey": "survey_score_percent",
+          "defName": "调查问卷得分占比",
+          "comment": "",
+          "type": "DECIMAL",
+          "len": 6,
+          "scale": 2,
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "85BA110E-FCC5-4FC5-BE12-2C83C3D0EC27"
+        },
         {
           "defKey": "start_date",
           "defName": "开始日期",

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

@@ -74,7 +74,8 @@ public class TaCheckItemController extends BaseController {
     @GetMapping("/taCheck/{checkId}/item/{typeId}")
     public ResponseBean queryByCheckId(@ApiParam("测评ID") @PathVariable String checkId,
                                        @ApiParam("点位ID 或者 调查问卷") @PathVariable String typeId) throws Exception {
-        TaCheckItem taCheckItem = getByCheckAndType(checkId, typeId);
+        String itemType = StringUtils.isEmpty(typeId) || Constants.CHECK_OF_SURVEY.equals(typeId) ? Constants.CHECK_OF_SURVEY : Constants.CHECK_OF_LOC;
+        TaCheckItem taCheckItem = getByCheckAndType(checkId, typeId, itemType);
         if (null == taCheckItem || Constants.STATUS_DELETE == taCheckItem.getStatus()) {
             return ResponseBean.error("未找到测评项目");
         }
@@ -87,11 +88,11 @@ public class TaCheckItemController extends BaseController {
         return ResponseBean.success(taCheckItem);
     }
 
-    private TaCheckItem getByCheckAndType(String checkId, String typeId) {
+    private TaCheckItem getByCheckAndType(String checkId, String typeId, String itemType) {
         QueryWrapper<TaCheckItem> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("check_id", checkId);
 
-        if (Constants.CHECK_OF_SURVEY.equals(typeId)) {
+        if (Constants.CHECK_OF_SURVEY.equals(itemType)) {
             queryWrapper.eq("item_type", Constants.CHECK_OF_SURVEY);
         } else {
             queryWrapper.eq("item_type", Constants.CHECK_OF_LOC); // 只查点位
@@ -151,7 +152,7 @@ public class TaCheckItemController extends BaseController {
             }
         }
 
-        TaCheckItem origin = getByCheckAndType(taCheckItem.getCheckId(), taCheckItem.getTypeId());
+        TaCheckItem origin = getByCheckAndType(taCheckItem.getCheckId(), taCheckItem.getTypeId(), taCheckItem.getItemType());
         if (null == origin) {
             // 新增
             taCheckItem.setStatus(Constants.STATUS_NORMAL);
@@ -192,7 +193,7 @@ public class TaCheckItemController extends BaseController {
             }});
         }
 
-        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
+//        if (Constants.CHECK_OF_LOC.equals(taCheckItem.getItemType())) {
             int cnt = taCheckAnswerService.countByItem(taCheckItem.getItemId());
             if (cnt >= taCheckItem.getNum()) {
                 return ResponseBean.success(new HashMap<String, Object>(){{
@@ -200,7 +201,7 @@ public class TaCheckItemController extends BaseController {
                     put("message", "当前问卷已收齐, 无须作答");
                 }});
             }
-        }
+//        }
 
         return ResponseBean.success(new HashMap<String, Object>(){{
             put("errorCode", 0);    // 0 代表可以答题

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 Double locScorePercent ;
+     /** 调查问卷得分占比 */
+     @ApiModelProperty(name = "调查问卷得分占比",notes = "")
+     private Double surveyScorePercent ;
       /** 开始日期;YYYY-MM-DD */
       @ApiModelProperty(name = "开始日期",notes = "YYYY-MM-DD")
       private String startDate ;

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

@@ -113,12 +113,13 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
 
             // 每份试卷的得分 = 总分 / 份数
             double maxScore = taCheckItem.getFullScore()  / taCheckItem.getNum();
-            double totalScore = maxScore + negativeScore + positiveScore;
-
-            if (0 > totalScore) {
-                // 如果扣分项太多
-                totalScore = 0.0;
-            }
+            double totalScore = negativeScore + positiveScore;
+//            double totalScore = maxScore + negativeScore + positiveScore;
+//
+//            if (0 > totalScore) {
+//                // 如果扣分项太多
+//                totalScore = 0.0;
+//            }
             if (totalScore > maxScore) {
                 // 如果得分超过总分
                 totalScore = maxScore;
@@ -186,18 +187,8 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
             if (score > 0) {
                 positiveScore += score;
             } else {
-//                negativeScore += score;
-
-                // 扣分项
-                if (sign < 0) {
-                    mustCreateIssue = true;
-                    score = qu.getMaxScore() - score;
-                    if (score < 0) {
-                        score = 0;
-                    }
-
-                    positiveScore += score;
-                }
+                mustCreateIssue = true;
+                negativeScore += score;
             }
 
             // 保存附件

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

@@ -68,6 +68,19 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
             checkItem.setScore(s);
             taCheckItemMapper.updateById(checkItem);
 
+            // 如果得到正分, 说明试卷得了满分
+            if (s > 0) {
+                s = checkItem.getFullScore();
+            }
+
+            // 如果产生扣分项
+            if (s < 0) {
+                s = checkItem.getFullScore() + s;
+                if (s < 0) {
+                    s = 0;
+                }
+            }
+
             totalScore += s;
         }
 
@@ -100,8 +113,10 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
             if (quList == null || quList.size() == 0) continue;
             int quNum = quList.size();
 
+            // 每份试卷的最大分数
+            double maxItemScore = 100.00 / copyNum;
             // 每题的最大分数
-            double maxStandScore = 100.00 / copyNum / quNum;
+            double maxStandScore = maxItemScore / quNum;
 
             // 总分
             double score = 0.0;
@@ -139,6 +154,10 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
                     quScore += s * ratio;
                 }
 
+                if (quScore > maxStandScore) {
+                    quScore = maxStandScore;
+                }
+
                 answer.setScore(quScore);
                 taCheckAnswerMapper.updateById(answer);
 
@@ -146,6 +165,20 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
                 score += quScore;
             }
 
+            // 如果是正数, 那么就是试卷的得分
+            // 但是不能超过最大值
+            if (score > maxItemScore) {
+                score = maxItemScore;
+            }
+
+            // 调查问卷理论上不会出现分数为负的情况
+            if (score < 0) {
+                score = maxItemScore + score;
+                if (score < 0) {
+                    score = 0;
+                }
+            }
+
             checkItem.setScore(score);
             taCheckItemMapper.updateById(checkItem);