MVP1.6.4-档案、项目档案，增加创建时间起止

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java

@@ -16,9 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.archives.entity;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
@@ -27,11 +25,11 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -462,4 +460,13 @@ public class TEmployeeInfo extends BaseEntity {
 	@TableField(exist = false)
 	private String nameOrIdcard;
 
+	//开始时间（查询专用）
+	@Schema(description =  "创建开始时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeStart;
+	//截止时间（查询专用）
+	@Schema(description =  "创建截止时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeEnd;
+
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -408,4 +408,13 @@ public class TEmployeeProject extends BaseEntity {
 	@TableField(exist = false)
 	private String oldDeptNo;
 
+	//开始时间（查询专用）
+	@Schema(description =  "创建开始时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeStart;
+	//截止时间（查询专用）
+	@Schema(description =  "创建截止时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeEnd;
+
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java

@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
@@ -501,6 +502,16 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
 
 	private List<String> idList;
 
+
+	//开始时间（查询专用）
+	@Schema(description =  "创建开始时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeStart;
+	//截止时间（查询专用）
+	@Schema(description =  "创建截止时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeEnd;
+
 	/**
 	 * @Author fxj
 	 * 查询数据起

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml

@@ -503,6 +503,12 @@
 						#{idStr}
 					</foreach>
 				</if>
+				<if test="tEmployeeInfo.createTimeStart != null">
+					AND a.CREATE_TIME <![CDATA[ >= ]]> #{tEmployeeInfo.createTimeStart}
+				</if>
+				<if test="tEmployeeInfo.createTimeEnd != null">
+					AND a.CREATE_TIME <![CDATA[ <= ]]> #{tEmployeeInfo.createTimeEnd}
+				</if>
 			</if>
 		</if>
 	</sql>

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -432,6 +432,13 @@
 			<if test="tEmployeeProject.empLabel != null">
 				AND a.EMP_LABEL = #{tEmployeeProject.empLabel}
 			</if>
+
+			<if test="tEmployeeProject.createTimeStart != null">
+				AND a.CREATE_TIME <![CDATA[ >= ]]> #{tEmployeeProject.createTimeStart}
+			</if>
+			<if test="tEmployeeProject.createTimeEnd != null">
+				AND a.CREATE_TIME <![CDATA[ <= ]]> #{tEmployeeProject.createTimeEnd}
+			</if>
 		</if>
 	</sql>
 
@@ -595,6 +602,13 @@
 			<if test="tEmployeeProject.empLabel != null">
 				AND a.EMP_LABEL = #{tEmployeeProject.empLabel}
 			</if>
+			<if test="tEmployeeProject.createTimeStart != null">
+				AND a.CREATE_TIME <![CDATA[ >= ]]> #{tEmployeeProject.createTimeStart}
+			</if>
+			<if test="tEmployeeProject.createTimeEnd != null">
+				AND a.CREATE_TIME <![CDATA[ <= ]]> #{tEmployeeProject.createTimeEnd}
+			</if>
+
 		</if>
 	</sql>