From f964eea96288e345a5b001909f3f718c78d19f06 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 20 二月 2025 10:21:10 +0800
Subject: [PATCH] 项目增加项目子类型字段
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 5 ++++-
business/src/main/resources/mapper/ProjectInfoMapper.xml | 3 ++-
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 6 +++++-
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java | 6 ++++++
business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java | 3 +++
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 7 +++++--
6 files changed, 25 insertions(+), 5 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 0e32af5..2c0f4fa 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -39,9 +39,13 @@
private String constructionNature;
@TableField("project_type")
- /** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
+ /** 椤圭洰绫诲瀷 */
private String projectType;
+ @TableField("project_sub_type")
+ /** 椤圭洰瀛愮被鍨� */
+ private String projectSubType;
+
@TableField("project_status")
/** 椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠) */
private String projectStatus;
diff --git a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
index 66e65a0..741d6f6 100644
--- a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
+++ b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
@@ -48,6 +48,12 @@
private String projectType;
/**
+ * 椤圭洰绫诲瀷
+ */
+ @ExcelProperty(value = "椤圭洰瀛愮被鍨�",converter = ExcelEnumConvert.class)
+ private String projectSubType;
+
+ /**
* 椤圭洰鐘舵��
*/
@ExcelProperty(value = "椤圭洰鐘舵��",converter = ExcelEnumConvert.class)
diff --git a/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java b/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java
index 055eba7..b8b6eb4 100644
--- a/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java
+++ b/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java
@@ -21,6 +21,9 @@
@ExcelProperty(value = "椤圭洰绫诲瀷")
private String projectType;
+ @ExcelProperty(value = "椤圭洰瀛愮被鍨�")
+ private String projectSubType;
+
@ExcelProperty(value = "寤鸿鍐呭")
private String content;
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
index 7e6b757..35787ca 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -45,9 +45,12 @@
@ApiModelProperty("寤鸿鎬ц川")
private String constructionNature;
- @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
+ @ApiModelProperty("椤圭洰绫诲瀷")
private String projectType;
+ @ApiModelProperty("椤圭洰瀛愮被鍨�")
+ private String projectSubType;
+
@ApiModelProperty("椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)")
private String projectStatus;
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
index ed1c2da..52daaaa 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -43,10 +43,13 @@
@ApiModelProperty("寤鸿鎬ц川")
private String constructionNature;
- /** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
- @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
+ /** 椤圭洰绫诲瀷 */
+ @ApiModelProperty("椤圭洰绫诲瀷")
private String projectType;
+ @ApiModelProperty("椤圭洰瀛愮被鍨�")
+ private String projectSubType;
+
/** 椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠) */
@ApiModelProperty("椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)")
private String projectStatus;
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index c8c8bf3..dc078f0 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -18,6 +18,7 @@
TPI.content,
TPI.construction_nature,
TPI.project_type,
+ TPI.project_sub_type,
TPI.project_status,
TPI.fund_type,
TPI.invest_type,
@@ -194,7 +195,7 @@
<select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO">
select
- TPI.id as id,TPI.project_name,TPI.project_code,TPI.content,TPI.construction_nature,TPI.project_type,TPI.project_status,TPI.fund_type,TPI.invest_type,TPI.project_phase,
+ TPI.id as id,TPI.project_name,TPI.project_code,TPI.content,TPI.construction_nature,TPI.project_type,TPI.project_sub_type,TPI.project_status,TPI.fund_type,TPI.invest_type,TPI.project_phase,
TPI.tag,TPI.competent_department,TPI.area,TPI.management_centralization,TPI.project_approval_type,TPI.importance_type,TPI.year,TPI.year_invest_amount,TPI.create_project_time,TPI.plan_start_time,
TPI.plan_complete_time,TPI.win_unit,TPI.win_amount,TPI.win_time,TPI.project_address,TPI.longitude,TPI.latitude,
TPI.project_owner_unit,TPI.project_contact_person,TPI.contact,TPI.gmt_create,TPI.gmt_update,TPI.update_by,TPI.create_by,
--
Gitblit v1.8.0