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
da456737
Commit
da456737
authored
Feb 09, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
方案优化
parent
e60a875c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
3 deletions
+41
-3
UserVolunteerMapper.java
...rc/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java
+2
-0
UserVolunteerMapper.xml
...-mapper/src/main/resources/mapper/UserVolunteerMapper.xml
+6
-0
SchemeService.java
...src/main/java/cn/wisenergy/service/app/SchemeService.java
+4
-0
SchemeServiceImpl.java
...java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
+20
-3
SchemeController.java
.../wisenergy/web/admin/controller/app/SchemeController.java
+9
-0
No files found.
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java
View file @
da456737
...
...
@@ -18,4 +18,6 @@ public interface UserVolunteerMapper extends BaseMapper<UserVolunteer> {
int
delById
(
@Param
(
"id"
)
Integer
id
);
int
creates
(
@Param
(
"list"
)
List
<
UserVolunteer
>
list
);
List
<
UserVolunteer
>
listById
(
Integer
schemeRecordId
);
}
wisenergy-mapper/src/main/resources/mapper/UserVolunteerMapper.xml
View file @
da456737
...
...
@@ -80,4 +80,10 @@
where id = #{id}
</delete>
<select
id=
"listById"
resultType=
"cn.wisenergy.model.app.UserVolunteer"
>
select * from
<include
refid=
"table"
/>
where scheme_record_id = #{schemeRecordId}
</select>
</mapper>
wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeService.java
View file @
da456737
...
...
@@ -7,6 +7,8 @@ import cn.wisenergy.model.vo.SchemeVo;
import
cn.wisenergy.model.vo.VolunteerVo
;
import
com.github.pagehelper.PageInfo
;
import
java.util.List
;
/**
* @ Description: 方案接口定义
...
...
@@ -46,4 +48,6 @@ public interface SchemeService {
* @return 方案下载路径
*/
R
<
String
>
download
(
Integer
schemeId
);
List
<
Integer
>
ceishi
(
Integer
id
);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @
da456737
...
...
@@ -249,7 +249,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//6保存用户方案记录、志愿之间的关联关系,扣减查询次数
R
<
Integer
>
bool
=
volunteerManager
.
saveUserVolunteer
(
user
,
list
,
scoreInfo
,
queryVo
.
getBigMajorNames
());
if
(
null
!=
bool
&&
bool
.
getCode
()
==
500
)
{
return
R
.
error
(
"保存方案查询记录失败!"
);
return
R
.
error
(
bool
.
getMessage
()
);
}
//排序
...
...
@@ -327,6 +327,23 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
return
R
.
ok
(
schemeInfo
.
getFileUrl
());
}
@Override
public
List
<
Integer
>
ceishi
(
Integer
id
)
{
List
<
UserVolunteer
>
list
=
userVolunteerMapper
.
listById
(
id
);
List
<
Integer
>
ids
=
list
.
stream
().
map
(
UserVolunteer:
:
getVolunteerId
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
integerList
=
new
ArrayList
<>();
List
<
Integer
>
result
=
new
ArrayList
<>();
for
(
Integer
vid
:
ids
)
{
if
(
integerList
.
contains
(
vid
))
{
result
.
add
(
vid
);
}
else
{
integerList
.
add
(
vid
);
}
}
return
result
;
}
/**
* 获取文化生志愿列表
...
...
@@ -725,11 +742,11 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
Random
mRandom
=
new
Random
();
int
count
=
mRandom
.
nextInt
(
otherList
.
size
());
if
(
result
.
contains
(
otherList
.
get
(
count
)))
{
otherList
.
remove
(
number
);
otherList
.
remove
(
count
);
continue
;
}
volunteers
.
add
(
otherList
.
get
(
count
));
otherList
.
remove
(
number
);
otherList
.
remove
(
count
);
}
result
.
addAll
(
volunteers
);
}
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java
View file @
da456737
...
...
@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.util.List
;
/**
* @author 86187
...
...
@@ -109,4 +110,12 @@ public class SchemeController {
return
schemeService
.
download
(
schemeId
);
}
@ApiOperation
(
value
=
"测试重复数据"
,
notes
=
"测试重复数据"
,
httpMethod
=
"GET"
)
@ApiImplicitParam
(
name
=
"schemeId"
,
value
=
"方案id"
,
dataType
=
"int"
)
@GetMapping
(
"/ceishi"
)
public
List
<
Integer
>
ceishi
(
Integer
schemeId
)
{
return
schemeService
.
ceishi
(
schemeId
);
}
}
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