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/vo/ProjectInfoVO.java |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

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 dd484b4..7461909 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -40,6 +40,9 @@
     @ApiModelProperty("寤鸿鍐呭")
     private String content;
 
+    @ApiModelProperty("寤鸿鎬ц川")
+    private String constructionNature;
+
     /** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
     @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
     private String projectType;
@@ -85,14 +88,16 @@
     @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<ProjectInfoYearPlanVO> yearPlanList;
     /** 绔嬮」鏃堕棿 */
     @ApiModelProperty("绔嬮」鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -108,19 +113,21 @@
     @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;
-
+    private List<ProjectInfoWinUnitVO> winUnitList;
     /** 璇︾粏鍦板潃 */
     @ApiModelProperty("璇︾粏鍦板潃")
     private String projectAddress;
@@ -169,7 +176,8 @@
     private ProjectInvestmentFundingVO projectInvestmentFunding;
     private ProjectUnitRegistrationInfoVO projectUnitRegistrationInfo;
     private ProjectInvestmentPolicyComplianceVO projectInvestmentPolicyCompliance;
-
+    private Boolean auditRole;
+    private String projectOwnerUnitName;
     public static ProjectInfoVO getVoByEntity(@NonNull ProjectInfo entity, ProjectInfoVO vo) {
         if(vo == null) {
             vo = new ProjectInfoVO();

--
Gitblit v1.8.0