From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
index d91a9c0..4a0b880 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
@@ -43,6 +43,9 @@
@TableField("\"center_fund\"")
private Double centerFund;
+ @TableField("\"other\"")
+ private String other;
+
//地方资金
@TableField("\"local_fund\"")
@JsonSerialize(nullsUsing = NullSerializer.class) // 值为-1时显示null
@@ -75,7 +78,7 @@
//合同签订时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("\"contract_date\"")
+ @TableField(value = "\"contract_date\"",fill = FieldFill.UPDATE)
private Date contractDate;
//合同附件
@@ -85,13 +88,13 @@
//计划验收时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("\"plan_check_date\"")
+ @TableField(value = "\"plan_check_date\"",fill = FieldFill.UPDATE)
private Date planCheckDate;
//验收时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
- @TableField("\"check_date\"")
+ @TableField(value = "\"check_date\"",fill = FieldFill.UPDATE)
private Date checkDate;
//是否验收
@@ -102,6 +105,14 @@
@TableField("\"check_url\"")
private String checkUrl;
+ //是否校验
+ @TableField("\"check_state\"")
+ private String checkState;
+
+ //是否填报完成
+ @TableField("\"is_fill\"")
+ private String isFill;
+
//创建人
@TableField("\"create_user\"")
private String createUser;
--
Gitblit v1.9.3