From 15da4c4960809e3ef699a470788f2ef3fb8dc8f7 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 19 二月 2025 14:16:56 +0800 Subject: [PATCH] Merge branch 'master' into 部门重构 --- business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) 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 ac5a053..a55ea2f 100644 --- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java +++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java @@ -42,6 +42,9 @@ @ApiModelProperty("寤鸿鍐呭") private String content; + @ApiModelProperty("寤鸿鎬ц川") + private String constructionNature; + @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�") private String projectType; @@ -75,11 +78,13 @@ @ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)") private String importanceType; - @ApiModelProperty("骞村害鎶曡祫璁″垝") - private String year; - +// @ApiModelProperty("骞村害鎶曡祫璁″垝") +// private String year; +// +// @ApiModelProperty("骞村害鎶曡祫閲戦") +// private BigDecimal yearInvestAmount; @ApiModelProperty("骞村害鎶曡祫閲戦") - private BigDecimal yearInvestAmount; + private List<ProjectInfoYearPlanForm> yearPlanList; @ApiModelProperty("绔嬮」鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -93,15 +98,17 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date planCompleteTime; - @ApiModelProperty("涓爣鍗曚綅") - private String winUnit; - - @ApiModelProperty("涓爣閲戦") - private String winAmount; - - @ApiModelProperty("涓爣鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date winTime; +// @ApiModelProperty("涓爣鍗曚綅") +// private String winUnit; +// +// @ApiModelProperty("涓爣閲戦") +// private String winAmount; +// +// @ApiModelProperty("涓爣鏃堕棿") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// private Date winTime; + @ApiModelProperty("涓爣鍗曚綅淇℃伅") + private List<ProjectInfoWinUnitForm> winUnitList; @ApiModelProperty("璇︾粏鍦板潃") private String projectAddress; @@ -113,7 +120,7 @@ private String latitude; @ApiModelProperty("椤圭洰涓氫富鍗曚綅") - private String projectOwnerUnit; + private Long projectOwnerUnit; @ApiModelProperty("椤圭洰鑱旂郴浜�") private String projectContactPerson; @@ -124,6 +131,10 @@ @ApiModelProperty("浣跨敤鐘舵��") private Integer usedStatus; + @ApiModelProperty("璧嬬爜") + private String coding; + + private String remark; public static ProjectInfo getEntityByForm(@NonNull ProjectInfoForm form, ProjectInfo entity) { if(entity == null) { entity = new ProjectInfo(); -- Gitblit v1.8.0