Commit 55e55f69 authored by hongguangwu's avatar hongguangwu

1.7.24 - 身份证有效期止的起止

parent 3c1651e2
...@@ -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;
} }
...@@ -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;
} }
...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment