From ae347a6603c94f73462c9c3e39c3e04476556d6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 11:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 74 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
index 59e77c5..5053aa7 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -1,12 +1,13 @@
package com.ycl.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛�
@@ -32,6 +33,10 @@
/** 寤鸿鍐呭 */
private String content;
+ @TableField("construction_nature")
+ /** 寤鸿鎬ц川 */
+ private String constructionNature;
+
@TableField("project_type")
/** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
private String projectType;
@@ -48,9 +53,9 @@
/** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
private String investType;
- @TableField("project_phase")
- /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
- private String projectPhase;
+// @TableField("project_phase")
+// /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
+// private String projectPhase;
@TableField("tag")
/** 鏍囩 */
@@ -58,11 +63,11 @@
@TableField("competent_department")
/** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */
- private Integer competentDepartment;
+ private String competentDepartment;
- @TableField("area_code")
+ @TableField("area")
/** 琛屾斂鍖哄煙 */
- private String areaCode;
+ private String area;
@TableField("management_centralization")
/** 绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫) */
@@ -71,10 +76,6 @@
@TableField("project_approval_type")
/** 椤圭洰瀹℃壒绫诲瀷 */
private String projectApprovalType;
-
- @TableField("investment_catalogue")
- /** 鎶曡祫鐩綍(锛�) */
- private String investmentCatalogue;
@TableField("importance_type")
/** 閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�) */
@@ -90,27 +91,27 @@
@TableField("create_project_time")
/** 绔嬮」鏃堕棿 */
- private LocalDateTime createProjectTime;
+ private Date createProjectTime;
@TableField("plan_start_time")
/** 璁″垝寮�宸ユ椂闂� */
- private LocalDateTime planStartTime;
+ private Date planStartTime;
@TableField("plan_complete_time")
/** 璁″垝绔ｅ伐鏃堕棿 */
- private LocalDateTime planCompleteTime;
+ private Date planCompleteTime;
- @TableField("win_unit")
- /** 涓爣鍗曚綅 */
- private String winUnit;
-
- @TableField("win_amount")
- /** 涓爣閲戦 */
- private String winAmount;
-
- @TableField("win_time")
- /** 涓爣鏃堕棿 */
- private LocalDateTime winTime;
+// @TableField("win_unit")
+// /** 涓爣鍗曚綅 */
+// private String winUnit;
+//
+// @TableField("win_amount")
+// /** 涓爣閲戦 */
+// private String winAmount;
+//
+// @TableField("win_time")
+// /** 涓爣鏃堕棿 */
+// private Date winTime;
@TableField("project_address")
/** 璇︾粏鍦板潃 */
@@ -126,7 +127,7 @@
@TableField("project_owner_unit")
/** 椤圭洰涓氫富鍗曚綅 */
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
@TableField("project_contact_person")
/** 椤圭洰鑱旂郴浜� */
@@ -136,21 +137,22 @@
/** 鑱旂郴鏂瑰紡 */
private String contact;
- @TableField("gmt_create_time")
- /** 鍒涘缓鏃堕棿 */
- private LocalDateTime gmtCreateTime;
-
- @TableField("gmt_update_time")
- /** 鏇存柊鏃堕棿 */
- private LocalDateTime gmtUpdateTime;
-
- @TableField("update_by")
+ @TableField(value = "update_by",fill = FieldFill.INSERT_UPDATE)
/** 鏇存柊浜� */
private Long updateBy;
- @TableField("create_by")
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
/** 鍒涘缓浜� */
private Long createBy;
+ @TableField("used_status")
+ /** 浣跨敤鐘舵�侊紙0锛氳崏绋匡紝1锛氭彁浜�,2:瀹℃牳閫氳繃锛�-1锛氶┏鍥烇級 */
+ private Integer usedStatus;
+ @TableField("coding")
+ /** 缂栫爜 */
+ private String coding;
+ @TableField("remark")
+ /** 瀹℃牳淇℃伅 */
+ private String remark;
}
--
Gitblit v1.8.0