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
55e55f69
Commit
55e55f69
authored
Jun 10, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.24 - 身份证有效期止的起止
parent
3c1651e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
0 deletions
+31
-0
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+8
-0
EmployeeProjectExportParamVO.java
...lus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
+8
-0
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+15
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
55e55f69
...
@@ -31,6 +31,7 @@ import javax.validation.constraints.NotNull;
...
@@ -31,6 +31,7 @@ import javax.validation.constraints.NotNull;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -437,4 +438,11 @@ public class TEmployeeProject extends BaseEntity {
...
@@ -437,4 +438,11 @@ public class TEmployeeProject extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
operationUserName
;
private
String
operationUserName
;
@Schema
(
description
=
"身份证有效期止-起"
)
@TableField
(
exist
=
false
)
private
Date
validityEndStart
;
@Schema
(
description
=
"身份证有效期止-止"
)
@TableField
(
exist
=
false
)
private
Date
validityEndEnd
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
View file @
55e55f69
...
@@ -535,4 +535,12 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
...
@@ -535,4 +535,12 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
private
String
ids
;
private
String
ids
;
private
List
<
String
>
exportFields
;
private
List
<
String
>
exportFields
;
@Schema
(
description
=
"身份证有效期止-起"
)
@TableField
(
exist
=
false
)
private
Date
validityEndStart
;
@Schema
(
description
=
"身份证有效期止-止"
)
@TableField
(
exist
=
false
)
private
Date
validityEndEnd
;
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
55e55f69
...
@@ -250,6 +250,13 @@
...
@@ -250,6 +250,13 @@
<sql
id=
"tEmployeeProject_where"
>
<sql
id=
"tEmployeeProject_where"
>
<if
test=
"tEmployeeProject != null"
>
<if
test=
"tEmployeeProject != null"
>
<if
test=
"tEmployeeProject.validityEndStart != null and tEmployeeProject.validityEndStart.trim() != ''"
>
AND b.VALIDITY_END
<![CDATA[ >= ]]>
#{tEmployeeProject.validityEndStart}
</if>
<if
test=
"tEmployeeProject.validityEndEnd != null and tEmployeeProject.validityEndEnd.trim() != ''"
>
AND b.VALIDITY_END
<![CDATA[ <= ]]>
#{tEmployeeProject.validityEndEnd}
</if>
<if
test=
"tEmployeeProject.id != null and tEmployeeProject.id.trim() != ''"
>
<if
test=
"tEmployeeProject.id != null and tEmployeeProject.id.trim() != ''"
>
AND a.ID = #{tEmployeeProject.id}
AND a.ID = #{tEmployeeProject.id}
</if>
</if>
...
@@ -450,6 +457,14 @@
...
@@ -450,6 +457,14 @@
<sql
id=
"exportTEmployeeProject_where"
>
<sql
id=
"exportTEmployeeProject_where"
>
<if
test=
"tEmployeeProject != null"
>
<if
test=
"tEmployeeProject != null"
>
<if
test=
"tEmployeeProject.validityEndStart != null and tEmployeeProject.validityEndStart.trim() != ''"
>
AND b.VALIDITY_END
<![CDATA[ >= ]]>
#{tEmployeeProject.validityEndStart}
</if>
<if
test=
"tEmployeeProject.validityEndEnd != null and tEmployeeProject.validityEndEnd.trim() != ''"
>
AND b.VALIDITY_END
<![CDATA[ <= ]]>
#{tEmployeeProject.validityEndEnd}
</if>
<if
test=
"tEmployeeProject.empCode != null and tEmployeeProject.empCode.trim() != ''"
>
<if
test=
"tEmployeeProject.empCode != null and tEmployeeProject.empCode.trim() != ''"
>
AND a.EMP_CODE = #{tEmployeeProject.empCode}
AND a.EMP_CODE = #{tEmployeeProject.empCode}
</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