From 17e9ad4bbbbd0129e8da4dc0cfeee0028d7121e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 二月 2025 17:40:23 +0800
Subject: [PATCH] 资金类型和重点分类多选

---
 business/src/main/java/com/ycl/domain/entity/ProjectInfo.java |   91 +++++++++++++++++++++++++++------------------
 1 files changed, 54 insertions(+), 37 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..177a90a 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,14 @@
 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 椤圭洰绠$悊鍩虹淇℃伅琛�
@@ -32,9 +34,21 @@
     /** 寤鸿鍐呭 */
     private String content;
 
+    @TableField("construction_nature")
+    /** 寤鸿鎬ц川 */
+    private String constructionNature;
+
     @TableField("project_type")
-    /** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
+    /** 椤圭洰绫诲瀷 */
     private String projectType;
+
+    @TableField("project_sub_type")
+    /** 椤圭洰瀛愮被鍨� */
+    private String projectSubType;
+
+    @TableField("attract_investment")
+    /** 鏄惁鎷涘晢寮曡祫椤圭洰锛�0 涓嶆槸  1 鏄� */
+    private String attractInvestment;
 
     @TableField("project_status")
     /** 椤圭洰鐘舵��  (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠) */
@@ -48,9 +62,9 @@
     /** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
     private String investType;
 
-    @TableField("project_phase")
-    /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵,  1椤圭洰鍓嶆湡闃舵,  2瀹炴柦闃舵,  3绔e伐鎶曠敤闃舵) */
-    private String projectPhase;
+//    @TableField("project_phase")
+//    /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵,  1椤圭洰鍓嶆湡闃舵,  2瀹炴柦闃舵,  3绔e伐鎶曠敤闃舵) */
+//    private String projectPhase;
 
     @TableField("tag")
     /** 鏍囩 */
@@ -58,11 +72,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 +85,6 @@
     @TableField("project_approval_type")
     /** 椤圭洰瀹℃壒绫诲瀷 */
     private String projectApprovalType;
-
-    @TableField("investment_catalogue")
-    /** 鎶曡祫鐩綍(锛�) */
-    private String investmentCatalogue;
 
     @TableField("importance_type")
     /** 閲嶇偣鍒嗙被  (0鐪侀噸鐐归」鐩�,  1閬傚畞甯傞噸鐐归」鐩�,  2.灏勬椽甯傞噸鐐归」鐩�,  3.涓�鑸」鐩�) */
@@ -90,27 +100,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")
     /** 璁″垝绔e伐鏃堕棿 */
-    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 +136,7 @@
 
     @TableField("project_owner_unit")
     /** 椤圭洰涓氫富鍗曚綅 */
-    private String projectOwnerUnit;
+    private Long projectOwnerUnit;
 
     @TableField("project_contact_person")
     /** 椤圭洰鑱旂郴浜� */
@@ -136,21 +146,28 @@
     /** 鑱旂郴鏂瑰紡 */
     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;
+    @TableField("industry_competent_department")
+    private Long industryCompetentDepartment;
+    @TableField("industry_competent_department_person")
+    private Long industryCompetentDepartmentPerson;
+    @TableField("department_person_phone")
+    private String departmentPersonPhone;
 }

--
Gitblit v1.8.0