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 | 119 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 33 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 dafbba3..7461909 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -1,15 +1,22 @@
package com.ycl.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.system.domain.base.AbsVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛ㄥ睍绀�
@@ -32,6 +39,9 @@
/** 寤鸿鍐呭 */
@ApiModelProperty("寤鸿鍐呭")
private String content;
+
+ @ApiModelProperty("寤鸿鎬ц川")
+ private String constructionNature;
/** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
@ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
@@ -59,60 +69,65 @@
/** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
- private Integer competentDepartment;
-
+ private List<Long> competentDepartmentList;
+ private String competentDepartment;
/** 琛屾斂鍖哄煙 */
@ApiModelProperty("琛屾斂鍖哄煙")
- private String areaCode;
+ private String area;
/** 绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫) */
@ApiModelProperty("绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫)")
+ private List<String> managementCentralizationList;
private String managementCentralization;
-
/** 椤圭洰瀹℃壒绫诲瀷 */
@ApiModelProperty("椤圭洰瀹℃壒绫诲瀷")
private String projectApprovalType;
- /** 鎶曡祫鐩綍(锛�) */
- @ApiModelProperty("鎶曡祫鐩綍(锛�)")
- private String investmentCatalogue;
/** 閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�) */
@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")
private Date createProjectTime;
/** 璁″垝寮�宸ユ椂闂� */
@ApiModelProperty("璁″垝寮�宸ユ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planStartTime;
/** 璁″垝绔ｅ伐鏃堕棿 */
@ApiModelProperty("璁″垝绔ｅ伐鏃堕棿")
+ @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("涓爣鏃堕棿")
- private Date winTime;
-
+ private List<ProjectInfoWinUnitVO> winUnitList;
/** 璇︾粏鍦板潃 */
@ApiModelProperty("璇︾粏鍦板潃")
private String projectAddress;
@@ -127,7 +142,7 @@
/** 椤圭洰涓氫富鍗曚綅 */
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
/** 椤圭洰鑱旂郴浜� */
@ApiModelProperty("椤圭洰鑱旂郴浜�")
@@ -137,14 +152,6 @@
@ApiModelProperty("鑱旂郴鏂瑰紡")
private String contact;
- /** 鍒涘缓鏃堕棿 */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
-
/** 鏇存柊浜� */
@ApiModelProperty("鏇存柊浜�")
private Long updateBy;
@@ -153,12 +160,58 @@
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
+ /** 鐘舵�佺爜 */
+ @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();
}
BeanUtils.copyProperties(entity, vo);
+ //涓荤閮ㄩ棬杞垚list
+ String competentDepartment = entity.getCompetentDepartment();
+ if(!StringUtils.isBlank(competentDepartment)){
+ List<Long> list = Arrays.stream(competentDepartment.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ vo.setCompetentDepartmentList(list);
+ }
+ //绠＄悊褰掑彛杞崲
+ String managementCentralization = entity.getManagementCentralization();
+ if(!StringUtils.isBlank(managementCentralization)){
+ vo.setManagementCentralizationList(Arrays.asList(managementCentralization.split(",")));
+ }
return vo;
}
-
+ //杞崲瀛楃涓查泦鍚堝瓧娈�
+ public static void transform(@NonNull ProjectInfoVO vo) {
+ //涓荤閮ㄩ棬杞垚list
+ String competentDepartment = vo.getCompetentDepartment();
+ if(!StringUtils.isBlank(competentDepartment)){
+ List<Long> list = Arrays.stream(competentDepartment.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ vo.setCompetentDepartmentList(list);
+ }
+ //绠＄悊褰掑彛杞崲
+ String managementCentralization = vo.getManagementCentralization();
+ if(!StringUtils.isBlank(managementCentralization)){
+ vo.setManagementCentralizationList(Arrays.asList(managementCentralization.split(",")));
+ }
+ }
}
--
Gitblit v1.8.0