Yansen 2 vuotta sitten
vanhempi
commit
8fcd261f15

+ 1
- 1
pom.xml Näytä tiedosto

10
     </parent>
10
     </parent>
11
     <groupId>com.example</groupId>
11
     <groupId>com.example</groupId>
12
     <artifactId>civilizedCity</artifactId>
12
     <artifactId>civilizedCity</artifactId>
13
-    <version>0.0.15</version>
13
+    <version>0.0.16</version>
14
     <name>civilizedCity</name>
14
     <name>civilizedCity</name>
15
     <description>civilizedCity</description>
15
     <description>civilizedCity</description>
16
     <properties>
16
     <properties>

+ 1
- 1
src/main/java/com/example/civilizedcity/controller/TaCheckController.java Näytä tiedosto

156
             return ResponseBean.error("未找到模拟测评信息");
156
             return ResponseBean.error("未找到模拟测评信息");
157
         }
157
         }
158
 
158
 
159
-//        TaCheckItem taCheckItem = taCheckItemService.getById(id);
159
+        taCheck = taCheckService.calcScore(taCheck);
160
         return ResponseBean.success(taCheck);
160
         return ResponseBean.success(taCheck);
161
     }
161
     }
162
 
162
 

+ 6
- 0
src/main/java/com/example/civilizedcity/controller/TaCheckItemQuController.java Näytä tiedosto

11
 import com.example.civilizedcity.common.StringUtils;
11
 import com.example.civilizedcity.common.StringUtils;
12
 import com.example.civilizedcity.entity.TaCheckItemAn;
12
 import com.example.civilizedcity.entity.TaCheckItemAn;
13
 import com.example.civilizedcity.service.TaCheckItemAnService;
13
 import com.example.civilizedcity.service.TaCheckItemAnService;
14
+import com.example.civilizedcity.service.TaCheckItemService;
14
 import io.swagger.annotations.Api;
15
 import io.swagger.annotations.Api;
15
 import io.swagger.annotations.ApiOperation;
16
 import io.swagger.annotations.ApiOperation;
16
 import io.swagger.annotations.ApiParam;
17
 import io.swagger.annotations.ApiParam;
30
 @RequestMapping("/")
31
 @RequestMapping("/")
31
 public class TaCheckItemQuController extends BaseController {
32
 public class TaCheckItemQuController extends BaseController {
32
 
33
 
34
+    @Autowired
35
+    private TaCheckItemService taCheckItemService;
36
+
33
     @Autowired
37
     @Autowired
34
     private TaCheckItemQuService taCheckItemQuService;
38
     private TaCheckItemQuService taCheckItemQuService;
35
 
39
 
100
 
104
 
101
         taCheckItemAnService.mergeData(taCheckItemQu.getQuId(), taCheckItemQu.getAnswerList());
105
         taCheckItemAnService.mergeData(taCheckItemQu.getQuId(), taCheckItemQu.getAnswerList());
102
 
106
 
107
+        taCheckItemService.updateFullScore(taCheckItemQu.getItemId());
108
+
103
         return ResponseBean.success(taCheckItemQu);
109
         return ResponseBean.success(taCheckItemQu);
104
     }
110
     }
105
 
111
 

+ 4
- 0
src/main/java/com/example/civilizedcity/mapper/TaCheckItemMapper.java Näytä tiedosto

31
     double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
31
     double sumScore(@Param("checkId") String checkId, @Param("itemType") String itemType);
32
 
32
 
33
     double sumEvlScore(@Param("itemId") String itemId);
33
     double sumEvlScore(@Param("itemId") String itemId);
34
+
35
+    boolean updateFullScore(@Param("itemId") String itemId);
36
+
37
+    int calcScore(@Param("checkId") String checkId);
34
 }
38
 }

+ 2
- 0
src/main/java/com/example/civilizedcity/service/TaCheckItemService.java Näytä tiedosto

18
      void createNewItems(TaCheck taCheck);
18
      void createNewItems(TaCheck taCheck);
19
 
19
 
20
      void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, SysUser sysUser) throws Exception;
20
      void answer(TaCheckItem taCheckItem, TaCheckAnswer taCheckAnswer, SysUser sysUser) throws Exception;
21
+
22
+     boolean updateFullScore(String itemId);
21
  }
23
  }

+ 1
- 1
src/main/java/com/example/civilizedcity/service/TaCheckService.java Näytä tiedosto

10
  */
10
  */
11
 public interface TaCheckService extends IBaseService<TaCheck> {
11
 public interface TaCheckService extends IBaseService<TaCheck> {
12
 
12
 
13
-     TaCheck calcScore(TaCheck taCheck,TaCheckItem taCheckItem );
13
+     TaCheck calcScore(TaCheck taCheck);
14
 
14
 
15
      TaCheck copy(TaCheck taCheck);
15
      TaCheck copy(TaCheck taCheck);
16
  }
16
  }

+ 5
- 3
src/main/java/com/example/civilizedcity/service/impl/TaCheckItemServiceImpl.java Näytä tiedosto

1
 package com.example.civilizedcity.service.impl;
1
 package com.example.civilizedcity.service.impl;
2
 
2
 
3
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.example.civilizedcity.common.Constants;
4
 import com.example.civilizedcity.common.Constants;
6
 import com.example.civilizedcity.common.StringUtils;
5
 import com.example.civilizedcity.common.StringUtils;
12
 import org.springframework.transaction.annotation.Transactional;
11
 import org.springframework.transaction.annotation.Transactional;
13
 
12
 
14
 import java.time.LocalDateTime;
13
 import java.time.LocalDateTime;
15
-import java.util.ArrayList;
16
 import java.util.List;
14
 import java.util.List;
17
-import java.util.stream.Collectors;
18
 
15
 
19
 /**
16
 /**
20
  * 测评点位;(ta_check_item)表服务实现类
17
  * 测评点位;(ta_check_item)表服务实现类
114
         taCheckAnswerMapper.insert(taCheckAnswer);
111
         taCheckAnswerMapper.insert(taCheckAnswer);
115
     }
112
     }
116
 
113
 
114
+    @Override
115
+    public boolean updateFullScore(String itemId) {
116
+        return baseMapper.updateFullScore(itemId);
117
+    }
118
+
117
     /**
119
     /**
118
      * 作答计算分数
120
      * 作答计算分数
119
      * 试卷总分 = 每一题分数求和
121
      * 试卷总分 = 每一题分数求和

+ 3
- 5
src/main/java/com/example/civilizedcity/service/impl/TaCheckServiceImpl.java Näytä tiedosto

35
 
35
 
36
     @Transactional(rollbackFor = Exception.class)
36
     @Transactional(rollbackFor = Exception.class)
37
     @Override
37
     @Override
38
-    public TaCheck calcScore(TaCheck taCheck,TaCheckItem taCheckItem) {
38
+    public TaCheck calcScore(TaCheck taCheck) {
39
 
39
 
40
-        //计算测评得分
41
-//        double evlScore = taCheckItemMapper.sumEvlScore(taCheckItem.getItemId());
40
+        taCheckItemMapper.calcScore(taCheck.getCheckId());
42
 
41
 
43
         // 调查问卷分数
42
         // 调查问卷分数
44
         double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
43
         double surveyScore = taCheckItemMapper.sumScore(taCheck.getCheckId(), Constants.CHECK_OF_SURVEY);
49
         taCheck.setLocScore(locScore);
48
         taCheck.setLocScore(locScore);
50
         taCheck.setSurveyScore(surveyScore);
49
         taCheck.setSurveyScore(surveyScore);
51
 
50
 
52
-//        taCheckItem.setScore(evlScore);
53
-
54
         updateById(taCheck);
51
         updateById(taCheck);
52
+
55
         return taCheck;
53
         return taCheck;
56
     }
54
     }
57
 
55
 

+ 12
- 0
src/main/resources/mapper/TaCheckItemMapper.xml Näytä tiedosto

45
         WHERE t.check_id = #{oldCheckId}
45
         WHERE t.check_id = #{oldCheckId}
46
           and t.`status` = 1
46
           and t.`status` = 1
47
     </insert>
47
     </insert>
48
+    <update id="updateFullScore">
49
+        UPDATE ta_check_item t
50
+        SET t.full_score = ( SELECT sum( s.max_score ) FROM ta_check_item_qu s WHERE s.item_id = #{itemId} )
51
+        WHERE
52
+            t.item_id = #{itemId}
53
+    </update>
54
+    <update id="calcScore">
55
+        UPDATE ta_check_item t
56
+        SET t.score = ( SELECT sum( s.score ) FROM ta_check_answer s WHERE s.item_id = t.item_id )
57
+        WHERE
58
+            t.check_id = #{checkId}
59
+    </update>
48
 
60
 
49
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
61
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaCheckItem">
50
         SELECT
62
         SELECT