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
e6ffa7e1
Commit
e6ffa7e1
authored
Feb 26, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改个人信息编辑
parent
18e64597
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
75 additions
and
37 deletions
+75
-37
ScoreInfoMapper.java
...er/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java
+4
-1
ScoreInfoMapper.xml
...ergy-mapper/src/main/resources/mapper/ScoreInfoMapper.xml
+1
-1
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+56
-31
VolunteerManager.java
...in/java/cn/wisenergy/service/common/VolunteerManager.java
+14
-4
No files found.
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java
View file @
e6ffa7e1
...
...
@@ -4,6 +4,9 @@ import cn.wisenergy.model.app.ScoreInfo;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
/**
* @author 86187
*/
public
interface
ScoreInfoMapper
extends
BaseMapper
<
ScoreInfo
>
{
/**
* 添加考生成绩
...
...
@@ -29,5 +32,5 @@ public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
*/
int
delById
(
@Param
(
"id"
)
Integer
id
);
ScoreInfo
getById
(
@Param
(
"userId"
)
Integer
userId
);
ScoreInfo
getBy
User
Id
(
@Param
(
"userId"
)
Integer
userId
);
}
wisenergy-mapper/src/main/resources/mapper/ScoreInfoMapper.xml
View file @
e6ffa7e1
...
...
@@ -115,7 +115,7 @@
where id = #{id}
</delete>
<select
id=
"getById"
resultMap=
"userMap"
>
<select
id=
"getBy
User
Id"
resultMap=
"userMap"
>
select
<include
refid=
"cols_all"
/>
from
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
e6ffa7e1
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.*
;
...
...
@@ -19,7 +18,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.CollectionUtils
;
import
java.util.ArrayList
;
...
...
@@ -28,6 +26,7 @@ import java.util.List;
import
java.util.Map
;
/**
* @author 86187
* @ Description: 用户接口实现
* @ Author : 86187
* @ Date : 2021/1/6 16:11
...
...
@@ -54,6 +53,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Autowired
protected
VolunteerManager
volunteerManager
;
private
static
final
int
ERROR_CODE
=
1
;
@Override
public
R
<
PageInfo
<
UserInfoDto
>>
getUserList
(
UserQueryVo
queryVo
)
{
log
.
info
(
"volunteer_service[]UserServiceImpl[]getUserList[]input.param.queryVo:"
+
queryVo
);
...
...
@@ -78,10 +79,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
UserInfoDto
userInfoDto
=
new
UserInfoDto
();
//查询相关信息
ScoreInfo
scoreInfo
=
scoreInfoMapper
.
getById
(
user
.
getId
());
ScoreInfo
scoreInfo
=
scoreInfoMapper
.
getBy
User
Id
(
user
.
getId
());
if
(
null
!=
scoreInfo
)
{
userInfoDto
.
setCultureGrade
(
scoreInfo
.
getCultureGrade
().
toString
());
userInfoDto
.
setMajorGrade
(
null
==
scoreInfo
.
getMajorGrade
()?
""
:
scoreInfo
.
getMajorGrade
().
toString
());
userInfoDto
.
setMajorGrade
(
null
==
scoreInfo
.
getMajorGrade
()
?
""
:
scoreInfo
.
getMajorGrade
().
toString
());
}
LoginRecord
loginRecord
=
loginRecordMapper
.
getById
(
user
.
getId
());
if
(
null
!=
loginRecord
)
{
...
...
@@ -163,10 +164,27 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
user
.
setSource
(
userInfo
.
getSource
());
//3、要提交的用户的成绩信息
ScoreInfo
score
=
scoreInfoMapper
.
getByUserId
(
user
.
getId
());
//检查副科
R
<
Boolean
>
checkScore
=
volunteerManager
.
checkScore
(
score
);
if
(
null
!=
checkScore
&&
checkScore
.
getCode
()
==
ERROR_CODE
)
{
return
R
.
error
(
checkScore
.
getMessage
());
}
ScoreInfo
scoreInfo
=
userInfo
.
getScoreInfo
();
ScoreInfo
flagStatus
=
scoreInfoMapper
.
getByUserId
(
user
.
getId
());
int
flag
;
if
(
null
==
flagStatus
)
{
//新增
flag
=
1
;
}
else
{
//编辑
flag
=
2
;
}
//4、更新用户信息和保存用户成绩
boolean
bool
=
volunteerManager
.
updateAndSaveUserInfo
(
user
,
scoreInfo
);
boolean
bool
=
volunteerManager
.
updateAndSaveUserInfo
(
user
,
scoreInfo
,
flag
);
if
(!
bool
)
{
return
R
.
error
(
"添加用户信息失败!"
);
}
...
...
@@ -202,7 +220,14 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
//3、要提交的用户的成绩信息
ScoreInfo
scoreInfo
=
scoreInfoMapper
.
getById
(
userDto
.
getUserId
());
ScoreInfo
scoreInfo
=
scoreInfoMapper
.
getByUserId
(
userDto
.
getUserId
());
//检查副科
R
<
Boolean
>
checkScore
=
volunteerManager
.
checkScore
(
scoreInfo
);
if
(
null
!=
checkScore
&&
checkScore
.
getCode
()
==
ERROR_CODE
)
{
return
R
.
error
(
checkScore
.
getMessage
());
}
scoreInfo
.
setUserId
(
userDto
.
getUserId
());
scoreInfo
.
setBiologyGrade
(
userDto
.
getScoreInfo
().
getBiologyGrade
());
scoreInfo
.
setChemistryGrade
(
userDto
.
getScoreInfo
().
getChemistryGrade
());
...
...
@@ -264,11 +289,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Override
public
R
<
List
<
User
>>
test
()
{
List
<
String
>
names
=
new
ArrayList
<>();
List
<
String
>
names
=
new
ArrayList
<>();
names
.
add
(
"黎楚川"
);
names
.
add
(
"陈成"
);
names
.
add
(
"雷青松"
);
List
<
User
>
list
=
usersMapper
.
test
(
names
);
List
<
User
>
list
=
usersMapper
.
test
(
names
);
return
R
.
ok
(
list
);
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java
View file @
e6ffa7e1
...
...
@@ -227,7 +227,7 @@ public class VolunteerManager {
* @return true or false
*/
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
updateAndSaveUserInfo
(
User
user
,
ScoreInfo
scoreInfo
)
{
public
boolean
updateAndSaveUserInfo
(
User
user
,
ScoreInfo
scoreInfo
,
Integer
flag
)
{
//1、更新用户信息
int
count
=
usersMapper
.
edit
(
user
);
if
(
count
==
0
)
{
...
...
@@ -239,11 +239,21 @@ public class VolunteerManager {
scoreInfo
.
setMajorGrade
(
0.00
);
}
//flag =1 添加
if
(
null
!=
flag
&&
flag
==
1
)
{
int
save
=
scoreInfoMapper
.
add
(
scoreInfo
);
if
(
save
==
0
)
{
return
false
;
}
}
//flag =2 编辑
if
(
null
!=
flag
&&
flag
==
2
)
{
int
edit
=
scoreInfoMapper
.
edit
(
scoreInfo
);
if
(
edit
==
0
)
{
return
false
;
}
}
return
true
;
}
...
...
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