From ae347a6603c94f73462c9c3e39c3e04476556d6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 11:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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 ee82745..b075f69 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;
@@ -108,19 +111,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;
@@ -135,7 +140,7 @@
/** 椤圭洰涓氫富鍗曚綅 */
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
/** 椤圭洰鑱旂郴浜� */
@ApiModelProperty("椤圭洰鑱旂郴浜�")
@@ -157,14 +162,20 @@
@ApiModelProperty("鐘舵�佺爜")
private String projectColorCode;
+ @ApiModelProperty("璧嬬爜")
+ private String coding;
+
@ApiModelProperty("鏂囦欢")
private List<File> fileList;
-
+ private Integer usedStatus;
+ private String remark;
+ private Long processId;
private ProjectInvestmentInfoVO projectInvestmentInfo;
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