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
ec36886e
Commit
ec36886e
authored
Mar 04, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(企业信息):企业信息和人员信息添加“其他附件”字段
parent
692e5737
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
1 deletion
+22
-1
TzBaseEnterpriseInfoDto.java
...amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java
+3
-0
TzBaseEnterpriseInfo.java
...amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java
+3
-0
TzsUserInfo.java
.../yeejoin/amos/boot/module/tcm/api/entity/TzsUserInfo.java
+7
-0
TzsUserInfoVo.java
...om/yeejoin/amos/boot/module/tcm/api/vo/TzsUserInfoVo.java
+6
-0
TzBaseEnterpriseInfoServiceImpl.java
...tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
+2
-0
TzsUserInfoServiceImpl.java
...t/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java
View file @
ec36886e
...
...
@@ -271,6 +271,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
@ApiModelProperty
(
value
=
"企业营业执照"
)
private
List
unitBusinessLicense
;
@ApiModelProperty
(
value
=
"其他附件"
)
private
List
otherAccessories
;
@ApiModelProperty
(
value
=
"企业许可证书"
)
private
List
unitExequatur
;
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java
View file @
ec36886e
...
...
@@ -190,4 +190,7 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
@ApiModelProperty
(
value
=
"注册类型"
)
private
String
registerType
;
@ApiModelProperty
(
value
=
"其他附件"
)
private
String
otherAccessories
;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsUserInfo.java
View file @
ec36886e
...
...
@@ -155,4 +155,11 @@ public class TzsUserInfo extends BaseEntity {
*/
@TableField
(
"inner_person_code"
)
private
String
innerPersonCode
;
/**
* 其他附件
*/
@TableField
(
value
=
"other_accessories"
)
private
String
otherAccessories
;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/vo/TzsUserInfoVo.java
View file @
ec36886e
...
...
@@ -133,4 +133,10 @@ public class TzsUserInfoVo {
*/
@ApiModelProperty
(
value
=
"内部人员编码"
)
private
String
innerPersonCode
;
/**
* 其他附件
*/
@ApiModelProperty
(
value
=
"其他附件"
)
private
List
<?>
otherAccessories
;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @
ec36886e
...
...
@@ -137,6 +137,7 @@ public class TzBaseEnterpriseInfoServiceImpl
tzBaseEnterpriseInfoDto
.
setSafetyTwoPhoto
(
ObjectUtils
.
isEmpty
(
tzBaseEnterpriseInfo
.
getSafetyTwoPhoto
())
?
new
ArrayList
()
:
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getSafetyTwoPhoto
()));
tzBaseEnterpriseInfoDto
.
setSafetyOnePhoto
(
ObjectUtils
.
isEmpty
(
tzBaseEnterpriseInfo
.
getSafetyOnePhoto
())
?
new
ArrayList
()
:
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getSafetyOnePhoto
()));
tzBaseEnterpriseInfoDto
.
setUnitBusinessLicense
(
ObjectUtils
.
isEmpty
(
tzBaseEnterpriseInfo
.
getUnitBusinessLicense
())
?
new
ArrayList
()
:
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getUnitBusinessLicense
()));
tzBaseEnterpriseInfoDto
.
setOtherAccessories
(
ObjectUtils
.
isEmpty
(
tzBaseEnterpriseInfo
.
getOtherAccessories
())
?
new
ArrayList
()
:
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getOtherAccessories
()));
tzBaseEnterpriseInfoDto
.
setUnitExequatur
(
ObjectUtils
.
isEmpty
(
tzBaseEnterpriseInfo
.
getUnitExequatur
())
?
new
ArrayList
()
:
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getUnitExequatur
()));
tzBaseEnterpriseInfoDto
.
setEquipCategory
(
ObjectUtils
.
isEmpty
(
tzBaseEnterpriseInfo
.
getEquipCategory
())
?
new
ArrayList
()
:
JSON
.
parseArray
(
tzBaseEnterpriseInfo
.
getEquipCategory
()));
}
...
...
@@ -443,6 +444,7 @@ public class TzBaseEnterpriseInfoServiceImpl
tzBaseEnterpriseInfo
.
setIndustrySupervisor
(
ObjectUtils
.
isEmpty
(
map
.
get
(
"industrySupervisor"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"industrySupervisor"
)));
tzBaseEnterpriseInfo
.
setSuperviseOrgCode
(
ObjectUtils
.
isEmpty
(
map
.
get
(
"superviseOrgCode"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"superviseOrgCode"
)));
tzBaseEnterpriseInfo
.
setSuperviseOrgName
(
ObjectUtils
.
isEmpty
(
map
.
get
(
"superviseOrgName"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"superviseOrgName"
)));
tzBaseEnterpriseInfo
.
setOtherAccessories
(
ObjectUtils
.
isEmpty
(
map
.
get
(
"otherAccessories"
))
?
null
:
JSON
.
toJSONString
(
map
.
get
(
"otherAccessories"
)));
//修改工商信息
// RegUnitIc regUnitIc = new RegUnitIc();
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @
ec36886e
...
...
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONArray;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.bo.CompanyBo
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.entity.DataDictionary
;
import
com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl
;
...
...
@@ -206,6 +205,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserInfoVo
.
setIdentification
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getIdentification
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getIdentification
()));
tzsUserInfoVo
.
setProfile
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getProfile
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getProfile
()));
tzsUserInfoVo
.
setAppointDoc
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getAppointDoc
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getAppointDoc
()));
tzsUserInfoVo
.
setOtherAccessories
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getOtherAccessories
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getOtherAccessories
()));
maps
.
put
(
"userInfo"
,
tzsUserInfoVo
);
// LambdaQueryWrapper<TzsUserQualifications> lambda = new QueryWrapper<TzsUserQualifications>().lambda();
// lambda.eq(TzsUserQualifications::getUserInfoId, id);
...
...
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