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
f92664c0
Commit
f92664c0
authored
Jan 09, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
a03256c8
09bf1ccd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
3 deletions
+22
-3
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+2
-2
EmployeeProjectExportParamVO.java
...lus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
+5
-0
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+5
-0
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+10
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
f92664c0
...
@@ -276,9 +276,9 @@ public class TEmployeeProject extends BaseEntity {
...
@@ -276,9 +276,9 @@ public class TEmployeeProject extends BaseEntity {
/**
/**
* 是否完整 0是 1 否
*
档案
是否完整 0是 1 否
*/
*/
@Schema
(
description
=
"是否完整0是 1 否"
)
@Schema
(
description
=
"
档案
是否完整0是 1 否"
)
private
String
isComplete
;
private
String
isComplete
;
/**
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
View file @
f92664c0
...
@@ -490,6 +490,11 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
...
@@ -490,6 +490,11 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
@ExcelAttribute
(
name
=
"合同甲方"
)
@ExcelAttribute
(
name
=
"合同甲方"
)
private
String
contractParty
;
private
String
contractParty
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"档案是否完整"
)
@ExcelAttribute
(
name
=
"档案是否完整"
,
readConverterExp
=
"0=是,1=否"
)
private
String
isComplete
;
private
String
[]
socialStatusArray
;
private
String
[]
socialStatusArray
;
private
String
[]
fundStatusArray
;
private
String
[]
fundStatusArray
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
f92664c0
...
@@ -529,6 +529,11 @@ public class EmployeeProjectExportVO {
...
@@ -529,6 +529,11 @@ public class EmployeeProjectExportVO {
@ExcelAttribute
(
name
=
"合同甲方"
)
@ExcelAttribute
(
name
=
"合同甲方"
)
private
String
contractParty
;
private
String
contractParty
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"档案是否完整"
)
@ExcelAttribute
(
name
=
"档案是否完整"
,
readConverterExp
=
"0=是,1=否"
)
private
String
isComplete
;
private
String
[]
socialStatusArray
;
private
String
[]
socialStatusArray
;
private
String
[]
fundStatusArray
;
private
String
[]
fundStatusArray
;
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
f92664c0
...
@@ -57,6 +57,7 @@
...
@@ -57,6 +57,7 @@
<result
property=
"fundStatus"
column=
"FUND_STATUS"
/>
<result
property=
"fundStatus"
column=
"FUND_STATUS"
/>
<result
property=
"contractStatus"
column=
"CONTRACT_STATUS"
/>
<result
property=
"contractStatus"
column=
"CONTRACT_STATUS"
/>
<result
property=
"empLabel"
column=
"EMP_LABEL"
/>
<result
property=
"empLabel"
column=
"EMP_LABEL"
/>
<result
property=
"isComplete"
column=
"IS_COMPLETE"
/>
</resultMap>
</resultMap>
<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"
>
...
@@ -122,6 +123,7 @@
...
@@ -122,6 +123,7 @@
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactAddress"
column=
"contact_address"
/>
<result
property=
"contactAddress"
column=
"contact_address"
/>
<result
property=
"isComplete"
column=
"IS_COMPLETE"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -241,7 +243,8 @@
...
@@ -241,7 +243,8 @@
b.EMP_EMAIL,
b.EMP_EMAIL,
b.EMP_NATRUE AS PROEMP_NATRUE,
b.EMP_NATRUE AS PROEMP_NATRUE,
a.EMP_LABEL,
a.EMP_LABEL,
t.CONTRACT_PARTY
t.CONTRACT_PARTY,
a.IS_COMPLETE
</sql>
</sql>
...
@@ -442,6 +445,9 @@
...
@@ -442,6 +445,9 @@
<if
test=
"tEmployeeProject.createTimeEnd != null"
>
<if
test=
"tEmployeeProject.createTimeEnd != null"
>
AND a.CREATE_TIME
<![CDATA[ <= ]]>
#{tEmployeeProject.createTimeEnd}
AND a.CREATE_TIME
<![CDATA[ <= ]]>
#{tEmployeeProject.createTimeEnd}
</if>
</if>
<if
test=
"tEmployeeProject.isComplete != null and tEmployeeProject.isComplete.trim() != ''"
>
AND a.IS_COMPLETE = #{tEmployeeProject.isComplete}
</if>
</if>
</if>
</sql>
</sql>
...
@@ -612,6 +618,9 @@
...
@@ -612,6 +618,9 @@
AND a.CREATE_TIME
<![CDATA[ <= ]]>
#{tEmployeeProject.createTimeEnd}
AND a.CREATE_TIME
<![CDATA[ <= ]]>
#{tEmployeeProject.createTimeEnd}
</if>
</if>
<if
test=
"tEmployeeProject.isComplete != null and tEmployeeProject.isComplete.trim() != ''"
>
AND a.IS_COMPLETE = #{tEmployeeProject.isComplete}
</if>
</if>
</if>
</sql>
</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