优化代码新增xml

src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java

@@ -3,7 +3,6 @@ package com.sztzjy.financial_bigdata.controller.tea;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sztzjy.financial_bigdata.annotation.AnonymousAccess;
-import com.sztzjy.financial_bigdata.config.Constant;
 import com.sztzjy.financial_bigdata.entity.*;
 import com.sztzjy.financial_bigdata.entity.tea_dto.TeaExamManageCountDto;
 import com.sztzjy.financial_bigdata.entity.tea_dto.TeaExamManageDto;
@@ -22,7 +21,10 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author xcj
@@ -54,15 +56,8 @@ public class TeaExamManageController {
     @PostMapping("/getSelectCountAndScore")
     @ApiOperation("新增考试--获取选题量和分数")
     public ResultEntity<Map<Integer, BigDecimal>> getsingleId(@RequestBody @ApiParam("所有ID用,隔开一次传过来") List<String> ids) {
-        Map<Integer, BigDecimal> map = new HashMap<>();
-        int i = 0;
-        BigDecimal score = BigDecimal.ZERO;
-        for (String id : ids) {
-            SysObjectiveQuestion sysObjectiveQuestion = sysObjectiveQuestionMapper.selectByPrimaryKey(id);
-            i++;
-            score = sysObjectiveQuestion.getScore().add(score);
-        }
-        map.put(i, score);
+        List<String> list = new ArrayList<>(ids);
+        Map<Integer, BigDecimal> map = sysObjectiveQuestionMapper.selectByList(list);
         return new ResultEntity<>(map);
     }
 
@@ -79,12 +74,8 @@ public class TeaExamManageController {
     @ApiOperation("新增考试--选择客观题时展示")
     public ResultEntity<List<SysObjectiveQuestion>> selectObjectivityByType(@ApiParam("0单选 1多选 2判断") @RequestParam String type,
                                                                            @RequestParam String schoolId) {
-        SysObjectiveQuestionExample sysObjectiveQuestionExample = new SysObjectiveQuestionExample();
-        List<String> l = new ArrayList<>();
-        l.add(schoolId);
-        l.add(Constant.BUILT_IN_SCHOOL_ID);
-        sysObjectiveQuestionExample.createCriteria().andTypeEqualTo(type).andSchoolIdIn(l);
-        return new ResultEntity<List<SysObjectiveQuestion>>(sysObjectiveQuestionMapper.selectByExample(sysObjectiveQuestionExample));
+        List<SysObjectiveQuestion> list = sysObjectiveQuestionMapper.selectObjectivityByType(type, schoolId);
+        return new ResultEntity<>(list);
     }
 
 

src/main/java/com/sztzjy/financial_bigdata/mapper/SysObjectiveQuestionMapper.java

@@ -3,7 +3,10 @@ package com.sztzjy.financial_bigdata.mapper;
 import com.sztzjy.financial_bigdata.entity.SysCaseQuestion;
 import com.sztzjy.financial_bigdata.entity.SysObjectiveQuestion;
 import com.sztzjy.financial_bigdata.entity.SysObjectiveQuestionExample;
+
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import com.sztzjy.financial_bigdata.entity.tea_dto.TeaExamManageCountDto;
 import org.apache.ibatis.annotations.Mapper;
@@ -50,4 +53,8 @@ public interface SysObjectiveQuestionMapper {
     List<SysObjectiveQuestion> selectRandomObjectiveJudge();
 
     List<SysObjectiveQuestion> getGradeReportObjective(@Param("list") List<String> list);
+
+    Map<Integer, BigDecimal> selectByList(@Param("list") List<String> list);
+
+    List<SysObjectiveQuestion> selectObjectivityByType(@Param("type")String type, @Param("schoolId")String schoolId);
 }

src/main/resources/mapper/SysObjectiveQuestionMapper.xml

@@ -38,7 +38,8 @@
                                 </when>
                                 <when test="criterion.listValue">
                                     and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
+                                             separator=",">
                                         #{listItem}
                                     </foreach>
                                 </when>
@@ -67,7 +68,8 @@
                                 </when>
                                 <when test="criterion.listValue">
                                     and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
+                                             separator=",">
                                         #{listItem}
                                     </foreach>
                                 </when>
@@ -79,11 +81,13 @@
         </where>
     </sql>
     <sql id="Base_Column_List">
-    objective_id, course_id, course_name, chapter_id, chapter_name, input_type, type, 
+        objective_id
+        , course_id, course_name, chapter_id, chapter_name, input_type, type,
     score, content, question_a, question_b, question_c, question_d, question_e, answer, 
     analysis, school_id
     </sql>
-  <select id="selectByExample" parameterType="com.sztzjy.financial_bigdata.entity.SysObjectiveQuestionExample" resultMap="BaseResultMap">
+    <select id="selectByExample" parameterType="com.sztzjy.financial_bigdata.entity.SysObjectiveQuestionExample"
+            resultMap="BaseResultMap">
         select
         <if test="distinct">
             distinct
@@ -104,7 +108,8 @@
         where objective_id = #{objectiveId,jdbcType=VARCHAR}
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from sys_objective_question
+        delete
+        from sys_objective_question
         where objective_id = #{objectiveId,jdbcType=VARCHAR}
     </delete>
     <delete id="deleteByExample" parameterType="com.sztzjy.financial_bigdata.entity.SysObjectiveQuestionExample">
@@ -236,7 +241,8 @@
             </if>
         </trim>
     </insert>
-  <select id="countByExample" parameterType="com.sztzjy.financial_bigdata.entity.SysObjectiveQuestionExample" resultType="java.lang.Long">
+    <select id="countByExample" parameterType="com.sztzjy.financial_bigdata.entity.SysObjectiveQuestionExample"
+            resultType="java.lang.Long">
         select count(*) from sys_objective_question
         <if test="_parameter != null">
             <include refid="Example_Where_Clause"/>
@@ -400,13 +406,25 @@
     </update>
 
     <select id="selectRandomObjective" parameterType="map" resultMap="BaseResultMap">
-    SELECT
-      objective_id, course_id, course_name, chapter_id, chapter_name, input_type, type,
-      score, content, question_a, question_b, question_c, question_d, question_e, answer, school_id
+        SELECT objective_id,
+               course_id,
+               course_name,
+               chapter_id,
+               chapter_name,
+               input_type,
+               type,
+               score,
+               content,
+               question_a,
+               question_b,
+               question_c,
+               question_d,
+               question_e,
+               answer,
+               school_id
         FROM sys_objective_question
         WHERE chapter_id = #{chapterId,jdbcType=VARCHAR}
-    ORDER BY RAND()
-      LIMIT 10
+        ORDER BY RAND() LIMIT 10
     </select>
 
 
@@ -459,4 +477,19 @@
         </foreach>
     </select>
 
+
+    <select id="selectByList" parameterType="java.util.List" resultType="java.util.Map">
+        SELECT count(*),sum(score)FROM sys_objective_question
+        WHERE objective_id IN
+        <foreach collection="list" separator="," item="id" open="(" close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="selectObjectivityByType" parameterType="java.lang.String" resultMap="BaseResultMap">
+        SELECT objective_id,content,chapter_name,course_name FROM sys_objective_question
+        WHERE school_id IN(#{schoolId},'999999999')
+        AND type = #{type}
+    </select>
+
 </mapper>