From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询

---
 src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index f03796e..bfb6695 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -16,10 +16,7 @@
  */
 package org.springblade.modules.property.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -84,7 +81,7 @@
 	 * 分摊方式
 	 */
 	@ApiModelProperty(value = "分摊方式")
-	private Integer allocationWay;
+	private String allocationWay;
 	/**
 	 * 预算总金额
 	 */
@@ -109,11 +106,15 @@
 	 * 预计开工时间
 	 */
 	@ApiModelProperty(value = "预计开工时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date runTime;
 	/**
 	 * 预计竣工时间
 	 */
 	@ApiModelProperty(value = "预计竣工时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date completedTime;
 	/**
 	 * 项目摘要
@@ -136,6 +137,7 @@
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("创建人")
+	@TableField(fill = FieldFill.INSERT)
 	private String createUser;
 
 	/**
@@ -143,6 +145,7 @@
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField(fill = FieldFill.INSERT)
 	@ApiModelProperty("创建时间")
 	private Date createTime;
 
@@ -151,6 +154,7 @@
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("更新人")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String updateUser;
 
 	/**
@@ -158,6 +162,7 @@
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	@ApiModelProperty("更新时间")
 	private Date updateTime;
 

--
Gitblit v1.9.3