From 67683967e7be0e899ced1d460e53080b5098859d Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 23 四月 2024 18:05:53 +0800
Subject: [PATCH] 合同导入、规则、展示
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
index 8cdb71e..e3498b4 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
@@ -5,9 +5,10 @@
import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.system.entity.BaseEntity;
import lombok.Data;
import java.util.Date;
@@ -21,19 +22,23 @@
@Data
@ExcelIgnoreUnannotated
@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
-public class TContract extends BaseEntity {
+public class TContract {
private static final long serialVersionUID = 1L;
/**
* 涓婚敭
*/
@ExcelProperty("搴忓彿")
+ @TableId
private Long id;
/**
* 鍗曚綅id
*/
private Integer unitId;
+
+ @TableField(exist = false)
+ private String unitName;
/**
* 鍚堝悓鍚嶇О
@@ -43,15 +48,19 @@
/**
* 寮�濮嬫椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd hh-mm-ss")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd hh-mm-ss")
private Date endTime;
+ private Date createTime;
+
+ private Date updateTime;
+
@TableLogic
private String deleted;
--
Gitblit v1.8.0