x修改成绩编辑

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

@@ -55,6 +55,22 @@
         update_time =now()
     </sql>
 
+    <sql id="updateCondition2">
+        user_id = #{userId},
+        culture_grade =#{cultureGrade},
+        major_grade =#{majorGrade},
+        language_grade =#{languageGrade},
+        math_grade =#{mathGrade},
+        english_grade =#{englishGrade},
+        physics_grade = #{physicsGrade},
+        chemistry_grade = #{chemistryGrade},
+        biology_grade = #{biologyGrade},
+        history_grade = #{historyGrade},
+        geography_grade = #{geographyGrade},
+        politics_grade = #{politicsGrade},
+        update_time =now()
+    </sql>
+
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
         <if test="userId != null">and user_id = #{userId}</if>
@@ -86,7 +102,7 @@
         UPDATE
         <include refid="table"/>
         <set>
-            <include refid="updateCondition"/>
+            <include refid="updateCondition2"/>
         </set>
         <where>
             id = #{id}

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

@@ -247,16 +247,16 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         }
 
         //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
-        R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
-        if (null != bool && bool.getCode() == 500) {
-            return R.error(bool.getMessage());
-        }
+//        R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
+//        if (null != bool && bool.getCode() == 500) {
+//            return R.error(bool.getMessage());
+//        }
 
         //排序
         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);