From b78b10c1b2aa6f615b7a31c1bd159dfac490d410 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 23 三月 2025 12:13:54 +0800
Subject: [PATCH] 首页待办剩余时间排序
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 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 dc76db7..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;
@@ -45,26 +44,37 @@
@ApiModelProperty("寤鸿鎬ц川")
private String constructionNature;
- @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
+ @ApiModelProperty("椤圭洰绫诲瀷")
private String projectType;
+
+ @ApiModelProperty("椤圭洰瀛愮被鍨�")
+ private String projectSubType;
@ApiModelProperty("椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)")
private String projectStatus;
@ApiModelProperty("璧勯噾绫诲瀷锛�0涓璧勯噾锛�1鍥藉�鸿祫閲戯紝2瓒呴暱鏈熷浗鍊猴紝3鍦版柟鏀垮簻涓撻」鍊猴級")
- private String fundType;
+ private List<String> fundTypeList;
@ApiModelProperty("鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛�")
private String investType;
- @ApiModelProperty("椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵)")
+ @ApiModelProperty("椤圭洰闃舵(1鍌ㄥ瑙勫垝闃舵, 2椤圭洰鍓嶆湡闃舵, 3瀹炴柦闃舵, 4绔ｅ伐鎶曠敤闃舵)")
private String projectPhase;
@ApiModelProperty("鏍囩")
private String tag;
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
- private List<Long> competentDepartmentList;
+ private String competentDepartment;
+
+ @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴浜�")
+ /** 涓荤閮ㄩ棬鑱旂郴浜� */
+ private String competentDepartmentPerson;
+
+ @ApiModelProperty("涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ /** 涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */
+ private String competentDepartmentPhone;
@ApiModelProperty("琛屾斂鍖哄煙")
private String area;
@@ -76,13 +86,18 @@
private String projectApprovalType;
@ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)")
- private String importanceType;
+ private List<String> importanceTypeList;
- @ApiModelProperty("骞村害鎶曡祫璁″垝")
- private String year;
+
+
+// @ApiModelProperty("骞村害鎶曡祫璁″垝")
+// private String year;
+//
+// @ApiModelProperty("骞村害鎶曡祫閲戦")
+// private BigDecimal yearInvestAmount;
@ApiModelProperty("骞村害鎶曡祫閲戦")
- private BigDecimal yearInvestAmount;
+ private List<ProjectInfoYearPlanForm> yearPlanList;
@ApiModelProperty("绔嬮」鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -120,6 +135,9 @@
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
private Long projectOwnerUnit;
+ @ApiModelProperty("鏄惁鎷涘晢寮曡祫椤圭洰锛�0 涓嶆槸 1 鏄�")
+ private String attractInvestment;
+
@ApiModelProperty("椤圭洰鑱旂郴浜�")
private String projectContactPerson;
@@ -132,21 +150,39 @@
@ApiModelProperty("璧嬬爜")
private String coding;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬")
+ private Long industryCompetentDepartment;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�")
+ private String industryCompetentDepartmentPerson;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ private String departmentPersonPhone;
+
private String remark;
public static ProjectInfo getEntityByForm(@NonNull ProjectInfoForm form, ProjectInfo entity) {
if(entity == null) {
entity = new ProjectInfo();
}
BeanUtils.copyProperties(form, entity);
- //瀹℃牳閮ㄩ棬杞崲
- List<Long> competentDepartmentList = form.getCompetentDepartmentList();
- if(!CollectionUtils.isEmpty(competentDepartmentList)){
- entity.setCompetentDepartment(StringUtils.join(competentDepartmentList, ","));
+ //璧勯噾绫诲瀷杞崲
+ List<String> fundTypeList = form.getFundTypeList();
+ if(!CollectionUtils.isEmpty(fundTypeList)){
+ entity.setFundType(StringUtils.join(fundTypeList, ","));
+ } else {
+ entity.setFundType("");
+ }
+ //閲嶇偣鍒嗙被杞崲
+ List<String> importanceTypeList = form.getImportanceTypeList();
+ if(!CollectionUtils.isEmpty(importanceTypeList)){
+ entity.setImportanceType(StringUtils.join(importanceTypeList, ","));
+ } else {
+ entity.setImportanceType("");
}
//绠＄悊褰掑彛杞崲
List<String> managementCentralizationList = form.getManagementCentralizationList();
if(!CollectionUtils.isEmpty(managementCentralizationList)){
entity.setManagementCentralization(StringUtils.join(managementCentralizationList, ","));
+ } else {
+ entity.setManagementCentralization("");
}
return entity;
}
--
Gitblit v1.8.0