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
2882c321
Commit
2882c321
authored
Jul 21, 2025
by
hcing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(tcm): 添加必要证书
parent
976175b5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
7 deletions
+35
-7
TzsUserInfoDto.java
.../yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java
+10
-0
TzsUserInfo.java
.../yeejoin/amos/boot/module/tcm/api/entity/TzsUserInfo.java
+18
-0
TzsUserInfoServiceImpl.java
...t/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
+7
-7
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/TzsUserInfoDto.java
View file @
2882c321
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tcm
.
api
.
dto
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tcm
.
api
.
dto
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -96,6 +97,15 @@ public class TzsUserInfoDto extends BaseDto {
...
@@ -96,6 +97,15 @@ public class TzsUserInfoDto extends BaseDto {
@ApiModelProperty
(
value
=
"劳动合同"
)
@ApiModelProperty
(
value
=
"劳动合同"
)
private
String
laborContract
;
private
String
laborContract
;
@ApiModelProperty
(
value
=
"授权书"
)
private
String
powerAttorney
;
@ApiModelProperty
(
value
=
"养老保险证明"
)
private
String
pensionInsurance
;
@TableField
(
value
=
"检验人员证书"
)
private
String
inspectorCert
;
@ApiModelProperty
(
value
=
"人员内部编码"
)
@ApiModelProperty
(
value
=
"人员内部编码"
)
private
String
innerPersonCode
;
private
String
innerPersonCode
;
...
...
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 @
2882c321
...
@@ -125,6 +125,24 @@ public class TzsUserInfo extends BaseEntity {
...
@@ -125,6 +125,24 @@ public class TzsUserInfo extends BaseEntity {
@TableField
(
value
=
"labor_contract"
)
@TableField
(
value
=
"labor_contract"
)
private
String
laborContract
;
private
String
laborContract
;
/**
* 授权书
*/
@TableField
(
value
=
"power_attorney"
)
private
String
powerAttorney
;
/**
* 养老保险证明
*/
@TableField
(
value
=
"pension_insurance"
)
private
String
pensionInsurance
;
/**
* 检验人员证书
*/
@TableField
(
value
=
"inspector_cert"
)
private
String
inspectorCert
;
/**
/**
* 账户名
* 账户名
...
...
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 @
2882c321
...
@@ -2171,6 +2171,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -2171,6 +2171,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
TzBaseEnterpriseInfo
enterpriseInfo
=
baseEnterpriseInfoService
.
lambdaQuery
()
TzBaseEnterpriseInfo
enterpriseInfo
=
baseEnterpriseInfoService
.
lambdaQuery
()
.
eq
(
TzBaseEnterpriseInfo:
:
getUseCode
,
company
.
getCompanyCode
())
.
eq
(
TzBaseEnterpriseInfo:
:
getUseCode
,
company
.
getCompanyCode
())
.
one
();
.
one
();
// 省内企业标志
boolean
shanXiFlag
=
enterpriseInfo
.
getDataSources
().
equals
(
UnitDataSourceEnum
.
SHAANXI
.
getName
());
List
<
String
>
unitTypes
=
Arrays
.
asList
(
enterpriseInfo
.
getUnitType
().
split
(
"#"
));
List
<
String
>
unitTypes
=
Arrays
.
asList
(
enterpriseInfo
.
getUnitType
().
split
(
"#"
));
unitTypes
.
forEach
(
unitType
->
{
unitTypes
.
forEach
(
unitType
->
{
JsonNode
companyTypeNode
=
postData
.
get
(
unitType
);
JsonNode
companyTypeNode
=
postData
.
get
(
unitType
);
...
@@ -2182,6 +2184,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -2182,6 +2184,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
postDictCodeList
.
add
(
postCode
);
// 主岗位
postDictCodeList
.
add
(
postCode
);
// 主岗位
}
}
}
}
// 删除操作 : 省外 使用单位/安改维单位 企业独有的【检验检测机构区域负责人】6667
Set
<
String
>
validUnitTypes
=
new
HashSet
<>(
Arrays
.
asList
(
"使用单位"
,
"安装改造维修单位"
));
if
(
shanXiFlag
&&
validUnitTypes
.
contains
(
unitType
))
{
postDictCodeList
.
remove
(
"6667"
);
}
});
});
return
this
.
getAllUserType
().
stream
()
return
this
.
getAllUserType
().
stream
()
.
filter
(
item
->
postDictCodeList
.
contains
(
item
.
getCode
()))
.
filter
(
item
->
postDictCodeList
.
contains
(
item
.
getCode
()))
...
@@ -2215,8 +2222,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -2215,8 +2222,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
TzBaseEnterpriseInfo
enterpriseInfo
=
baseEnterpriseInfoService
.
lambdaQuery
()
TzBaseEnterpriseInfo
enterpriseInfo
=
baseEnterpriseInfoService
.
lambdaQuery
()
.
eq
(
TzBaseEnterpriseInfo:
:
getUseCode
,
company
.
getCompanyCode
())
.
eq
(
TzBaseEnterpriseInfo:
:
getUseCode
,
company
.
getCompanyCode
())
.
one
();
.
one
();
// 省内企业标志
boolean
shanXiFlag
=
enterpriseInfo
.
getDataSources
().
equals
(
UnitDataSourceEnum
.
SHAANXI
.
getName
());
List
<
String
>
unitTypes
=
Arrays
.
asList
(
enterpriseInfo
.
getUnitType
().
split
(
"#"
));
List
<
String
>
unitTypes
=
Arrays
.
asList
(
enterpriseInfo
.
getUnitType
().
split
(
"#"
));
unitTypes
.
forEach
(
unitType
->
{
unitTypes
.
forEach
(
unitType
->
{
JsonNode
companyTypeNode
=
postData
.
get
(
unitType
);
JsonNode
companyTypeNode
=
postData
.
get
(
unitType
);
...
@@ -2233,11 +2238,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -2233,11 +2238,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
allPostUnderTheUnit
.
putIfAbsent
(
postCode
,
subPostCode
);
allPostUnderTheUnit
.
putIfAbsent
(
postCode
,
subPostCode
);
}
}
}
}
// 删除操作 : 省外 使用单位/安改维单位 企业独有的【检验检测机构区域负责人】6667
Set
<
String
>
validUnitTypes
=
new
HashSet
<>(
Arrays
.
asList
(
"使用单位"
,
"安装改造维修单位"
));
if
(
shanXiFlag
&&
validUnitTypes
.
contains
(
unitType
))
{
allPostUnderTheUnit
.
remove
(
"6667"
);
}
}
}
});
});
allPostUnderTheUnit
.
forEach
((
postCode
,
subPostCode
)
->
{
allPostUnderTheUnit
.
forEach
((
postCode
,
subPostCode
)
->
{
...
...
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