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
e6adcc4d
Commit
e6adcc4d
authored
Feb 18, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
99f1ee24
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
SchemeServiceImpl.java
...java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
+6
-6
application-dev.yml
wisenergy-web-admin/src/main/resources/application-dev.yml
+2
-2
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @
e6adcc4d
...
@@ -247,16 +247,16 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
...
@@ -247,16 +247,16 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
}
//6保存用户方案记录、志愿之间的关联关系,扣减查询次数
//6保存用户方案记录、志愿之间的关联关系,扣减查询次数
//
R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
R
<
Integer
>
bool
=
volunteerManager
.
saveUserVolunteer
(
user
,
list
,
scoreInfo
,
queryVo
.
getBigMajorNames
());
//
if (null != bool && bool.getCode() == 500) {
if
(
null
!=
bool
&&
bool
.
getCode
()
==
500
)
{
//
return R.error(bool.getMessage());
return
R
.
error
(
bool
.
getMessage
());
//
}
}
//排序
//排序
list
.
sort
(
Comparator
.
comparing
(
Volunteer:
:
getLowestMark
).
reversed
());
list
.
sort
(
Comparator
.
comparing
(
Volunteer:
:
getLowestMark
).
reversed
());
volunteerVo
.
setUserId
(
user
.
getId
());
volunteerVo
.
setUserId
(
user
.
getId
());
//
assert bool != null;
assert
bool
!=
null
;
//
volunteerVo.setRecordId(bool.getData());
volunteerVo
.
setRecordId
(
bool
.
getData
());
volunteerVo
.
setVolunteers
(
list
);
volunteerVo
.
setVolunteers
(
list
);
volunteerVo
.
setTotal
(
list
.
size
());
volunteerVo
.
setTotal
(
list
.
size
());
return
R
.
ok
(
volunteerVo
);
return
R
.
ok
(
volunteerVo
);
...
...
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @
e6adcc4d
...
@@ -46,9 +46,9 @@ spring:
...
@@ -46,9 +46,9 @@ spring:
redis
:
redis
:
database
:
0
database
:
0
host
:
localhost
host
:
192.168.110.165
port
:
6379
port
:
6379
password
:
root
# 密码(默认为空)
password
:
adm4HYservice$
# 密码(默认为空)
timeout
:
6000ms
# 连接超时时长(毫秒)
timeout
:
6000ms
# 连接超时时长(毫秒)
jedis
:
jedis
:
pool
:
pool
:
...
...
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