From b29b4008fcc85a8184d30af44dab540d50a14698 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 08 四月 2025 14:03:14 +0800
Subject: [PATCH] 查询流程图中的历史任务去重、修改任务相关完善
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
index bfa4cee..1edaf2d 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -15,7 +15,6 @@
import org.springframework.util.CollectionUtils;
import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -67,7 +66,15 @@
private String tag;
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
- private List<Long> competentDepartmentList;
+ private String competentDepartment;
+
+ @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴浜�")
+ /** 涓荤閮ㄩ棬鑱旂郴浜� */
+ private String competentDepartmentPerson;
+
+ @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ /** 涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */
+ private String competentDepartmentPhone;
@ApiModelProperty("琛屾斂鍖哄煙")
private String area;
@@ -146,7 +153,7 @@
@ApiModelProperty("琛屼笟涓荤閮ㄩ棬")
private Long industryCompetentDepartment;
@ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�")
- private Long industryCompetentDepartmentPerson;
+ private String industryCompetentDepartmentPerson;
@ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
private String departmentPersonPhone;
@@ -156,13 +163,6 @@
entity = new ProjectInfo();
}
BeanUtils.copyProperties(form, entity);
- //瀹℃牳閮ㄩ棬杞崲
- List<Long> competentDepartmentList = form.getCompetentDepartmentList();
- if(!CollectionUtils.isEmpty(competentDepartmentList)){
- entity.setCompetentDepartment(StringUtils.join(competentDepartmentList, ","));
- } else {
- entity.setCompetentDepartment("");
- }
//璧勯噾绫诲瀷杞崲
List<String> fundTypeList = form.getFundTypeList();
if(!CollectionUtils.isEmpty(fundTypeList)){
--
Gitblit v1.8.0