Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
volunteer_service
Commits
f5f00c83
Commit
f5f00c83
authored
Jun 22, 2021
by
cy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改方案查询规则
parent
96b077b8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
34 deletions
+47
-34
SchemeServiceImpl.java
...java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
+42
-29
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+5
-5
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @
f5f00c83
This diff is collapsed.
Click to expand it.
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
f5f00c83
...
...
@@ -295,7 +295,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
userShowVo
.
setComprehensiveScore
(
scoreInfo
.
getCultureGrade
());
AdmissionRule
firstRule
=
admissionRuleMapper
.
getByType
(
SchemeTypeEnums
.
UNDERGRADUATE_CULTURE
.
getCode
());
if
(
null
!=
firstRule
)
{
double
firstCulture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
()
;
double
firstCulture
=
scoreInfo
.
getCultureGrade
()-(
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
())
;
if
(
firstCulture
>=
firstRule
.
getCultureMin
())
{
userShowVo
.
setGradeType
(
GradeType
.
UNDERGRADUATE
.
getDescription
());
}
else
{
...
...
@@ -310,8 +310,8 @@ 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
)
{
double
culture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
()
;
double
major
=
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
()
+
scoreInfo
.
getMajorGrade
()
;
double
culture
=
scoreInfo
.
getCultureGrade
()-(
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
())
;
double
major
=
scoreInfo
.
getMajorGrade
()
-(
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
())
;
if
(
culture
>=
firstRule
.
getCultureMin
()
&&
major
>=
firstRule
.
getProfessionMin
())
{
userShowVo
.
setGradeType
(
GradeType
.
UNDERGRADUATE
.
getDescription
());
}
else
{
...
...
@@ -327,8 +327,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
AdmissionRule
firstRule
=
admissionRuleMapper
.
getByType
(
SchemeTypeEnums
.
UNDERGRADUATE_LITERATURE
.
getCode
());
//本科类比分 = 本年录取分 -去年录取分 + 考生分数
if
(
null
!=
firstRule
)
{
double
culture
=
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
()
+
scoreInfo
.
getCultureGrade
()
;
double
major
=
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
()
+
scoreInfo
.
getMajorGrade
()
;
double
culture
=
scoreInfo
.
getCultureGrade
()-(
firstRule
.
getCurrentYearCulture
()
-
firstRule
.
getCultureMin
())
;
double
major
=
scoreInfo
.
getMajorGrade
()
-(
firstRule
.
getCurrentYearMajor
()
-
firstRule
.
getProfessionMin
())
;
if
(
culture
>=
firstRule
.
getCultureMin
()
&&
major
>=
firstRule
.
getProfessionMin
())
{
userShowVo
.
setGradeType
(
GradeType
.
UNDERGRADUATE
.
getDescription
());
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment