上传方案接口

wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentType.java

+package cn.wisenergy.model.enums;
+
+/**
+ * @author 86187
+ * @ Description: 考生类型枚举
+ * @ Author     : 86187
+ * @ Date       : 2021/1/18 20:36
+ */
+public enum StudentType {
+
+    /**
+     * 考生类型枚举
+     */
+    CULTURE_STUDENT(1, "文化课考生"),
+    ART_STUDENT(2, "美术生"),
+    SPORTS_STUDENT(3, "体育生"),
+    LITERATURE_STUDENT(4, "文学编导生");
+
+    private Integer code;
+
+    private String desc;
+
+    StudentType(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeQueryVo.java

@@ -20,7 +20,7 @@ public class SchemeQueryVo implements Serializable {
     /**
      * 用户id
      */
-    @ApiModelProperty(value = "文化成绩",name = "userId")
+    @ApiModelProperty(value = "用户id",name = "userId")
     private Integer userId;
 
     /**
@@ -29,16 +29,5 @@ public class SchemeQueryVo implements Serializable {
     @ApiModelProperty(value = "专业ids,如'1,2,3,4,5,6...'",name = "professionIds")
     private String professionIds;
 
-    /**
-     * 文化成绩
-     */
-    @ApiModelProperty(value = "文化成绩",name = "cultureGrade")
-    private String cultureGrade;
-
-    /**
-     * 专业成绩
-     */
-    @ApiModelProperty(value = "专业成绩",name = "majorGrade")
-    private String majorGrade;
 
 }

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

@@ -3,6 +3,7 @@ package cn.wisenergy.service.app.impl;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.*;
 import cn.wisenergy.model.app.*;
+import cn.wisenergy.model.enums.StudentType;
 import cn.wisenergy.model.vo.SchemeQueryVo;
 import cn.wisenergy.model.vo.VolunteerVo;
 import cn.wisenergy.service.app.SchemeService;
@@ -58,20 +59,41 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             return R.error("用户信息不存在!");
         }
 
-        //2、根据筛选方案算法，筛选方案
-        Map<String, Object> map = new HashMap<>(16);
+        //2、获取考生成绩
+        QueryWrapper<ScoreInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", queryVo.getUserId());
+        ScoreInfo scoreInfo = scoreInfoMapper.selectOne(queryWrapper);
+        if (null == scoreInfo) {
+            return R.error("无考生成绩!");
+        }
+
+        //3、根据筛选方案算法，筛选方案
+        //判断考生类型 文化课考生
+        List<Volunteer> list = new ArrayList<>();
+        if (StudentType.CULTURE_STUDENT.getCode().equals(userInfo.getExamType())) {
+            list = getCultureList(userInfo, scoreInfo);
+        }
+
+        if (StudentType.ART_STUDENT.getCode().equals(userInfo.getExamType())) {
+
+        }
+
+        if (StudentType.SPORTS_STUDENT.getCode().equals(userInfo.getExamType())) {
 
-        List<Volunteer> list = volunteerMapper.getList(map);
-        if (CollectionUtils.isEmpty(list)) {
-            return R.ok(new VolunteerVo());
         }
-        //3、保存方案查询记录
+
+        if (StudentType.LITERATURE_STUDENT.getCode().equals(userInfo.getExamType())) {
+
+        }
+
+
+        //4、保存方案查询记录
         SchemeQueryRecord schemeQueryRecord = new SchemeQueryRecord();
         schemeQueryRecord.setMajorName("");
         schemeQueryRecord.setStudentType(userInfo.getExamType());
         schemeQueryRecord.setUserId(userInfo.getId());
         schemeQueryRecord.setIsDelete(0);
-        double score = Double.parseDouble(queryVo.getCultureGrade()) + Double.parseDouble(queryVo.getMajorGrade());
+        double score = Double.parseDouble(scoreInfo.getCultureGrade()) + Double.parseDouble(scoreInfo.getMajorGrade());
         schemeQueryRecord.setScore(String.valueOf(score));
 
         //保存用户方案记录、志愿之间的关联关系
@@ -158,4 +180,10 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         }
         return true;
     }
+
+    private List<Volunteer> getCultureList(UserInfo userInfo, ScoreInfo scoreInfo) {
+        //获取文化课规则
+        List<Volunteer> list = new ArrayList<>();
+        return list;
+    }
 }