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
63c86599
Commit
63c86599
authored
Oct 22, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
f404b8d4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
10 deletions
+16
-10
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+0
-9
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+6
-1
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+10
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
63c86599
...
...
@@ -16,7 +16,6 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.fasc.open.api.exception.ApiException
;
...
...
@@ -213,14 +212,6 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
}
else
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
contract
.
getSignType
()))
{
return
R
.
failed
(
"签署方式不是电子签,不可发起电子签署"
);
}
if
(
Common
.
isEmpty
(
contract
.
getProcessStatus
()))
{
return
R
.
failed
(
"合同无状态,请联系管理员"
);
}
else
if
(!(
CommonConstants
.
dingleDigitStrArray
[
1
].
equals
(
contract
.
getProcessStatus
())
||
CommonConstants
.
dingleDigitStrArray
[
2
].
equals
(
contract
.
getProcessStatus
())
||
CommonConstants
.
dingleDigitStrArray
[
5
].
equals
(
contract
.
getProcessStatus
())
||
CommonConstants
.
dingleDigitStrArray
[
7
].
equals
(
contract
.
getProcessStatus
())))
{
return
R
.
failed
(
"合同状态不是待发起、发起失败、签署失败,不可发起电子签署!"
);
}
// 如果状态过多,可以改为这个:
// ArrayUtils.contains(forbidStatusArr, tGzOfferInfo.getOfferStatus())
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
63c86599
...
...
@@ -545,12 +545,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
//合同状态初始为签署中
contractPre
.
setProcessStatus
(
"1"
.
equals
(
contractPre
.
getSignType
())
?
CommonConstants
.
TWO_STRING
:
CommonConstants
.
SIX_STRING
);
contractPre
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPre
.
setErrorInfo
(
""
);
contractPre
.
setErrorTime
(
null
);
contractPreMapper
.
updateById
(
contractPre
);
if
(
"0"
.
equals
(
contractPre
.
getSignType
()))
{
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
FOUR_INT
);
}
}
}
// 瓜子项目编码:皖A694302
...
...
@@ -659,7 +663,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getAuditStatus
())
&&
CommonConstants
.
ZERO_INT
!=
tEmployeeContractInfo
.
getAuditStatus
())
{
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
if
(
CommonConstants
.
ONE_INT
==
tEmployeeContractInfo
.
getAuditStatus
())
{
if
(
CommonConstants
.
ONE_INT
==
tEmployeeContractInfo
.
getAuditStatus
()
||
CommonConstants
.
FOUR_INT
==
tEmployeeContractInfo
.
getAuditStatus
())
{
audit
.
setRootName
(
"提交申请"
);
}
if
(
CommonConstants
.
dingleDigitIntArray
[
2
]
==
tEmployeeContractInfo
.
getAuditStatus
())
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
63c86599
...
...
@@ -454,6 +454,16 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
ErrorMessage
<
EmployeeContractVO
>
errorMessage
=
new
ErrorMessage
<>(
contractVO
.
getRowIndex
(),
errorMsg
);
errorMessage
.
setData
(
contractVO
);
errorMessageListAll
.
add
(
errorMessage
);
}
else
{
if
(
Common
.
isNotNull
(
contractPre
.
getContractId
()))
{
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
audit
.
setRootName
(
"签署中"
);
audit
.
setLinkId
(
contractPre
.
getContractId
());
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setCreateName
(
"法大大电子签"
);
audit
.
setCreateBy
(
"1"
);
tEmployeeContractAuditService
.
save
(
audit
);
}
}
}
}
...
...
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