修改获取用户信息（本科、专科规则）

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

@@ -295,7 +295,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
                 userShowVo.setComprehensiveScore(scoreInfo.getCultureGrade());
                 AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode());
                 if (null != firstRule) {
-                    if (scoreInfo.getCultureGrade() >= firstRule.getCultureMin()) {
+                    double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
+                    if (firstCulture >= firstRule.getCultureMin()) {
                         userShowVo.setGradeType(GradeType.UNDERGRADUATE.getDescription());
                     } else {
                         userShowVo.setGradeType(GradeType.SPECIALTY.getDescription());
@@ -309,7 +310,9 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
                 userShowVo.setComprehensiveScore(new BigDecimal(score).setScale(2, RoundingMode.UP).doubleValue());
                 AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode());
                 if (null != firstRule) {
-                    if (scoreInfo.getCultureGrade() >= firstRule.getCultureMin() && scoreInfo.getMajorGrade() >= firstRule.getProfessionMin()) {
+                    double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
+                    double major = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
+                    if (culture >= firstRule.getCultureMin() && major >= firstRule.getProfessionMin()) {
                         userShowVo.setGradeType(GradeType.UNDERGRADUATE.getDescription());
                     } else {
                         userShowVo.setGradeType(GradeType.SPECIALTY.getDescription());
@@ -321,10 +324,12 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
                 //综合成绩=专业成绩*750/300*70%+文化成绩*30%
                 Double score=scoreInfo.getMajorGrade() * 750 / 300 * 0.7 + scoreInfo.getCultureGrade() * 0.3;
                 userShowVo.setComprehensiveScore(new BigDecimal(score).setScale(2, RoundingMode.UP).doubleValue());
-
                 AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode());
+                //本科类比分 = 本年录取分 -去年录取分 + 考生分数
                 if (null != firstRule) {
-                    if (scoreInfo.getCultureGrade() >= firstRule.getCultureMin() && scoreInfo.getMajorGrade() >= firstRule.getProfessionMin()) {
+                    double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
+                    double major = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
+                    if (culture >= firstRule.getCultureMin() && major >= firstRule.getProfessionMin()) {
                         userShowVo.setGradeType(GradeType.UNDERGRADUATE.getDescription());
                     } else {
                         userShowVo.setGradeType(GradeType.SPECIALTY.getDescription());
@@ -335,10 +340,12 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             if (StudentType.SPORTS_STUDENT.getCode().equals(user.getExamType())) {
                 //综合成绩=专业成绩*750/100*70%+文化成绩*30%
                 AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
-                double total = scoreInfo.getMajorGrade() * 750 / 100 * 0.7 + scoreInfo.getCultureGrade() * 0.3;
+                double total = scoreInfo.getMajorGrade() * 750 / 100 * 0.7 + scoreInfo.getCultureGrade() * 0.3 ;
                 userShowVo.setComprehensiveScore(new BigDecimal(total).setScale(2, RoundingMode.UP).doubleValue());
                 if (null != firstRule) {
-                    if (total >= firstRule.getCultureMin()) {
+                    double value = firstRule.getCurrentYearCulture() - firstRule.getCultureMin();
+                    double grad=total - value;
+                    if (grad >= firstRule.getCultureMin()) {
                         userShowVo.setGradeType(GradeType.UNDERGRADUATE.getDescription());
                     } else {
                         userShowVo.setGradeType(GradeType.SPECIALTY.getDescription());
@@ -564,10 +571,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         Map<String, Object> map = new HashMap<>(16);
         map.put("vip_mobile",vipMobile);
         User user = usersMapper.selectOne(map);
-        if(null != user && !user.getId().equals(userId)){
-            return false;
-        }
-        return true;
+        return null == user || user.getId().equals(userId);
     }
 
 }