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
f8b87ad3
Commit
f8b87ad3
authored
Oct 22, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.16-去掉电子签的审核日志
parent
63c86599
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+5
-5
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+1
-1
TEmployeeContractInfoService.java
...1/yifu/archives/service/TEmployeeContractInfoService.java
+2
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+5
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
f8b87ad3
...
...
@@ -223,7 +223,8 @@ public class FascController {
boolean
flag
=
fascService
.
getFileByRequestId
(
pre
.
getId
());
contractInfo
.
setAuditStatus
(
CommonConstants
.
TWO_INT
);
tEmployeeContractInfoService
.
auditContract
(
contractInfo
,
user
);
// 传了false,就不要审核日志
tEmployeeContractInfoService
.
auditContract
(
contractInfo
,
user
,
false
);
if
(
flag
)
{
// 加日志
this
.
saveAuditLogSuccess
(
pre
,
"归档成功"
);
...
...
@@ -309,25 +310,24 @@ public class FascController {
public
void
saveAuditLogSuccess
(
TEmployeeContractPre
tEmployeeContractPre
,
String
rootName
)
{
// 加流程进展明细
if
(
tEmployeeContractPre
!=
null
&&
Common
.
isNotNull
(
tEmployeeContractPre
.
getContractId
()))
{
this
.
saveAuditLogInfo
(
tEmployeeContractPre
.
getContractId
(),
rootName
,
"审核通过"
,
null
);
this
.
saveAuditLogInfo
(
tEmployeeContractPre
.
getContractId
(),
rootName
,
null
);
}
}
// 加合同里的流程进展明细的日志——失败
public
void
saveAuditLogFail
(
TEmployeeContractPre
tEmployeeContractPre
,
String
rootName
,
String
remark
)
{
// 加流程进展明细
if
(
tEmployeeContractPre
!=
null
&&
Common
.
isNotNull
(
tEmployeeContractPre
.
getContractId
()))
{
this
.
saveAuditLogInfo
(
tEmployeeContractPre
.
getContractId
(),
rootName
,
"审核不通过"
,
remark
);
this
.
saveAuditLogInfo
(
tEmployeeContractPre
.
getContractId
(),
rootName
,
remark
);
}
}
// 加合同里的流程进展明细的日志
public
void
saveAuditLogInfo
(
String
contractId
,
String
rootName
,
String
auditStatus
,
String
remark
)
{
public
void
saveAuditLogInfo
(
String
contractId
,
String
rootName
,
String
remark
)
{
// 加流程进展明细
if
(
Common
.
isNotNull
(
contractId
))
{
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
audit
.
setRootName
(
rootName
);
audit
.
setLinkId
(
contractId
);
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setAuditStatus
(
auditStatus
);
if
(
Common
.
isNotNull
(
remark
))
{
audit
.
setRemark
(
remark
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
f8b87ad3
...
...
@@ -228,7 +228,7 @@ public class TEmployeeContractInfoController {
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getAuditRemark
())
&&
tEmployeeContractInfo
.
getAuditRemark
().
length
()
>
200
)
{
return
R
.
failed
(
ArchivesConstants
.
CONTRACT_AUDIT_REMARK_TOO_LONG
);
}
return
tEmployeeContractInfoService
.
auditContract
(
tEmployeeContractInfo
,
user
);
return
tEmployeeContractInfoService
.
auditContract
(
tEmployeeContractInfo
,
user
,
true
);
}
/**
* @Author fxj
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractInfoService.java
View file @
f8b87ad3
...
...
@@ -98,12 +98,13 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
/**
* @param tEmployeeContractInfo
* @param user
* @param isNotFascLog 是否要日志,默认true,如果是法大大回调的成功审核,不加日志
* @Description: 审核
* @Author: hgw
* @Date: 2022/7/1 10:23
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
String
>
auditContract
(
TEmployeeContractInfo
tEmployeeContractInfo
,
YifuUser
user
);
R
<
String
>
auditContract
(
TEmployeeContractInfo
tEmployeeContractInfo
,
YifuUser
user
,
boolean
isNotFascLog
);
/**
* @param id
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
f8b87ad3
...
...
@@ -785,7 +785,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
@Override
public
R
<
String
>
auditContract
(
TEmployeeContractInfo
tEmployeeContractInfo
,
YifuUser
user
)
{
public
R
<
String
>
auditContract
(
TEmployeeContractInfo
tEmployeeContractInfo
,
YifuUser
user
,
boolean
isNotFascLog
)
{
// 是否电子签,默认否
boolean
fascFlag
=
false
;
if
(
tEmployeeContractInfo
!=
null
)
{
...
...
@@ -958,7 +958,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo
.
setAuditUserName
(
user
.
getNickname
());
tEmployeeContractInfo
.
setContractNo
(
contractInfo
.
getContractNo
());
// 不是待提交,记录审核记录
this
.
setAuditInfo
(
tEmployeeContractInfo
);
// 非法大大,要日志,法大大的签署完成,不要这个日志,有了其他的日志
if
(
isNotFascLog
)
{
this
.
setAuditInfo
(
tEmployeeContractInfo
);
}
this
.
updateById
(
tEmployeeContractInfo
);
return
R
.
ok
();
}
...
...
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