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
9af2ba87
Commit
9af2ba87
authored
Jan 29, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19
parents
4b70308d
9783db0b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
7 deletions
+31
-7
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+28
-5
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+3
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
9af2ba87
...
@@ -919,9 +919,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -919,9 +919,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
else
{
}
else
{
return
R
.
failed
(
"未找到关联的原合同"
);
return
R
.
failed
(
"未找到关联的原合同"
);
}
}
// 2026-01-29 倩倩:将其他更新为不在用、审核不通过
doZhongZhiContract
(
contractInfo
,
user
);
//该项目下其他在用的合同统一更新成不在用
doOtherContract
(
contractInfo
,
user
);
// 作废、终止审核通过:
// 作废、终止审核通过:
// 更新项目合同状态为(2不在用),档案状态要判断
// 更新项目合同状态为(2不在用),档案状态要判断
TEmployeeProject
tEmployeeProject
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
()
TEmployeeProject
tEmployeeProject
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
()
...
@@ -2104,6 +2102,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -2104,6 +2102,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
errorCount
++;
errorCount
++;
continue
;
continue
;
}
}
//该项目下其他在用的合同统一更新成不在用
doZhongZhiContract
(
contract
,
user
);
// 作废、终止审核通过:
// 作废、终止审核通过:
// 更新项目合同状态为(2不在用),档案状态要判断
// 更新项目合同状态为(2不在用),档案状态要判断
tEmployeeProject
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
()
tEmployeeProject
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
()
...
@@ -2429,11 +2431,32 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -2429,11 +2431,32 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
// 同步处理其他合同
// 同步处理其他合同
private
void
doOtherContract
(
TEmployeeContractInfo
contractInfo
,
YifuUser
user
)
{
private
void
doOtherContract
(
TEmployeeContractInfo
contract
,
YifuUser
user
)
{
List
<
TEmployeeContractInfo
>
contractInfoList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getEmpId
,
contract
.
getEmpId
())
.
eq
(
TEmployeeContractInfo:
:
getSettleDomain
,
contract
.
getSettleDomain
())
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
ne
(
TEmployeeContractInfo:
:
getId
,
contract
.
getId
()));
if
(
Common
.
isNotNull
(
contractInfoList
))
{
for
(
TEmployeeContractInfo
contractInfo1
:
contractInfoList
)
{
contractInfo1
.
setInUse
(
CommonConstants
.
ONE_STRING
);
contractInfo1
.
setAuditUserName
(
user
.
getNickname
());
baseMapper
.
updateById
(
contractInfo1
);
//增加审核记录
this
.
setAuditInfoNew
(
contractInfo1
);
}
}
}
// 同步处理终止合同
private
void
doZhongZhiContract
(
TEmployeeContractInfo
contractInfo
,
YifuUser
user
)
{
// 1将待审核的变为审核不通过且不在用
List
<
TEmployeeContractInfo
>
contractInfoList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
List
<
TEmployeeContractInfo
>
contractInfoList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
contractInfo
.
getEmpIdcard
())
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
contractInfo
.
getEmpIdcard
())
.
eq
(
TEmployeeContractInfo:
:
getSettleDomain
,
contractInfo
.
getSettleDomain
())
.
eq
(
TEmployeeContractInfo:
:
getSettleDomain
,
contractInfo
.
getSettleDomain
())
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getSituation
,
EmployeeConstants
.
SITUATION_SEVEN
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
ne
(
TEmployeeContractInfo:
:
getId
,
contractInfo
.
getId
()));
.
ne
(
TEmployeeContractInfo:
:
getId
,
contractInfo
.
getId
()));
if
(
Common
.
isNotNull
(
contractInfoList
))
{
if
(
Common
.
isNotNull
(
contractInfoList
))
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
9af2ba87
...
@@ -782,8 +782,9 @@ public class SocialFriendConfig {
...
@@ -782,8 +782,9 @@ public class SocialFriendConfig {
ybzyclArr
.
addAll
(
vo
.
getImgListYsd
());
ybzyclArr
.
addAll
(
vo
.
getImgListYsd
());
tszdxx
.
put
(
"ybzycl"
,
ybzyclArr
);
tszdxx
.
put
(
"ybzycl"
,
ybzyclArr
);
}
}
// 职业工种 社保必填 默认“办事人员和有关人员”
// 职业工种 默认“办事人员”
tszdxx
.
put
(
"zygz"
,
"办事人员和有关人员"
);
// 是对应的 “录用工种代码”
tszdxx
.
put
(
"zygz"
,
"办事人员"
);
// 人员身份 个人身份 社保必填 默认“职员”
// 人员身份 个人身份 社保必填 默认“职员”
tszdxx
.
put
(
"grsf"
,
"职员"
);
tszdxx
.
put
(
"grsf"
,
"职员"
);
// 工作时间制度 社保必填
// 工作时间制度 社保必填
...
...
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