Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
a7c51230
Commit
a7c51230
authored
Apr 23, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
910e73c3
49627b03
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
PersonBasicController.java
...ot/module/jxiop/biz/controller/PersonBasicController.java
+2
-2
PersonBasicServiceImpl.java
...module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
+6
-4
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java
View file @
a7c51230
...
...
@@ -54,10 +54,10 @@ public class PersonBasicController extends BaseController {
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/
{sequenceNbr}
"
)
@PutMapping
(
value
=
"/
update
"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新人员基本信息"
,
notes
=
"根据sequenceNbr更新人员基本信息"
)
public
ResponseModel
<
PersonDto
>
updateBySequenceNbrPersonBasic
(
@RequestBody
PersonDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
,
HttpServletRequest
httpServletRequest
)
{
return
ResponseHelper
.
buildResponse
(
personBasicServiceImpl
.
updatePerson
(
model
,
httpServletRequest
));
return
ResponseHelper
.
buildResponse
(
personBasicServiceImpl
.
updatePerson
(
model
,
httpServletRequest
,
sequenceNbr
));
}
/**
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
View file @
a7c51230
...
...
@@ -152,7 +152,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
@Transactional
public
PersonDto
updatePerson
(
PersonDto
model
,
HttpServletRequest
httpServletRequest
)
{
public
PersonDto
updatePerson
(
PersonDto
model
,
HttpServletRequest
httpServletRequest
,
Long
sequenceNbr
)
{
String
appKey
=
httpServletRequest
.
getHeader
(
"appKey"
);
String
product
=
httpServletRequest
.
getHeader
(
"product"
);
String
token
=
httpServletRequest
.
getHeader
(
"token"
);
...
...
@@ -203,6 +203,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//人员基础信息
PersonBasic
personBasic
=
new
PersonBasic
();
personBasic
.
setSequenceNbr
(
sequenceNbr
);
BeanUtils
.
copyProperties
(
personUser
,
personBasic
);
if
(
departmentModel
!=
null
){
personBasic
.
setOrgCode
(
departmentModel
.
getOrgCode
());
...
...
@@ -213,17 +214,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//人员归属信息
PersonAscription
personAscription
=
new
PersonAscription
();
BeanUtils
.
copyProperties
(
personUser
,
personAscription
);
personAscriptionService
.
updateById
(
personAscription
);
personAscription
.
setDepartmentName
(
departmentModel
.
getDepartmentName
());
personAscription
.
setProjectName
(
companyModel
.
getCompanyName
());
personAscriptionService
.
saveOrUpdate
(
personAscription
);
//人员归属信息
PersonSkillEducation
personSkillEducation
=
new
PersonSkillEducation
();
BeanUtils
.
copyProperties
(
personUser
,
personSkillEducation
);
personSkillEducationService
.
saveOrUpdate
(
personSkillEducation
);
personSkillEducationService
.
updateById
(
personSkillEducation
);
//人员资质信息
personCertificateService
.
saveOrUpdate
(
personCertificate
);
personCertificateService
.
updateById
(
personCertificate
);
//人员账号信息
personAccountService
.
saveOrUpdate
(
personAccount
);
personAccountService
.
updateById
(
personAccount
);
return
model
;
}
...
...
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