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
3b66bbd5
Commit
3b66bbd5
authored
Mar 06, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
a4685e6d
daa5833f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
7 deletions
+24
-7
ContractAlertConfirmResVo.java
...d/plus/v1/yifu/archives/vo/ContractAlertConfirmResVo.java
+7
-4
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+17
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ContractAlertConfirmResVo.java
View file @
3b66bbd5
...
...
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -99,7 +100,7 @@ public class ContractAlertConfirmResVo implements Serializable {
@Schema
(
description
=
"合同开始日期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同开始日期"
)
private
Date
contractStart
;
private
String
contractStart
;
/**
* 合同截止日期
...
...
@@ -108,25 +109,27 @@ public class ContractAlertConfirmResVo implements Serializable {
@Schema
(
description
=
"合同截止日期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同截止日期"
)
private
Date
contractEnd
;
private
String
contractEnd
;
/**
* 合同截止日期-续签
*/
@ExcelAttribute
(
name
=
"合同截止日期-续签"
)
@Schema
(
description
=
"合同截止日期-续签"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同截止日期-续签"
)
private
Date
contractEndNew
;
private
String
contractEndNew
;
/**
* 合同开始日期-续签
*/
@ExcelAttribute
(
name
=
"合同开始日期-续签"
)
@Schema
(
description
=
"合同开始日期-续签"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同开始日期-续签"
)
private
Date
contractStartNew
;
private
String
contractStartNew
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
3b66bbd5
...
...
@@ -377,7 +377,20 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
preVoTemp
=
new
TEmployeeContractPreNewVo
();
BeanCopyUtils
.
copyProperties
(
preVo
,
preVoTemp
);
alert
=
alertMap
.
get
(
contract
.
getId
());
temp
=
null
==
confirmMap
?
null
:
confirmMap
.
get
(
contract
.
getId
());
temp
=
new
ContractAlertConfirmResVo
();
temp
.
setContractId
(
contract
.
getId
());
temp
.
setContractEnd
(
null
==
contract
.
getContractEnd
()?
""
:
DateUtil
.
dateToString
(
contract
.
getContractEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
temp
.
setContractStart
(
null
==
contract
.
getContractEnd
()?
""
:
DateUtil
.
dateToString
(
contract
.
getContractEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
temp
.
setEmpIdcard
(
contract
.
getEmpIdcard
());
temp
.
setEmpName
(
contract
.
getEmpName
());
temp
.
setContractType
(
preVoTemp
.
getContractName
());
if
(
"0"
.
equals
(
preVoTemp
.
getSignType
())){
temp
.
setSignType
(
"电子签"
);
}
else
{
temp
.
setSignType
(
"线下签"
);
}
temp
.
setSignatory
(
preVoTemp
.
getSignatory
());
checkVo
=
check
(
preMap
,
scheme
,
rule
,
alert
,
preVoTemp
,
contract
);
if
(
null
!=
checkVo
){
if
(
null
!=
temp
)
{
...
...
@@ -387,8 +400,9 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
temp
.
setErrorMsg
(
checkVo
.
getErrorMsg
());
temp
.
setPost
(
preVoTemp
.
getPost
());
temp
.
setContractEndNew
(
preVoTemp
.
getContractEnd
());
temp
.
setContractStartNew
(
preVoTemp
.
getContractStart
());
temp
.
setContractEndNew
(
null
==
preVoTemp
.
getContractEnd
()?
""
:
DateUtil
.
dateToString
(
preVoTemp
.
getContractEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
temp
.
setContractStartNew
(
null
==
preVoTemp
.
getContractStart
()?
""
:
DateUtil
.
dateToString
(
preVoTemp
.
getContractStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
temp
.
setSignType
(
preVoTemp
.
getSignType
());
checkVo
.
setConfirmVo
(
temp
);
}
errorList
.
add
(
checkVo
);
...
...
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