From 14428ca9aef6804dabaa553703b8b9fe664f4f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=BD=AC?= <14779346+xswl_123@user.noreply.gitee.com> Date: Mon, 4 Aug 2025 16:02:39 +0800 Subject: [PATCH] =?UTF-8?q?8-4=20=E9=A1=B9=E7=9B=AE=E4=B8=8E=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E3=80=81=E9=A1=B9=E7=9B=AE=E9=A2=84?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dite/znpt/converts/Impl/ConvertsImpl.java | 5 +++++ .../dite/znpt/domain/vo/ProjectListReq.java | 6 ++++++ .../dite/znpt/domain/vo/ProjectListResp.java | 6 ++++++ .../com/dite/znpt/domain/vo/ProjectReq.java | 8 ++++++++ .../com/dite/znpt/domain/vo/ProjectResp.java | 9 +++++++++ .../main/resources/mapper/ProjectMapper.xml | 18 +++++++++--------- 6 files changed, 43 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java b/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java index 6b8bcf7..0156ed3 100644 --- a/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java +++ b/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java @@ -232,6 +232,9 @@ public class ConvertsImpl implements Converts { projectResp.setAuditorId( entity.getAuditorId() ); projectResp.setQualityOfficerId( entity.getQualityOfficerId() ); projectResp.setProjectManagerId( entity.getProjectManagerId() ); + projectResp.setProjectOrigin( entity.getProjectOrigin() ); + projectResp.setProjectBudget( entity.getProjectBudget() ); + if ( entity.getStatus() != null ) { projectResp.setStatus( entity.getStatus() ); } @@ -270,6 +273,8 @@ public class ConvertsImpl implements Converts { projectEntity.setStatus( req.getStatus() ); projectEntity.setStartDate( req.getStartDate() ); projectEntity.setEndDate( req.getEndDate() ); + projectEntity.setProjectOrigin( req.getProjectOrigin() ); + projectEntity.setProjectBudget( req.getProjectBudget() ); return projectEntity; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java index a285e33..9ba2992 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java @@ -23,6 +23,12 @@ public class ProjectListReq implements Serializable { @ApiModelProperty("项目名称") private String projectName; + @ApiModelProperty(value = "项目来源") + private String projectOrigin; + + @ApiModelProperty(value = "项目预算") + private Integer projectBudget; + @ApiModelProperty("风场名称") private String farmName; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectListResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectListResp.java index f0578ef..cd29090 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectListResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectListResp.java @@ -31,6 +31,12 @@ public class ProjectListResp implements Serializable { @ApiModelProperty("项目名称") private String projectName; + @ApiModelProperty(value = "项目来源") + private String projectOrigin; + + @ApiModelProperty(value = "项目预算") + private Integer projectBudget; + @ApiModelProperty("风场名称") private String farmName; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java index 501ac49..fdd2304 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java @@ -28,6 +28,14 @@ public class ProjectReq implements Serializable { @ApiModelProperty("项目id") private String projectId; + @NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "项目来源不能为空") + @ApiModelProperty("项目来源") + private String projectOrigin; + + @NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "项目预算不能为空") + @ApiModelProperty("项目预算") + private Integer projectBudget; + @NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "项目名称不能为空") @Size(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, max = 50, message = "项目名称长度不能超过50字符") @ApiModelProperty("项目名称") diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java index 826a0f5..055af72 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java @@ -27,6 +27,15 @@ public class ProjectResp extends ProjectReq implements Serializable { @Serial private static final long serialVersionUID = -1883901559600186726L; + @ApiModelProperty("项目ID") + private String projectId; + + @ApiModelProperty("项目来源") + private String projectOrigin; + + @ApiModelProperty("项目预算") + private Integer projectBudget; + @ApiModelProperty("施工人员") private String constructorName; diff --git a/core/src/main/resources/mapper/ProjectMapper.xml b/core/src/main/resources/mapper/ProjectMapper.xml index 25aabf1..636db3f 100644 --- a/core/src/main/resources/mapper/ProjectMapper.xml +++ b/core/src/main/resources/mapper/ProjectMapper.xml @@ -3,17 +3,17 @@