查询方案记录表，新增专业成绩字段

wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml

@@ -8,6 +8,7 @@
         <result column="major_name" property="majorName"/>
         <result column="student_type" property="studentType"/>
         <result column="score" property="score"/>
+        <result column="major_score" property="majorScore"/>
         <result column="is_delete" property="isDelete"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -23,11 +24,11 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,major_name, student_type,score,is_delete,create_time,update_time
+        user_id,major_name, student_type,score,major_score,is_delete,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{majorName},#{studentType},#{score}, #{isDelete},now(),now()
+        #{userId},#{majorName},#{studentType},#{score}, #{majorScore},#{isDelete},now(),now()
     </sql>
 
     <sql id="updateCondition">
@@ -35,6 +36,7 @@
         <if test="majorName != null">major_name =#{majorName},</if>
         <if test="studentType != null">student_type =#{studentType},</if>
         <if test="score != null">score =#{score},</if>
+        <if test="majorScore != null">major_score =#{majorScore},</if>
         <if test="isDelete != null">is_delete = #{isDelete},</if>
         update_time =now()
     </sql>
@@ -45,6 +47,7 @@
         <if test="majorName != null">and major_name =#{majorName}</if>
         <if test="studentType != null">and student_type =#{studentType}</if>
         <if test="score != null">and score =#{score}</if>
+        <if test="majorScore != null">and major_score =#{majorScore}</if>
         <if test="isDelete != null">and is_delete = #{isDelete}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>

wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeQueryRecord.java

@@ -47,11 +47,17 @@ public class SchemeQueryRecord implements Serializable {
     private Integer studentType;
 
     /**
-     * 考生分数
+     * 考生文化分数
      */
-    @ApiModelProperty(value = "考生分数", name = "score")
+    @ApiModelProperty(value = "考生文化分数", name = "score")
     private String score;
 
+    /**
+     * 考生专业分数
+     */
+    @ApiModelProperty(value = "考生专业分数", name = "majorScore")
+    private String majorScore;
+
     /**
      * 创建时间
      */

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -246,17 +246,17 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             list = getVolunteerList(list, totalResult);
         }
 
-//        //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
-//        R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
-//        if (null != bool && bool.getCode() == 500) {
-//            return R.error("保存方案查询记录失败!");
-//        }
+        //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
+        R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
+        if (null != bool && bool.getCode() == 500) {
+            return R.error("保存方案查询记录失败!");
+        }
 
         //排序
         list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
         volunteerVo.setUserId(user.getId());
-//        assert bool != null;
-//        volunteerVo.setRecordId(bool.getData());
+        assert bool != null;
+        volunteerVo.setRecordId(bool.getData());
         volunteerVo.setVolunteers(list);
         volunteerVo.setTotal(list.size());
         return R.ok(volunteerVo);

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

@@ -184,8 +184,8 @@ public class VolunteerManager {
         schemeQueryRecord.setStudentType(user.getExamType());
         schemeQueryRecord.setUserId(user.getId());
         schemeQueryRecord.setIsDelete(0);
-        double score = scoreInfo.getCultureGrade() + scoreInfo.getMajorGrade();
-        schemeQueryRecord.setScore(String.valueOf(score));
+        schemeQueryRecord.setMajorScore(scoreInfo.getMajorGrade().toString());
+        schemeQueryRecord.setScore(scoreInfo.getCultureGrade().toString());
 
         List<Integer> ids = list.stream().map(Volunteer::getId).collect(Collectors.toList());
         //保存方案查询记录