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
fccbb007
Commit
fccbb007
authored
Oct 23, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
385789bb
c38e26a8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+1
-1
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+1
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
fccbb007
...
@@ -204,7 +204,7 @@ public class FascController {
...
@@ -204,7 +204,7 @@ public class FascController {
TEmployeeContractPre
pre
=
tEmployeeContractPreService
.
getOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
TEmployeeContractPre
pre
=
tEmployeeContractPreService
.
getOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getRequestId
,
signTaskId
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
eq
(
TEmployeeContractPre:
:
getRequestId
,
signTaskId
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
YifuUser
user
=
getNewYifuUser
();
YifuUser
user
=
getNewYifuUser
();
if
(
pre
!=
null
)
{
if
(
pre
!=
null
&&
Common
.
isNotNull
(
pre
.
getProcessStatus
())
&&
!
pre
.
getProcessStatus
().
equals
(
CommonConstants
.
dingleDigitStrArray
[
9
])
)
{
TEmployeeContractInfo
contractInfo
=
null
;
TEmployeeContractInfo
contractInfo
=
null
;
if
(
Common
.
isNotNull
(
pre
.
getContractId
()))
{
if
(
Common
.
isNotNull
(
pre
.
getContractId
()))
{
//如果存在合同申请审核数据,将状态更新成待提交
//如果存在合同申请审核数据,将状态更新成待提交
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
fccbb007
...
@@ -854,6 +854,7 @@ public class FascUtil {
...
@@ -854,6 +854,7 @@ public class FascUtil {
pushLog
.
setTypeKey
(
"获取附件,身份证:"
+
empIdCard
);
pushLog
.
setTypeKey
(
"获取附件,身份证:"
+
empIdCard
);
pushLog
.
setTypeName
(
"获取附件"
);
pushLog
.
setTypeName
(
"获取附件"
);
pushLog
.
setContractId
(
contract
.
getId
());
pushLog
.
setContractId
(
contract
.
getId
());
pushLog
.
setSignTaskId
(
contract
.
getRequestId
());
tFascPushLogService
.
save
(
pushLog
);
tFascPushLogService
.
save
(
pushLog
);
BaseRes
<
SignTaskGetFileRes
>
res
=
signTaskClient
.
signTaskGetFile
(
signTaskGetFileReq
);
BaseRes
<
SignTaskGetFileRes
>
res
=
signTaskClient
.
signTaskGetFile
(
signTaskGetFileReq
);
...
...
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