From b954f194459fa6673346a32dc0dbd56d34ee755e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 四月 2025 17:09:40 +0800
Subject: [PATCH] 合同导入

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 823e7af..2aac724 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -44,12 +44,17 @@
     private String contractName;
 
     @Excel(name = "生效日期", format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private String startTimeStr;
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("start_time")
     private LocalDateTime startTime;
 
-    @Excel(name = "终止日期", format = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "终止日期")
+    @TableField(exist = false)
+    private String endTimeStr;
+
     @ApiModelProperty(value = "结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("end_time")
@@ -66,7 +71,9 @@
     @ApiModelProperty(value = "租金支付方式 月付 季付 年付")
     @TableField("pay_type")
     private String payType;
-    @Excel(name = "开始计费日期", format = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开始计费日期")
+    @TableField(exist = false)
+    private String startPayTimeStr;
     @ApiModelProperty(value = "开始计费时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("start_pay_time")
@@ -86,7 +93,6 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("first_pay_time")
     private LocalDateTime firstPayTime;
-    @Excel(name = "变动时间", format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "变动时间 根据周期改变 前端忽略")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("change_time")
@@ -154,7 +160,9 @@
     /**
      * 签订时间
      */
-    @Excel(name = "签订时间", format = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "签订时间")
+    @TableField(exist = false)
+    private String signTimeStr;
     @ApiModelProperty(value = "签订时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("sign_time")
@@ -169,7 +177,6 @@
     @ApiModelProperty(value = "租户确认合同电子签名")
     @TableField("signature")
     private String signature;
-    @Excel(name = "签订时间")
     @ApiModelProperty(value = "终止合同备注说明")
     @TableField("terminate_remark")
     private String terminateRemark;

--
Gitblit v1.7.1