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
b2d5b985
Commit
b2d5b985
authored
Nov 26, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-优化代码
parent
74636878
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
0 deletions
+33
-0
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+7
-0
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+9
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+17
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
b2d5b985
...
...
@@ -551,6 +551,13 @@ public class TEmployeeContractInfo extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
preName
;
/**
* 离职待办的用户名称
*/
@Schema
(
description
=
"离职待办的用户名称"
)
@TableField
(
exist
=
false
)
private
String
leaveName
;
/**
* 试用期(单位月)
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
b2d5b985
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
...
...
@@ -252,4 +253,12 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"preName"
)
@ExcelProperty
(
value
=
"preName"
)
private
String
preName
;
/**
* 离职待办的用户名称
*/
@Schema
(
description
=
"离职待办的用户名称"
)
@TableField
(
exist
=
false
)
private
String
leaveName
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
b2d5b985
...
...
@@ -701,6 +701,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
audit
.
setCreateBy
(
"1"
);
audit
.
setCreateTime
(
LocalDateTime
.
now
());
}
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getLeaveName
()))
{
audit
.
setCreateName
(
tEmployeeContractInfo
.
getLeaveName
());
audit
.
setCreateBy
(
"1"
);
audit
.
setCreateTime
(
LocalDateTime
.
now
());
}
tEmployeeContractAuditMapper
.
updateById
(
audit
);
}
}
...
...
@@ -957,6 +962,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//审核通过瓜子合同状态更新合同审核通过
updateGzOfferStatus
(
contractInfo
,
CommonConstants
.
THIRTEEN_STRING
,
CommonConstants
.
EIGHT_STRING
,
user
.
getId
(),
user
.
getNickname
());
}
if
(
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
()))
{
// 合同终止,通知离职待办变更状态
this
.
sendLeave
(
contractInfo
.
getId
(),
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
tEmployeeContractInfo
.
getAuditRemark
(),
user
);
}
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
if
(!
fascFlag
)
{
...
...
@@ -970,6 +980,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreMapper
.
updateById
(
contractPre
);
}
}
if
(
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
()))
{
// 合同终止,通知离职待办变更状态
this
.
sendLeave
(
contractInfo
.
getId
(),
CommonConstants
.
TEN_STRING
,
CommonConstants
.
ZERO_STRING
,
tEmployeeContractInfo
.
getAuditRemark
(),
user
);
}
}
tEmployeeContractInfo
.
setAuditUserName
(
user
.
getNickname
());
tEmployeeContractInfo
.
setContractNo
(
contractInfo
.
getContractNo
());
...
...
@@ -1309,6 +1323,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
public
BaseSearchListVO
leaveToReduceContract
(
BaseSearchListVO
paramVo
)
{
List
<
String
>
idList
=
new
ArrayList
<>();
List
<
BaseSearchVO
>
listParam
=
paramVo
.
getListParam
();
String
userName
=
paramVo
.
getUserName
();
Map
<
String
,
BaseSearchVO
>
paramMap
=
new
HashMap
<>();
for
(
BaseSearchVO
param
:
listParam
)
{
idList
.
add
(
param
.
getSearchKey
());
...
...
@@ -1327,6 +1342,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
for
(
EmployeeContractVO
vo
:
excelVOList
)
{
i
++;
vo
.
setRowIndex
(
i
);
vo
.
setLeaveName
(
userName
);
baseSearchVO
=
paramMap
.
get
(
vo
.
getContractId
());
leaveId
=
null
;
if
(
baseSearchVO
!=
null
)
{
...
...
@@ -2517,4 +2533,5 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
null
,
null
,
null
,
null
);
}
}
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