Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
9e4c0f9c
Commit
9e4c0f9c
authored
Jun 26, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
e67a5589
ab25e7d9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
5 deletions
+21
-5
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-1
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+20
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
9e4c0f9c
...
...
@@ -2311,7 +2311,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
changeStatusList
.
size
()
>
0
){
lGuaziOfferRecordVo
.
setOfferId
(
gzOfferInfo
.
getId
());
// 记录来源
: 档案审核
// 记录来源
lGuaziOfferRecordVo
.
setRecordFrom
(
recordFrom
);
lGuaziOfferRecordVo
.
setChangeStatusList
(
changeStatusList
);
lGuaziOfferRecordVo
.
setCreateBy
(
userId
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
9e4c0f9c
...
...
@@ -162,14 +162,22 @@ public class SocialFriendConfig {
// 税友新附件接口说用原来的:那就一批任务里面用一份文件就可以了 还是原来的那个字段 2025-5-16 16:57:00 王赣松
qyzgshbxzyhmclbArr
.
addAll
(
vo
.
getImgList
());
}
json
.
put
(
fileName
,
qyzgshbxzyhmclbArr
);
if
(
type
==
2
||
type
==
4
)
{
json
.
put
(
fileName
,
vo
.
getQyzgshbxzyhmc
());
}
else
{
json
.
put
(
fileName
,
qyzgshbxzyhmclbArr
);
}
}
else
if
(
Common
.
isNotNull
(
vo
.
getQyzgjbylbxcbdjb
()))
{
JSONArray
qyzgshbxzyhmclbArr
=
new
JSONArray
();
qyzgshbxzyhmclbArr
.
add
(
vo
.
getQyzgjbylbxcbdjb
());
if
(
vo
.
getImgList
()
!=
null
&&
!
vo
.
getImgList
().
isEmpty
())
{
qyzgshbxzyhmclbArr
.
addAll
(
vo
.
getImgList
());
}
json
.
put
(
fileName
,
qyzgshbxzyhmclbArr
);
if
(
type
==
2
||
type
==
4
)
{
json
.
put
(
fileName
,
vo
.
getQyzgjbylbxcbdjb
());
}
else
{
json
.
put
(
fileName
,
qyzgshbxzyhmclbArr
);
}
}
HttpEntity
<
String
>
formEntity
=
new
HttpEntity
<>(
json
.
toString
(),
headers
);
...
...
@@ -326,6 +334,7 @@ public class SocialFriendConfig {
JSONObject
tszdxx
;
// 企业职工基本医疗保险参保登记表 安徽非必填! 数组
String
[]
arr
=
{
qyzgjbylbxcbdjb
};
JSONArray
ybzyclArr
;
// 2025-3-14 15:44:32 单个改造为批量
for
(
SociaFriendYgsAddVo
vo
:
listVo
)
{
cbrymdOne
=
new
JSONObject
();
...
...
@@ -417,7 +426,10 @@ public class SocialFriendConfig {
// 单位就业起始时间 社保必填;yyyy-MM-dd
tszdxx
.
put
(
"dwjyqssj"
,
startDate
);
// 安徽非必填!社保个人身份材料 取文件上传后获取的文件路径。图片总大小不超过1M, 材料仅支持图片格式,支持上传jpeg/jpg/png格式。
// tszdxx.put("sbzycl", url)
if
(
vo
.
getImgList
()
!=
null
&&
!
vo
.
getImgList
().
isEmpty
())
{
// 税友接口只允许一张
tszdxx
.
put
(
"sbzycl"
,
vo
.
getImgList
().
get
(
0
));
}
// 用工形式 社保必填 // 盛宇文档对应,只有3种
tszdxx
.
put
(
"ygxs"
,
vo
.
getContractType
());
...
...
@@ -426,7 +438,11 @@ public class SocialFriendConfig {
// 人员类型 默认:在职职工
tszdxx
.
put
(
"rylx"
,
"在职职工"
);
// 医保个人身份材料 安徽非必填! 无
//tszdxx.put("ybzycl", url)
if
(
vo
.
getImgList
()
!=
null
&&
!
vo
.
getImgList
().
isEmpty
())
{
ybzyclArr
=
new
JSONArray
();
ybzyclArr
.
addAll
(
vo
.
getImgList
());
tszdxx
.
put
(
"ybzycl"
,
ybzyclArr
);
}
// 职业工种 社保必填 默认“办事人员和有关人员”
tszdxx
.
put
(
"zygz"
,
"办事人员和有关人员"
);
// 人员身份 个人身份 社保必填 默认“职员”
...
...
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