From c2c9e3b1039c0a5223801759475112c6da9a3a3d Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 25 二月 2025 14:59:49 +0800 Subject: [PATCH] 项目相关联系人调整 --- business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 34 +++++++++++----------------------- 1 files changed, 11 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 e057f2f..5dbf816 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java @@ -76,12 +76,16 @@ /** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */ @ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)") - private List<Long> competentDepartmentList; - - - - private String competentDepartment; + + @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴浜�") + /** 涓荤閮ㄩ棬鑱旂郴浜� */ + private String competentDepartmentPerson; + + @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴鏂瑰紡") + /** 涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */ + private String competentDepartmentPhone; + /** 琛屾斂鍖哄煙 */ @ApiModelProperty("琛屾斂鍖哄煙") private String area; @@ -184,7 +188,7 @@ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬") private Long industryCompetentDepartment; @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�") - private Long industryCompetentDepartmentPerson; + private String industryCompetentDepartmentPerson; @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡") private String departmentPersonPhone; @@ -203,14 +207,7 @@ } 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)){ @@ -233,14 +230,6 @@ } //杞崲瀛楃涓查泦鍚堝瓧娈� 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)){ @@ -248,7 +237,6 @@ } //鍒嗙被绫诲瀷杞崲 - String importanceType = vo.getImportanceType(); if (!StringUtils.isBlank(importanceType)) { vo.setImportanceTypeList(Arrays.asList(importanceType.split(","))); -- Gitblit v1.8.0