From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 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..eb47cd8 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,12 +5,26 @@
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 com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
/**
* 杩愮淮鍚堝悓瀵硅薄 t_contract
@@ -21,38 +35,60 @@
@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;
+ @NotBlank
+ private Long unitId;
+
+ @TableField(exist = false)
+ private String unitName;
/**
* 鍚堝悓鍚嶇О
*/
+ @NotBlank
private String name;
/**
* 寮�濮嬫椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @NotNull
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @NotNull
private Date endTime;
+ /**
+ * 鍚堝悓闄勪欢
+ */
+ private String attachment;
+
+ private Date createTime;
+
+ private Date updateTime;
+
@TableLogic
- private String deleted;
+ private Integer deleted;
+
+ @TableField(exist = false)
+ private String ruleList;
+ @TableField(exist = false)
+ private MultipartFile file;
}
--
Gitblit v1.8.0