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
d85f2fae
Commit
d85f2fae
authored
Jan 13, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
e3566c79
5c1fcae8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+1
-1
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+2
-0
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+2
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
d85f2fae
...
@@ -531,7 +531,7 @@ public class EmployeeProjectExportVO {
...
@@ -531,7 +531,7 @@ public class EmployeeProjectExportVO {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"档案是否完整"
)
@ExcelProperty
(
value
=
"档案是否完整"
)
@ExcelAttribute
(
name
=
"档案是否完整"
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"档案是否完整"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
private
String
isComplete
;
private
String
isComplete
;
private
String
[]
socialStatusArray
;
private
String
[]
socialStatusArray
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
d85f2fae
...
@@ -3800,6 +3800,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3800,6 +3800,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo
.
setBankSubName
(
info
.
getBankSubName
());
tPreEmployeeInfo
.
setBankSubName
(
info
.
getBankSubName
());
tPreEmployeeInfo
.
setBankNo
(
info
.
getBankNo
());
tPreEmployeeInfo
.
setBankNo
(
info
.
getBankNo
());
tPreEmployeeInfo
.
setTaxMonth
(
info
.
getTaxMonthValue
());
tPreEmployeeInfo
.
setTaxMonth
(
info
.
getTaxMonthValue
());
}
else
{
}
}
tPreEmployeeInfo
.
setTaxMonthFlag
(
CommonConstants
.
ONE_STRING
);
tPreEmployeeInfo
.
setTaxMonthFlag
(
CommonConstants
.
ONE_STRING
);
tPreEmployeeInfo
.
setContactProvince
(
info
.
getContactProvinceValue
());
tPreEmployeeInfo
.
setContactProvince
(
info
.
getContactProvinceValue
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
d85f2fae
...
@@ -178,7 +178,8 @@
...
@@ -178,7 +178,8 @@
a.SOCIAL_CITY,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.SOCIAL_TOWN,
a.SALARY_STATUS,
a.SALARY_STATUS,
a.EMP_LABEL
a.EMP_LABEL,
a.IS_COMPLETE
</sql>
</sql>
<sql
id=
"Base_Export_List"
>
<sql
id=
"Base_Export_List"
>
...
...
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