不分页及试卷排序

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontUniversitiesController.java

@@ -6,6 +6,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.AjaxResult2;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -134,7 +135,7 @@ public class FrontUniversitiesController extends BaseController {
 
     @GetMapping("listByTier")
     @ApiOperation("01 分级院校列表")
-    public TableDataInfo listByTier(UniversitiesCondDTO cond) {
+    public AjaxResult2<List<JSONObject>> listByTier(UniversitiesCondDTO cond) {
         String location = VistorContextHolder.getLocation();
         if(StringUtils.isNotBlank(location)){
             location = location+",全国";
@@ -157,7 +158,7 @@ public class FrontUniversitiesController extends BaseController {
             tierUniversities.put("list", uList);
             tierList.add(tierUniversities);
         }
-        return getDataTable(tierList);
+        return AjaxResult2.success(tierList);
     }
 
     @GetMapping("list")

ie-admin/src/main/java/com/ruoyi/web/controller/ie/VoluntaryController.java

@@ -87,9 +87,9 @@ public class VoluntaryController extends BaseController {
 
     @GetMapping("voluntary/getVoluntaryList")
     @ApiOperation("查询志愿列表")
-    public TableDataInfo voluntaryList(@ApiParam @RequestParam Integer pageNum, @ApiParam @RequestParam Integer pageSize) { // 我的志愿表 // 后台填充快照缺省
+    public R<List<VoluntaryDto.VoluntaryRecord>> voluntaryList(@ApiParam @RequestParam Integer pageNum, @ApiParam @RequestParam Integer pageSize) { // 我的志愿表 // 后台填充快照缺省
         List<VoluntaryDto.VoluntaryRecord> list = voluntaryService.getVoluntaryList2();
-        return getDataTable(list);
+        return R.ok(list);
     }
 
     @PostMapping("voluntary/addVoluntary")

ie-admin/src/main/java/com/ruoyi/web/domain/VoluntaryDto.java

@@ -604,6 +604,12 @@ public class VoluntaryDto {
             return improvesList;
         }
 
+        public Double getImproveSkillScore(Double diffValue) {
+            MutablePair<Double, Double> scorePair = groupTypeStatMap.get("技能测试");
+            Double missRateScore = diffValue * scorePair.getRight() / groupAllTotal;
+            return missRateScore;
+        }
+
         // 原始分, 总分, 得分率
         private Double getOriScore(List<Triple<Double, Double, Double>> itemList, Double missRateScore) {
             Double statTotal = itemList.stream().mapToDouble(t -> t.getMiddle()).sum();

ie-admin/src/main/java/com/ruoyi/web/service/VoluntaryService.java

@@ -376,11 +376,11 @@ public class VoluntaryService {
         Double currScoreRate = isSameYear ? 1.0 : formulaScoreStat.getAllTotal() * 1.0 / lastSubmit.getScoreTotal();
         Double needSkillScore = lastSubmit.getScore() * currScoreRate - cultureScore;
         if(isScoreOnly) {
-            skill.setSkillScore(toString(needSkillScore));
+            skill.setSkillScore(toString(formulaScoreStat.getImproveSkillScore(needSkillScore)));
         } else {
             Double skillScore = formulaScoreStat.getTypeValue("StatCategoryScore", "ScoreSkill", true);
             skill.setSkillScore(toString(needSkillScore));
-            skill.setDiff(toString(skillScore - needSkillScore));
+            skill.setDiff(toString(formulaScoreStat.getImproveSkillScore(skillScore - needSkillScore)));
             EnrollRateCalculator.RateLevel rl;
             if (currTotal != null && null != (rl = enrollRateCalculator.calSchoolEnrollRate(validScoreTotal, lastSubmit.getScore(), currTotal / currScoreRate))) { // 按去年标准算概率
                 sr.setEnrollRate(rl.rate);

ie-system/src/main/resources/mapper/learn/LearnPaperMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examineeTypes != null  and examineeTypes != ''"> and p.examineeTypes = #{examineeTypes}</if>
             <if test="createTime != null "> and p.createTime = #{createTime}</if>
         </where>
-        order by e.examinee_id desc, p.id desc
+        order by p.year desc, p.id desc
     </select>
 
     <select id="selectLearnPaperList" parameterType="LearnPaper" resultMap="LearnPaperResult">