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
f92e0714
Commit
f92e0714
authored
Apr 24, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Plain Diff
修改bug
parents
9649611e
7337bef2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
HouseholdPvDto.java
...eejoin/amos/boot/module/jxiop/api/dto/HouseholdPvDto.java
+3
-0
HouseholdPv.java
...eejoin/amos/boot/module/jxiop/api/entity/HouseholdPv.java
+6
-0
PersonBasicServiceImpl.java
...module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
+2
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvDto.java
View file @
f92e0714
...
...
@@ -95,6 +95,9 @@ public class HouseholdPvDto extends BaseDto {
@ApiModelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
@ApiModelProperty
(
value
=
"是否长期有效(1 是 0 否)"
)
private
String
isPermanently
;
/** 合同信息 */
private
HouseholdPvContactDto
contactInfo
;
/** 租赁物信息 */
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/HouseholdPv.java
View file @
f92e0714
...
...
@@ -147,4 +147,10 @@ public class HouseholdPv extends BaseEntity {
@TableField
(
"create_time"
)
private
Date
createTime
;
/**
* 是否长期有效(1 是 0 否, int类型组件回显不了)
*/
@TableField
(
"is_permanently"
)
private
String
isPermanently
;
}
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 @
f92e0714
...
...
@@ -120,6 +120,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
BeanUtils
.
copyProperties
(
personUser
,
personBasic
);
if
(
departmentModel
!=
null
){
personBasic
.
setProjectOrgCode
(
departmentModel
.
getOrgCode
());
personAccount
.
setProjectDepartmentName
(
departmentModel
.
getDepartmentName
());
}
else
{
personBasic
.
setProjectOrgCode
(
companyModel
.
getOrgCode
());
}
...
...
@@ -135,7 +136,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//人员账号信息
personAccount
.
setPersonId
(
personBasic
.
getSequenceNbr
());
personAccount
.
setPuserId
(
agencyUserModel
.
getUserId
());
personAccount
.
setProjectDepartmentName
(
departmentModel
.
getDepartmentName
());
personAccount
.
setProjectName
(
companyModel
.
getCompanyName
());
personAccountService
.
save
(
personAccount
);
}
...
...
@@ -196,6 +196,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
BeanUtils
.
copyProperties
(
personUser
,
personBasic
);
if
(
departmentModel
!=
null
){
personBasic
.
setProjectOrgCode
(
departmentModel
.
getOrgCode
());
personAccount
.
setProjectDepartmentName
(
departmentModel
.
getDepartmentName
());
}
else
{
personBasic
.
setProjectOrgCode
(
companyModel
.
getOrgCode
());
}
...
...
@@ -211,7 +212,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
personCertificateService
.
updateById
(
personCertificate
);
//人员账号信息
personAccount
.
setPersonId
(
sequenceNbr
);
personAccount
.
setProjectDepartmentName
(
departmentModel
.
getDepartmentName
());
personAccount
.
setProjectName
(
companyModel
.
getCompanyName
());
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