Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
d8f10ea1
You need to sign in or sign up before continuing.
Commit
d8f10ea1
authored
Dec 21, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
30daa30c
783cf533
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
EmployeeProjectExportParamVO.java
...lus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
+3
-3
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+3
-3
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+5
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
View file @
d8f10ea1
...
@@ -443,12 +443,12 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
...
@@ -443,12 +443,12 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
private
String
projectSource
;
private
String
projectSource
;
/**
/**
* 项目档案状态
(0草稿、1已审核)
* 项目档案状态
*/
*/
@ExcelAttribute
(
name
=
"项目档案状态"
,
readConverterExp
=
"0=草稿,1=已审核"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目档案状态"
)
@ExcelProperty
(
value
=
"项目档案状态"
)
private
String
status
;
@ExcelAttribute
(
name
=
"项目档案状态"
)
private
String
projectStatusReplace
;
/**
/**
* 社保-省
* 社保-省
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
d8f10ea1
...
@@ -442,12 +442,12 @@ public class EmployeeProjectExportVO {
...
@@ -442,12 +442,12 @@ public class EmployeeProjectExportVO {
private
String
projectSource
;
private
String
projectSource
;
/**
/**
* 项目档案状态(0
草稿、1已审核
)
* 项目档案状态(0
=正常,1=已减项
)
*/
*/
@ExcelAttribute
(
name
=
"项目档案状态"
,
readConverterExp
=
"0=草稿,1=已审核"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目档案状态"
)
@ExcelProperty
(
value
=
"项目档案状态"
)
private
String
status
;
@ExcelAttribute
(
name
=
"项目档案状态"
)
private
String
projectStatus
;
/**
/**
* 项目档案创建人
* 项目档案创建人
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
d8f10ea1
...
@@ -60,6 +60,7 @@
...
@@ -60,6 +60,7 @@
<resultMap
id=
"tEmployeeProjectExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO"
>
<resultMap
id=
"tEmployeeProjectExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO"
>
<result
property=
"empCode"
column=
"EMP_CODE"
/>
<result
property=
"empCode"
column=
"EMP_CODE"
/>
<result
property=
"projectStatus"
column=
"PROJECT_STATUS"
/>
<result
property=
"proEmpNatrue"
column=
"PROEMP_NATRUE"
/>
<result
property=
"proEmpNatrue"
column=
"PROEMP_NATRUE"
/>
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
...
@@ -103,7 +104,6 @@
...
@@ -103,7 +104,6 @@
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"proCreateName"
column=
"PROCREATE_NAME"
/>
<result
property=
"proCreateName"
column=
"PROCREATE_NAME"
/>
<result
property=
"proCreateTime"
column=
"PROCREATE_TIME"
/>
<result
property=
"proCreateTime"
column=
"PROCREATE_TIME"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"fileProvince"
column=
"FILE_PROVINCE"
/>
<result
property=
"fileProvince"
column=
"FILE_PROVINCE"
/>
<result
property=
"fileCity"
column=
"FILE_CITY"
/>
<result
property=
"fileCity"
column=
"FILE_CITY"
/>
<result
property=
"fileTown"
column=
"FILE_TOWN"
/>
<result
property=
"fileTown"
column=
"FILE_TOWN"
/>
...
@@ -224,7 +224,7 @@
...
@@ -224,7 +224,7 @@
b.ADMISSION_DATE,
b.ADMISSION_DATE,
b.GRADUTION_DATE,
b.GRADUTION_DATE,
b.REMARK,
b.REMARK,
if(a.STATUS=
0,'草稿','已审核')
STATUS,
if(a.STATUS=
'0','草稿',IF(a.PROJECT_STATUS=1,'已减项','已审核')) PROJECT_
STATUS,
a.CREATE_NAME,
a.CREATE_NAME,
a.CREATE_TIME,
a.CREATE_TIME,
b.EMP_EMAIL,
b.EMP_EMAIL,
...
@@ -435,6 +435,9 @@
...
@@ -435,6 +435,9 @@
<if
test=
"tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''"
>
<if
test=
"tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''"
>
AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
</if>
</if>
<if
test=
"tEmployeeProject.projectStatusReplace != null and tEmployeeProject.projectStatusReplace.trim() != ''"
>
AND a.PROJECT_STATUS = #{tEmployeeProject.projectStatusReplace}
</if>
<if
test=
"tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''"
>
<if
test=
"tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''"
>
AND a.BANK_NAME = #{tEmployeeProject.bankName}
AND a.BANK_NAME = #{tEmployeeProject.bankName}
</if>
</if>
...
...
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