From 17e9ad4bbbbd0129e8da4dc0cfeee0028d7121e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 二月 2025 17:40:23 +0800
Subject: [PATCH] 资金类型和重点分类多选
---
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 135 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 21 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 2fc8f32..7c7d0f3 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -1,5 +1,7 @@
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;
@@ -38,9 +40,18 @@
@ApiModelProperty("寤鸿鍐呭")
private String content;
- /** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
- @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
+ @ApiModelProperty("鏄惁鎷涘晢寮曡祫椤圭洰锛�0 涓嶆槸 1 鏄�")
+ private String attractInvestment;
+
+ @ApiModelProperty("寤鸿鎬ц川")
+ private String constructionNature;
+
+ /** 椤圭洰绫诲瀷 */
+ @ApiModelProperty("椤圭洰绫诲瀷")
private String projectType;
+
+ @ApiModelProperty("椤圭洰瀛愮被鍨�")
+ private String projectSubType;
/** 椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠) */
@ApiModelProperty("椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)")
@@ -50,6 +61,7 @@
@ApiModelProperty("璧勯噾绫诲瀷锛�0涓璧勯噾锛�1鍥藉�鸿祫閲戯紝2瓒呴暱鏈熷浗鍊猴紝3鍦版柟鏀垮簻涓撻」鍊猴級")
private String fundType;
+ private List<String> fundTypeList;
/** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
@ApiModelProperty("鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛�")
private String investType;
@@ -66,6 +78,10 @@
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
private List<Long> competentDepartmentList;
+
+
+
+ private String competentDepartment;
/** 琛屾斂鍖哄煙 */
@ApiModelProperty("琛屾斂鍖哄煙")
private String area;
@@ -73,7 +89,7 @@
/** 绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫) */
@ApiModelProperty("绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫)")
private List<String> managementCentralizationList;
-
+ private String managementCentralization;
/** 椤圭洰瀹℃壒绫诲瀷 */
@ApiModelProperty("椤圭洰瀹℃壒绫诲瀷")
private String projectApprovalType;
@@ -82,39 +98,47 @@
/** 閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�) */
@ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)")
private String importanceType;
-
- /** 骞村害鎶曡祫璁″垝 */
- @ApiModelProperty("骞村害鎶曡祫璁″垝")
- private String year;
-
+ private List<String> importanceTypeList;
+// /** 骞村害鎶曡祫璁″垝 */
+// @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;
@@ -129,7 +153,7 @@
/** 椤圭洰涓氫富鍗曚綅 */
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
/** 椤圭洰鑱旂郴浜� */
@ApiModelProperty("椤圭洰鑱旂郴浜�")
@@ -147,10 +171,37 @@
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
+ /** 鐘舵�佺爜 */
+ @ApiModelProperty("鐘舵�佺爜")
+ private String projectColorCode;
+
+ @ApiModelProperty("璧嬬爜")
+ private String coding;
+
+ @ApiModelProperty("鏂囦欢")
+ private List<File> fileList;
+
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬")
+ private Long industryCompetentDepartment;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�")
+ private Long industryCompetentDepartmentPerson;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ private String departmentPersonPhone;
+
+ 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();
@@ -165,7 +216,49 @@
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