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
f27d4dc8
Commit
f27d4dc8
authored
Jan 24, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改方案接口
parent
dfa695fc
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
128 additions
and
21 deletions
+128
-21
UserVolunteerMapper.java
...rc/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java
+4
-1
UsersMapper.java
...mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
+4
-1
UserVolunteerMapper.xml
...-mapper/src/main/resources/mapper/UserVolunteerMapper.xml
+1
-1
UsersMapper.xml
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+18
-2
VolunteerMapper.xml
...ergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
+9
-9
User.java
...ergy-model/src/main/java/cn/wisenergy/model/app/User.java
+1
-1
UserVolunteer.java
...l/src/main/java/cn/wisenergy/model/app/UserVolunteer.java
+5
-0
Volunteer.java
...model/src/main/java/cn/wisenergy/model/app/Volunteer.java
+21
-1
UserService.java
...e/src/main/java/cn/wisenergy/service/app/UserService.java
+4
-1
UserVolunteerService.java
...n/java/cn/wisenergy/service/app/UserVolunteerService.java
+11
-0
SchemeServiceImpl.java
...java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
+9
-4
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+11
-0
UserVolunteerServiceImpl.java
.../wisenergy/service/app/impl/UserVolunteerServiceImpl.java
+16
-0
UserController.java
...cn/wisenergy/web/admin/controller/app/UserController.java
+14
-0
No files found.
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java
View file @
f27d4dc8
...
...
@@ -6,6 +6,9 @@ import org.apache.ibatis.annotations.Param;
import
java.util.List
;
/**
* @author 86187
*/
public
interface
UserVolunteerMapper
extends
BaseMapper
<
UserVolunteer
>
{
UserVolunteer
add
(
UserVolunteer
userVolunteer
);
...
...
@@ -14,5 +17,5 @@ public interface UserVolunteerMapper extends BaseMapper<UserVolunteer> {
int
delById
(
@Param
(
"id"
)
Integer
id
);
int
creates
(
List
<
UserVolunteer
>
t
);
int
creates
(
@Param
(
"list"
)
List
<
UserVolunteer
>
lis
t
);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @
f27d4dc8
package
cn
.
wisenergy
.
mapper
;
import
cn.hutool.system.UserInfo
;
import
cn.wisenergy.model.app.User
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
...
...
@@ -9,10 +10,10 @@ import java.util.List;
import
java.util.Map
;
/**
* @author 86187
* @ Description:
* @ Author : 86187
* @ Date : 2021/1/6 15:32
* @author 86187
*/
@Mapper
public
interface
UsersMapper
extends
BaseMapper
<
User
>
{
...
...
@@ -47,4 +48,6 @@ public interface UsersMapper extends BaseMapper<User> {
Integer
getUserNumbers
();
User
getByPhone
(
@Param
(
"phone"
)
String
phone
);
List
<
User
>
test
(
@Param
(
"list"
)
List
<
String
>
list
);
}
wisenergy-mapper/src/main/resources/mapper/UserVolunteerMapper.xml
View file @
f27d4dc8
...
...
@@ -10,7 +10,7 @@
</resultMap>
<sql
id=
"table"
>
user
user
_volunteer
</sql>
<sql
id=
"cols_all"
>
...
...
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @
f27d4dc8
...
...
@@ -106,7 +106,8 @@
<if
test=
"startTime != null"
>
and create_time
between #{startTime}
</if>
between #{startTime}
</if>
<if
test=
"endTime != null"
>
and #{endTime}
</if>
order by create_time desc
...
...
@@ -128,4 +129,19 @@
<include
refid=
"table"
/>
where is_delete=0 and phone=#{phone}
</select>
<select
id=
"test"
resultType=
"cn.wisenergy.model.app.User"
>
select
<include
refid=
"cols_all"
/>
from
<include
refid=
"table"
/>
<where>
<if
test=
"list != null"
>
<foreach
collection=
"list"
index=
"index"
item=
"id"
separator=
"or"
open=
"("
close=
")"
>
user_name LIKE CONCAT('%',#{id},'%')
</foreach>
</if>
</where>
</select>
</mapper>
wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
View file @
f27d4dc8
...
...
@@ -12,7 +12,7 @@
<result
column=
"nature"
property=
"nature"
/>
<result
column=
"year_limit"
property=
"yearLimit"
/>
<result
column=
"plan_num"
property=
"planNum"
/>
<result
column=
"cast
A
rchives_num"
property=
"castArchivesNum"
/>
<result
column=
"cast
_a
rchives_num"
property=
"castArchivesNum"
/>
<result
column=
"launch_num"
property=
"launchNum"
/>
<result
column=
"lowest_mark"
property=
"lowestMark"
/>
<result
column=
"lowest_rank"
property=
"lowestRank"
/>
...
...
@@ -32,7 +32,7 @@
<sql
id=
"cols_exclude_id"
>
type,scheme_id,major_name,academy, course_demand,nature,year_limit,plan_num,
cast
A
rchives_num,launch_num,lowest_mark,
cast
_a
rchives_num,launch_num,lowest_mark,
lowest_rank,is_delete,create_time,update_time
</sql>
...
...
@@ -51,7 +51,7 @@
<if
test=
"nature != null"
>
nature =#{nature},
</if>
<if
test=
"yearLimit != null"
>
year_limit =#{yearLimit},
</if>
<if
test=
"planNum != null"
>
plan_num =#{planNum},
</if>
<if
test=
"castArchivesNum != null"
>
cast
A
rchives_num = #{castArchivesNum},
</if>
<if
test=
"castArchivesNum != null"
>
cast
_a
rchives_num = #{castArchivesNum},
</if>
<if
test=
"launchNum != null"
>
launch_num = #{launchNum},
</if>
<if
test=
"lowestMark != null"
>
lowest_mark = #{lowestMark},
</if>
<if
test=
"lowestRank != null"
>
lowestMark = #{lowestRank},
</if>
...
...
@@ -69,7 +69,7 @@
<if
test=
"nature != null"
>
and nature =#{nature}
</if>
<if
test=
"yearLimit != null"
>
and year_limit =#{yearLimit}
</if>
<if
test=
"planNum != null"
>
and plan_num =#{planNum}
</if>
<if
test=
"castArchivesNum != null"
>
and cast
A
rchives_num = #{castArchivesNum}
</if>
<if
test=
"castArchivesNum != null"
>
and cast
_a
rchives_num = #{castArchivesNum}
</if>
<if
test=
"launchNum != null"
>
and launch_num = #{launchNum}
</if>
<if
test=
"lowestMark != null"
>
and lowest_mark = #{lowestMark}
</if>
<if
test=
"lowestRank != null"
>
and lowestMark = #{lowestRank}
</if>
...
...
@@ -152,18 +152,18 @@
</if>
<if
test=
"classNames != null"
>
and
<foreach
collection=
"
list
"
index=
"index"
item=
"id"
separator=
"or"
open=
"("
close=
")"
>
course_demand LIKE CONCAT('%',#{i
tem
},'%')
<foreach
collection=
"
classNames
"
index=
"index"
item=
"id"
separator=
"or"
open=
"("
close=
")"
>
course_demand LIKE CONCAT('%',#{i
d
},'%')
</foreach>
</if>
<if
test=
"professionNames != null"
>
and
<foreach
collection=
"
list
"
index=
"index"
item=
"id"
separator=
"or"
open=
"("
close=
")"
>
major_name LIKE CONCAT('%',#{i
tem
},'%')
<foreach
collection=
"
professionNames
"
index=
"index"
item=
"id"
separator=
"or"
open=
"("
close=
")"
>
major_name LIKE CONCAT('%',#{i
d
},'%')
</foreach>
</if>
limit #{number}
order by lowest_mark desc
limit #{number}
</where>
</select>
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @
f27d4dc8
...
...
@@ -18,7 +18,7 @@ import java.util.Date;
@Data
@ApiModel
(
value
=
"AccountUsers"
)
@TableName
(
"user"
)
public
class
User
extends
BaseEntity
implements
Serializable
{
public
class
User
implements
Serializable
{
private
static
final
long
serialVersionUID
=
2525339404301884673L
;
/**
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/UserVolunteer.java
View file @
f27d4dc8
package
cn
.
wisenergy
.
model
.
app
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* @author 86187
*/
@Data
@ApiModel
(
value
=
"UserVolunteer"
)
@TableName
(
"user_volunteer"
)
public
class
UserVolunteer
{
/**
* 用户方案id
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java
View file @
f27d4dc8
...
...
@@ -25,7 +25,7 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
@ExcelIgnoreUnannotated
public
class
Volunteer
extends
BaseEntity
implements
Serializable
{
public
class
Volunteer
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7880251929353475087L
;
/**
...
...
@@ -117,4 +117,24 @@ public class Volunteer extends BaseEntity implements Serializable {
@ExcelProperty
(
value
=
"最低位次"
)
private
String
lowestRank
;
/**
* 创建时间
*/
@ApiModelProperty
(
"创建时间"
)
private
Date
createTime
;
/**
* 修改时间
*/
@ApiModelProperty
(
"修改时间"
)
private
Date
updateTime
;
/**
* 删除标记
*/
@ApiModelProperty
(
"是否删除 1,删除;0,未删除"
)
private
Integer
isDelete
;
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @
f27d4dc8
package
cn
.
wisenergy
.
service
.
app
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.app.User
;
import
cn.wisenergy.model.dto.UserCommitDto
;
...
...
@@ -10,6 +9,8 @@ import cn.wisenergy.model.vo.UserQueryVo;
import
cn.wisenergy.model.vo.UserShowVo
;
import
com.github.pagehelper.PageInfo
;
import
java.util.List
;
/**
* @ Description: 用户接口
* @ Author : 86187
...
...
@@ -58,4 +59,6 @@ public interface UserService {
*/
R
<
UserShowVo
>
getById
(
Integer
id
);
R
<
List
<
User
>>
test
();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserVolunteerService.java
0 → 100644
View file @
f27d4dc8
package
cn
.
wisenergy
.
service
.
app
;
import
cn.wisenergy.model.app.UserVolunteer
;
import
com.baomidou.mybatisplus.extension.service.IService
;
/**
* @author 86187
*/
public
interface
UserVolunteerService
extends
IService
<
UserVolunteer
>
{
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @
f27d4dc8
...
...
@@ -10,6 +10,8 @@ import cn.wisenergy.model.enums.StudentType;
import
cn.wisenergy.model.vo.SchemeQueryVo
;
import
cn.wisenergy.model.vo.VolunteerVo
;
import
cn.wisenergy.service.app.SchemeService
;
import
cn.wisenergy.service.app.UserVolunteerService
;
import
cn.wisenergy.service.app.VolunteerService
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -55,6 +57,9 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
@Autowired
private
ProfessionMapper
professionMapper
;
@Autowired
private
UserVolunteerService
userVolunteerService
;
@Override
public
R
<
VolunteerVo
>
getList
(
SchemeQueryVo
queryVo
)
{
log
.
info
(
"volunteer-service[]SchemeServiceImpl[]getList[]input.param.queryVo:"
+
queryVo
);
...
...
@@ -263,7 +268,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
* @param list 志愿信息
* @return true 成功 false 失败
*/
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
saveUserVolunteer
(
User
user
,
List
<
Volunteer
>
list
,
ScoreInfo
scoreInfo
)
{
//1、保存方案查询记录
SchemeQueryRecord
schemeQueryRecord
=
new
SchemeQueryRecord
();
...
...
@@ -290,8 +295,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
volunteerList
.
add
(
userVolunteer
);
}
int
save
=
userVolunteerMapper
.
creates
(
volunteerList
);
if
(
volunteerList
.
size
()
!=
save
)
{
boolean
bool
=
userVolunteerService
.
saveBatch
(
volunteerList
);
if
(
!
bool
)
{
return
false
;
}
return
true
;
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
f27d4dc8
package
cn
.
wisenergy
.
service
.
app
.
impl
;
import
cn.hutool.system.UserInfo
;
import
cn.wisenergy.common.constant.CommonAttributes
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.mapper.*
;
...
...
@@ -214,6 +215,16 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
return
R
.
ok
(
userShowVo
);
}
@Override
public
R
<
List
<
User
>>
test
()
{
List
<
String
>
names
=
new
ArrayList
<>();
names
.
add
(
"黎楚川"
);
names
.
add
(
"陈成"
);
names
.
add
(
"雷青松"
);
List
<
User
>
list
=
usersMapper
.
test
(
names
);
return
R
.
ok
(
list
);
}
/**
* 分页处理方法
*
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserVolunteerServiceImpl.java
0 → 100644
View file @
f27d4dc8
package
cn
.
wisenergy
.
service
.
app
.
impl
;
import
cn.wisenergy.mapper.UserVolunteerMapper
;
import
cn.wisenergy.model.app.UserVolunteer
;
import
cn.wisenergy.service.app.UserVolunteerService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
java.io.Serializable
;
/**
* @author 86187
*/
@Service
public
class
UserVolunteerServiceImpl
extends
ServiceImpl
<
UserVolunteerMapper
,
UserVolunteer
>
implements
UserVolunteerService
{
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
View file @
f27d4dc8
package
cn
.
wisenergy
.
web
.
admin
.
controller
.
app
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.app.User
;
import
cn.wisenergy.model.dto.UserCommitDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.vo.UserInfoVo
;
...
...
@@ -15,6 +16,8 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
* @ Description: 用户管理模
...
...
@@ -30,6 +33,7 @@ public class UserController {
@Autowired
private
UserService
userService
;
@ApiOperation
(
value
=
"用户管理"
,
notes
=
"用户管理"
,
httpMethod
=
"POST"
)
@ApiImplicitParam
(
name
=
"queryVo"
,
value
=
"用户信息"
,
dataType
=
"UserQueryVo"
)
@PostMapping
(
"/manage"
)
...
...
@@ -78,4 +82,14 @@ public class UserController {
//返回数据
return
userService
.
getById
(
userId
);
}
@ApiOperation
(
value
=
"测试like循环查询"
,
notes
=
"测试like循环查询"
,
httpMethod
=
"GET"
)
@GetMapping
(
"/test"
)
public
R
<
List
<
User
>>
test
()
{
log
.
info
(
"UserController[]test[]input.param"
);
//返回数据
return
userService
.
test
();
}
}
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