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
7b3c017a
Commit
7b3c017a
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
1967432e
0000a36f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+2
-2
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
7b3c017a
...
...
@@ -181,7 +181,7 @@ public class EmployeeProjectExportVO {
private
String
fileTown
;
/**
* 是否大专及以上(0否1是)
* 是否大专及以上(0否1是)
—— readConverterExp 无效,手动翻译
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"是否大专及以上"
)
...
...
@@ -531,7 +531,7 @@ public class EmployeeProjectExportVO {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"档案是否完整"
)
@ExcelAttribute
(
name
=
"档案是否完整"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"档案是否完整"
,
readConverterExp
=
"0=是,1=否"
)
private
String
isComplete
;
private
String
[]
socialStatusArray
;
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
7b3c017a
...
...
@@ -245,7 +245,7 @@
b.EMP_NATRUE AS PROEMP_NATRUE,
a.EMP_LABEL,
t.CONTRACT_PARTY,
a.
IS_COMPLETE
if(ifnull(a.IS_COMPLETE,'1')='0','是','否')
IS_COMPLETE
</sql>
...
...
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