From 01c29b4b6cfb1a3223cf9e322f33ead42093e77c Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期三, 02 四月 2025 09:11:22 +0800 Subject: [PATCH] 类名统一,查询启用赋码规则代码提到service --- business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 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 35787ca..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; @@ -55,19 +54,27 @@ 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绔e伐鎶曠敤闃舵)") + @ApiModelProperty("椤圭洰闃舵(1鍌ㄥ瑙勫垝闃舵, 2椤圭洰鍓嶆湡闃舵, 3瀹炴柦闃舵, 4绔e伐鎶曠敤闃舵)") 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; @@ -79,7 +86,10 @@ private String projectApprovalType; @ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)") - private String importanceType; + private List<String> importanceTypeList; + + + // @ApiModelProperty("骞村害鎶曡祫璁″垝") // private String year; @@ -125,6 +135,9 @@ @ApiModelProperty("椤圭洰涓氫富鍗曚綅") private Long projectOwnerUnit; + @ApiModelProperty("鏄惁鎷涘晢寮曡祫椤圭洰锛�0 涓嶆槸 1 鏄�") + private String attractInvestment; + @ApiModelProperty("椤圭洰鑱旂郴浜�") private String projectContactPerson; @@ -140,7 +153,7 @@ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬") private Long industryCompetentDepartment; @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�") - private Long industryCompetentDepartmentPerson; + private String industryCompetentDepartmentPerson; @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡") private String departmentPersonPhone; @@ -150,15 +163,26 @@ 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