From b1e258f037d4ee9b93ebc34e9b70670db7b501c0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 01:18:05 +0800
Subject: [PATCH] 工程
---
business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java | 3 +--
business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java | 13 ++++++++++---
business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java | 3 ++-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java b/business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java
index c3c63c2..e1264e3 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java
@@ -48,10 +48,11 @@
@TableField("unit")
private Long unit;
+
@TableField("parent_id")
private String parent;
@TableField("year")
- private Date year;
+ private String year;
}
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
index 736b975..02225dd 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
@@ -53,8 +53,7 @@
private Long unit;
@ApiModelProperty("骞翠唤")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date year;
+ private String year;
@ApiModelProperty("鐖跺伐绋�")
private String parent;
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
index 420a280..a7a9d86 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
@@ -47,24 +47,31 @@
@ApiModelProperty("鐘舵��")
private String status;
-
+ /** 涓荤閮ㄩ棬 */
@ApiModelProperty("涓荤閮ㄩ棬")
private Long department;
+ /** 涓氫富鍗曚綅 */
@ApiModelProperty("涓氫富鍗曚綅")
private Long unit;
+ /** 骞翠唤 */
@ApiModelProperty("骞翠唤")
- private Date year;
+ private String year;
+ /** 鐖跺伐绋� */
@ApiModelProperty("鐖跺伐绋�")
private String parent;
+ /** 涓荤閮ㄩ棬鍚嶅瓧 */
+ @ApiModelProperty("涓荤閮ㄩ棬鍚嶅瓧")
private String departmentName;
+ /** 涓氫富鍗曚綅鍚嶅瓧 */
+ @ApiModelProperty("涓氫富鍗曚綅鍚嶅瓧")
private String unitName;
-
+ /** 宸ョ▼鍒楄〃 */
@ApiModelProperty("宸ョ▼鍒楄〃")
private List<ProjectEngineeringVO> children = new ArrayList<ProjectEngineeringVO>();
--
Gitblit v1.8.0