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
e21c67f0
Commit
e21c67f0
authored
Nov 15, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-配置修改
parent
fe58b54a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
EmpContractDispatchVo.java
...cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java
+11
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java
View file @
e21c67f0
...
...
@@ -220,6 +220,17 @@ public class EmpContractDispatchVo implements Serializable {
@Schema
(
description
=
"客户名称"
,
name
=
"subjectUnit"
)
private
String
subjectUnit
;
/**
* 试用期(单位月)
*/
@Length
(
max
=
4
,
message
=
"试用期 不能超过4 个字符"
)
@ExcelAttribute
(
name
=
"试用期"
,
maxLength
=
32
)
@Schema
(
description
=
"试用期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"试用期"
)
@ExcelIgnore
private
String
tryPeriod
;
/**
* 合同年限
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
e21c67f0
...
...
@@ -2073,6 +2073,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
contract
.
setEmpName
(
excel
.
getEmpName
());
contract
.
setWorkingHours
(
excel
.
getWorkingHours
());
contract
.
setContractTerm
(
excel
.
getContractTerm
());
contract
.
setTryPeriod
(
excel
.
getTryPeriod
());
if
(
Common
.
isNotNull
(
excel
.
getSocialHousehold
())){
contract
.
setContractParty
(
excel
.
getSocialHousehold
());
}
...
...
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