专业查询添加录取批次条件

wisenergy-service/src/main/java/cn/wisenergy/service/app/ProfessionService.java

@@ -16,5 +16,5 @@ public interface ProfessionService {
      * 获取专业树结构
      * @return 树列表
      */
-    R<List<Profession>> getTree(Integer type,Integer userId);
+    R<List<Profession>> getTree(Integer type,Integer userId,String gradeType);
 }

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

@@ -7,11 +7,13 @@ import cn.wisenergy.mapper.ScoreInfoMapper;
 import cn.wisenergy.model.app.AdmissionRule;
 import cn.wisenergy.model.app.Profession;
 import cn.wisenergy.model.app.ScoreInfo;
+import cn.wisenergy.model.enums.GradeType;
 import cn.wisenergy.model.enums.SchemeTypeEnums;
 import cn.wisenergy.model.enums.StudentType;
 import cn.wisenergy.service.app.ProfessionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,14 +40,14 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
     private AdmissionRuleMapper admissionRuleMapper;
 
     @Override
-    public R<List<Profession>> getTree(Integer type, Integer userId) {
+    public R<List<Profession>> getTree(Integer type, Integer userId,String gradeType) {
         log.info("volunteer-service[]ProfessionServiceImpl[]getTree[]input.method");
         if (null == type || null == userId) {
             return R.error("入参为空!");
         }
 
         //获取方案类型
-        Integer schemeType = getSchemeType(type, userId);
+        Integer schemeType = getSchemeType(type, userId,gradeType);
         if (null == schemeType) {
             return R.error("考生成绩信息不存在!");
         }
@@ -97,7 +99,7 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
     }
 
 
-    private Integer getSchemeType(Integer type, Integer userId) {
+    private Integer getSchemeType(Integer type, Integer userId,String gradeType) {
         //获取用户成绩
         ScoreInfo scoreInfo = scoreInfoMapper.getByUserId(userId);
         if (null == scoreInfo) {
@@ -114,7 +116,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
 
             //本科类比文化分 = 本年录取分 -去年录取分 + 考生分数
             double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
-            if (culture >= firstRule.getCultureMin()) {
+            boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
+            boolean grade = StringUtils.isBlank(gradeType) && culture >= firstRule.getCultureMin();
+            if (graType || grade) {
                 return SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode();
             }
 
@@ -132,8 +136,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
             //专科类比分 = 本年录取分 -去年录取分 + 考生分数
             double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
             double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
-            if (trueCulture >= firstRule.getCultureMin() &&
-                    trueMajor >= firstRule.getProfessionMin()) {
+            boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
+            boolean grade = StringUtils.isBlank(gradeType) && trueCulture >= firstRule.getCultureMin() && trueMajor >= firstRule.getProfessionMin();
+            if (graType || grade) {
                 return SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode();
             }
 
@@ -152,7 +157,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
             //综合成绩差值
             double value = firstRule.getCurrentYearCulture() - firstRule.getCultureMin();
             double total = scoreInfo.getMajorGrade() * 750 / 100 * 0.7 + scoreInfo.getCultureGrade() * 0.3 - value;
-            if (total >= firstRule.getCultureMin()) {
+            boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
+            boolean grade = StringUtils.isBlank(gradeType) && total >= firstRule.getCultureMin();
+            if (graType || grade) {
                 return SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode();
             }
             return SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode();
@@ -169,7 +176,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
             //专科类比分 = 本年录取分 -去年录取分 + 考生分数
             double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
             double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
-            if (trueCulture >= firstRule.getCultureMin() && trueMajor >= firstRule.getProfessionMin()) {
+            boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
+            boolean grade = StringUtils.isBlank(gradeType) && trueCulture >= firstRule.getCultureMin() && trueMajor >= firstRule.getProfessionMin();
+            if (graType || grade) {
                 return SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode();
             }
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProfessionController.java

@@ -32,13 +32,14 @@ public class ProfessionController {
     @ApiOperation(value = "获取专业树结构", notes = "获取专业树结构", httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type", value = "考生类型 1：文化考生 2：美术考生 3：体育生 4：文学编导", dataType = "int"),
-            @ApiImplicitParam(name = "userId", value = "考生id", dataType = "int")
+            @ApiImplicitParam(name = "userId", value = "考生id", dataType = "int"),
+            @ApiImplicitParam(name = "gradeType", value = "考生批次 (本科、专科)", dataType = "String")
     })
     @GetMapping("/getTree")
-    public R<List<Profession>> getTree(Integer type,Integer userId) {
+    public R<List<Profession>> getTree(Integer type,Integer userId,String gradeType) {
         if (null == type || null == userId) {
             return R.error("入参为空!");
         }
-        return professionService.getTree(type,userId);
+        return professionService.getTree(type,userId,gradeType);
     }
 }