From e4ee26d6e5da074c5a682bed33d193974297537c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 13 十二月 2024 17:55:44 +0800
Subject: [PATCH] bug修改、任务驳回功能基础实现
---
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 ee49ea6..1f73b75 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -67,7 +67,7 @@
/** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
private List<Long> competentDepartmentList;
-
+ private String competentDepartment;
/** 琛屾斂鍖哄煙 */
@ApiModelProperty("琛屾斂鍖哄煙")
private String area;
@@ -75,7 +75,7 @@
/** 绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫) */
@ApiModelProperty("绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫)")
private List<String> managementCentralizationList;
-
+ private String managementCentralization;
/** 椤圭洰瀹℃壒绫诲瀷 */
@ApiModelProperty("椤圭洰瀹℃壒绫诲瀷")
private String projectApprovalType;
@@ -159,6 +159,11 @@
@ApiModelProperty("鏂囦欢")
private List<File> fileList;
+ private Long processId;
+ private ProjectInvestmentInfoVO projectInvestmentInfo;
+ private ProjectInvestmentFundingVO projectInvestmentFunding;
+ private ProjectUnitRegistrationInfoVO projectUnitRegistrationInfo;
+ private ProjectInvestmentPolicyComplianceVO projectInvestmentPolicyCompliance;
public static ProjectInfoVO getVoByEntity(@NonNull ProjectInfo entity, ProjectInfoVO vo) {
if(vo == null) {
@@ -180,5 +185,20 @@
}
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