feats

pom.xml

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

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

@@ -156,7 +156,7 @@ public class TaCheckController extends BaseController {
             return ResponseBean.error("未找到模拟测评信息");
         }
 
-//        TaCheckItem taCheckItem = taCheckItemService.getById(id);
+        taCheck = taCheckService.calcScore(taCheck);
         return ResponseBean.success(taCheck);
     }
 

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

@@ -11,6 +11,7 @@ import java.util.List;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.TaCheckItemAn;
 import com.example.civilizedcity.service.TaCheckItemAnService;
+import com.example.civilizedcity.service.TaCheckItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,6 +31,9 @@ import com.example.civilizedcity.service.TaCheckItemQuService;
 @RequestMapping("/")
 public class TaCheckItemQuController extends BaseController {
 
+    @Autowired
+    private TaCheckItemService taCheckItemService;
+
     @Autowired
     private TaCheckItemQuService taCheckItemQuService;
 
@@ -100,6 +104,8 @@ public class TaCheckItemQuController extends BaseController {
 
         taCheckItemAnService.mergeData(taCheckItemQu.getQuId(), taCheckItemQu.getAnswerList());
 
+        taCheckItemService.updateFullScore(taCheckItemQu.getItemId());
+
         return ResponseBean.success(taCheckItemQu);
     }
 

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

@@ -31,4 +31,8 @@ public interface TaCheckItemMapper  extends BaseMapper<TaCheckItem>{
     double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
 
     double sumEvlScore(@Param("itemId") String itemId);
+
+    boolean updateFullScore(@Param("itemId") String itemId);
+
+    int calcScore(@Param("checkId") String checkId);
 }

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

@@ -18,4 +18,6 @@ public interface TaCheckItemService extends IBaseService<TaCheckItem> {
      void createNewItems(TaCheck taCheck);
 
      void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, SysUser sysUser) throws Exception;
+
+     boolean updateFullScore(String itemId);
  }

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

@@ -10,7 +10,7 @@ import com.example.civilizedcity.entity.TaCheckItem;
  */
 public interface TaCheckService extends IBaseService<TaCheck> {
 
-     TaCheck calcScore(TaCheck taCheck,TaCheckItem taCheckItem );
+     TaCheck calcScore(TaCheck taCheck);
 
      TaCheck copy(TaCheck taCheck);
  }

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

@@ -1,6 +1,5 @@
 package com.example.civilizedcity.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.StringUtils;
@@ -12,9 +11,7 @@ import com.example.civilizedcity.service.TaCheckItemService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 测评点位;(ta_check_item)表服务实现类
@@ -114,6 +111,11 @@ public class TaCheckItemServiceImpl extends BaseServiceImpl<TaCheckItemMapper, T
         taCheckAnswerMapper.insert(taCheckAnswer);
     }
 
+    @Override
+    public boolean updateFullScore(String itemId) {
+        return baseMapper.updateFullScore(itemId);
+    }
+
     /**
      * 作答计算分数
      * 试卷总分 = 每一题分数求和

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

@@ -35,10 +35,9 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public TaCheck calcScore(TaCheck taCheck,TaCheckItem taCheckItem) {
+    public TaCheck calcScore(TaCheck taCheck) {
 
-        //计算测评得分
-//        double evlScore = taCheckItemMapper.sumEvlScore(taCheckItem.getItemId());
+        taCheckItemMapper.calcScore(taCheck.getCheckId());
 
         // 调查问卷分数
         double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
@@ -49,9 +48,8 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
         taCheck.setLocScore(locScore);
         taCheck.setSurveyScore(surveyScore);
 
-//        taCheckItem.setScore(evlScore);
-
         updateById(taCheck);
+
         return taCheck;
     }
 

src/main/resources/mapper/TaCheckItemMapper.xml

@@ -45,6 +45,18 @@
         WHERE t.check_id = #{oldCheckId}
           and t.`status` = 1
     </insert>
+    <update id="updateFullScore">
+        UPDATE ta_check_item t
+        SET t.full_score = ( SELECT sum( s.max_score ) FROM ta_check_item_qu s WHERE s.item_id = #{itemId} )
+        WHERE
+            t.item_id = #{itemId}
+    </update>
+    <update id="calcScore">
+        UPDATE ta_check_item t
+        SET t.score = ( SELECT sum( s.score ) FROM ta_check_answer s WHERE s.item_id = t.item_id )
+        WHERE
+            t.check_id = #{checkId}
+    </update>
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
         SELECT