From ea45679770bdc41e84a66d40f72dd79d87806704 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 11:02:26 +0800
Subject: [PATCH] bug
---
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 23 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 7461909..2673e12 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -40,12 +40,18 @@
@ApiModelProperty("寤鸿鍐呭")
private String content;
+ @ApiModelProperty("鏄惁鎷涘晢寮曡祫椤圭洰锛�0 涓嶆槸 1 鏄�")
+ private String attractInvestment;
+
@ApiModelProperty("寤鸿鎬ц川")
private String constructionNature;
- /** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
- @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
+ /** 椤圭洰绫诲瀷 */
+ @ApiModelProperty("椤圭洰绫诲瀷")
private String projectType;
+
+ @ApiModelProperty("椤圭洰瀛愮被鍨�")
+ private String projectSubType;
/** 椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠) */
@ApiModelProperty("椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)")
@@ -55,12 +61,13 @@
@ApiModelProperty("璧勯噾绫诲瀷锛�0涓璧勯噾锛�1鍥藉�鸿祫閲戯紝2瓒呴暱鏈熷浗鍊猴紝3鍦版柟鏀垮簻涓撻」鍊猴級")
private String fundType;
+ private List<String> fundTypeList;
/** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
@ApiModelProperty("鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛�")
private String investType;
- /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
- @ApiModelProperty("椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵)")
+ /** 椤圭洰闃舵(1鍌ㄥ瑙勫垝闃舵, 2椤圭洰鍓嶆湡闃舵, 3瀹炴柦闃舵, 4绔ｅ伐鎶曠敤闃舵) */
+ @ApiModelProperty("椤圭洰闃舵(1鍌ㄥ瑙勫垝闃舵, 2椤圭洰鍓嶆湡闃舵, 3瀹炴柦闃舵, 4绔ｅ伐鎶曠敤闃舵)")
private String projectPhase;
/** 鏍囩 */
@@ -69,8 +76,19 @@
/** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
- private List<Long> competentDepartmentList;
private String competentDepartment;
+
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private String competentDepartmentName;
+
+ @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴浜�")
+ /** 涓荤閮ㄩ棬鑱旂郴浜� */
+ private String competentDepartmentPerson;
+
+ @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ /** 涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */
+ private String competentDepartmentPhone;
+
/** 琛屾斂鍖哄煙 */
@ApiModelProperty("琛屾斂鍖哄煙")
private String area;
@@ -87,7 +105,7 @@
/** 閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�) */
@ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)")
private String importanceType;
-
+ private List<String> importanceTypeList;
// /** 骞村害鎶曡祫璁″垝 */
// @ApiModelProperty("骞村害鎶曡祫璁″垝")
// private String year;
@@ -144,6 +162,9 @@
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
private Long projectOwnerUnit;
+ @ApiModelProperty("椤圭洰涓氫富鍗曚綅")
+ private String projectOwnerUnitName;
+
/** 椤圭洰鑱旂郴浜� */
@ApiModelProperty("椤圭洰鑱旂郴浜�")
private String projectContactPerson;
@@ -169,6 +190,14 @@
@ApiModelProperty("鏂囦欢")
private List<File> fileList;
+
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬")
+ private Long industryCompetentDepartment;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�")
+ private String industryCompetentDepartmentPerson;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ private String departmentPersonPhone;
+
private Integer usedStatus;
private String remark;
private Long processId;
@@ -177,41 +206,53 @@
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(",")));
}
+ //
+ //鍒嗙被绫诲瀷杞崲
+ String importanceType = entity.getImportanceType();
+ if (!StringUtils.isBlank(importanceType)) {
+ vo.setImportanceTypeList(Arrays.asList(importanceType.split(",")));
+ }
+
+ //璧勯噾绫诲瀷
+ String fundTypeList = entity.getFundType();
+ if (!StringUtils.isBlank(fundTypeList)) {
+ vo.setFundTypeList(Arrays.asList(fundTypeList.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(",")));
}
+
+ //鍒嗙被绫诲瀷杞崲
+ String importanceType = vo.getImportanceType();
+ if (!StringUtils.isBlank(importanceType)) {
+ vo.setImportanceTypeList(Arrays.asList(importanceType.split(",")));
+ }
+
+ //璧勯噾绫诲瀷
+ String fundTypeList = vo.getFundType();
+ if (!StringUtils.isBlank(fundTypeList)) {
+ vo.setFundTypeList(Arrays.asList(fundTypeList.split(",")));
+ }
+
}
}
--
Gitblit v1.8.0