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
543ffbe8
Commit
543ffbe8
authored
Jul 11, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
法大大代码提交
parent
4208c051
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+21
-0
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+1
-2
TElecEmployeeInfoServiceImpl.java
...u/archives/service/impl/TElecEmployeeInfoServiceImpl.java
+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 @
543ffbe8
...
@@ -404,5 +404,26 @@ public class EmployeeProjectExportVO{
...
@@ -404,5 +404,26 @@ public class EmployeeProjectExportVO{
@DateTimeFormat
(
"yyyy-MM-dd"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
private
LocalDateTime
createTime
;
private
LocalDateTime
createTime
;
/**
* 社保-省
*/
@ExcelAttribute
(
name
=
"社保所在省"
)
@ExcelProperty
(
value
=
"社保所在省"
)
private
String
socialProvince
;
/**
* 社保-市
*/
@ExcelAttribute
(
name
=
"社保所在市"
)
@ExcelProperty
(
value
=
"社保所在市"
)
private
String
socialCity
;
/**
* 社保-县
*/
@ExcelAttribute
(
name
=
"社保所在县"
)
@ExcelProperty
(
value
=
"社保所在县"
)
private
String
socialTown
;
private
List
<
String
>
idList
;
private
List
<
String
>
idList
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
543ffbe8
...
@@ -181,8 +181,7 @@ public class TEmployeeProjectController {
...
@@ -181,8 +181,7 @@ public class TEmployeeProjectController {
/**
/**
* 减项
* 减项
* @param excelVOList
* @param file
* @param bindingResult
* @Author huyc
* @Author huyc
* @Date 2022-06-20
* @Date 2022-06-20
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TElecEmployeeInfoServiceImpl.java
View file @
543ffbe8
...
@@ -155,7 +155,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
...
@@ -155,7 +155,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
}
else
{
}
else
{
dictMap
=
dictR
.
getData
();
dictMap
=
dictR
.
getData
();
elecTypeMapData
=
dictMap
.
get
(
"data"
);
elecTypeMapData
=
dictMap
.
get
(
"data"
);
elecTypeMap
=
elecTypeMapData
.
get
(
"
elec_archives_type
"
);
elecTypeMap
=
elecTypeMapData
.
get
(
"
literature_types
"
);
}
}
// 判断源文件是否存在
// 判断源文件是否存在
if
(!
srcFile
.
exists
())
{
if
(!
srcFile
.
exists
())
{
...
...
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