From bdef23946e420ba538870d6314034fbd42f00a66 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 76 ++++++++++++-------------------------
1 files changed, 25 insertions(+), 51 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 7d4b1f3..644de14 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -1,19 +1,23 @@
package com.ycl.domain.form;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
+import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.system.domain.base.AbsForm;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;
+import org.springframework.util.CollectionUtils;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛ㄨ〃鍗�
@@ -29,139 +33,109 @@
@ApiModelProperty("椤圭洰鍚嶇О")
private String projectName;
- @NotBlank(message = "椤圭洰浠ｇ爜涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鏂囦欢")
+ private List<File> fileList;
+
@ApiModelProperty("椤圭洰浠ｇ爜")
private String projectCode;
- @NotBlank(message = "寤鸿鍐呭涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("寤鸿鍐呭")
private String content;
- @NotBlank(message = "椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛変笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
private String projectType;
- @NotBlank(message = "椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)")
private String projectStatus;
- @NotBlank(message = "璧勯噾绫诲瀷锛�0涓璧勯噾锛�1鍥藉�鸿祫閲戯紝2瓒呴暱鏈熷浗鍊猴紝3鍦版柟鏀垮簻涓撻」鍊猴級涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("璧勯噾绫诲瀷锛�0涓璧勯噾锛�1鍥藉�鸿祫閲戯紝2瓒呴暱鏈熷浗鍊猴紝3鍦版柟鏀垮簻涓撻」鍊猴級")
private String fundType;
- @NotBlank(message = "鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛変笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛�")
private String investType;
- @NotBlank(message = "椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵)")
private String projectPhase;
- @NotBlank(message = "鏍囩涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏍囩")
private String tag;
- @NotNull(message = "涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
- private Integer competentDepartment;
+ private List<Long> competentDepartmentList;
- @NotBlank(message = "琛屾斂鍖哄煙涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("琛屾斂鍖哄煙")
- private String areaCode;
+ private String area;
- @NotBlank(message = "绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("绠＄悊褰掑彛 (0鍩烘湰寤鸿(鍙戞敼), 1鏇存柊鏀归��(缁忎俊), 2鍗曠函璐疆(鍙戞敼), 3淇℃伅鍖�(鍙戞敼), 4鍏朵粬鎶曡祫)")
- private String managementCentralization;
+ private List<String> managementCentralizationList;
- @NotBlank(message = "椤圭洰瀹℃壒绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰瀹℃壒绫诲瀷")
private String projectApprovalType;
- @NotBlank(message = "鎶曡祫鐩綍(锛�)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鎶曡祫鐩綍(锛�)")
- private String investmentCatalogue;
-
- @NotBlank(message = "閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)")
private String importanceType;
- @NotBlank(message = "骞村害鎶曡祫璁″垝涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("骞村害鎶曡祫璁″垝")
private String year;
- @NotNull(message = "骞村害鎶曡祫閲戦涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("骞村害鎶曡祫閲戦")
private BigDecimal yearInvestAmount;
- @NotNull(message = "绔嬮」鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("绔嬮」鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createProjectTime;
- @NotNull(message = "璁″垝寮�宸ユ椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("璁″垝寮�宸ユ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planStartTime;
- @NotNull(message = "璁″垝绔ｅ伐鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("璁″垝绔ｅ伐鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planCompleteTime;
- @NotBlank(message = "涓爣鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓爣鍗曚綅")
private String winUnit;
- @NotBlank(message = "涓爣閲戦涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓爣閲戦")
private String winAmount;
- @NotNull(message = "涓爣鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("涓爣鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date winTime;
- @NotBlank(message = "璇︾粏鍦板潃涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("璇︾粏鍦板潃")
private String projectAddress;
- @NotBlank(message = "缁忓害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("缁忓害")
private String longitude;
- @NotBlank(message = "绾害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("绾害")
private String latitude;
- @NotBlank(message = "椤圭洰涓氫富鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
private String projectOwnerUnit;
- @NotBlank(message = "椤圭洰鑱旂郴浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰鑱旂郴浜�")
private String projectContactPerson;
- @NotBlank(message = "鑱旂郴鏂瑰紡涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鑱旂郴鏂瑰紡")
private String contact;
-
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- @NotNull(message = "鏇存柊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
-
- @NotNull(message = "鏇存柊浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鏇存柊浜�")
- private Long updateBy;
-
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓浜�")
- private Long createBy;
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> managementCentralizationList = form.getManagementCentralizationList();
+ if(!CollectionUtils.isEmpty(managementCentralizationList)){
+ entity.setManagementCentralization(StringUtils.join(managementCentralizationList, ","));
+ }
return entity;
}
--
Gitblit v1.8.0