cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8-4 项目与合同关联、项目预算

This commit is contained in:
郝彬 2025-08-04 16:02:39 +08:00
parent b188cbd181
commit 14428ca9ae
6 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java
View File

@ -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;
}

6
core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java
View File

@ -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;

6
core/src/main/java/com/dite/znpt/domain/vo/ProjectListResp.java
View File

@ -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;

8
core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java
View File

@ -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("项目名称")

9
core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java
View File

@ -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;

2
core/src/main/resources/mapper/ProjectMapper.xml
View File

@ -13,7 +13,7 @@
group by project_id
)
SELECT
prj.project_id, prj.project_name, prj.farm_name, prj.status, prj.cover_url, prj.farm_address, prj.client, prj.client_contact, prj.client_phone, prj.inspection_unit,
prj.project_id, prj.project_origin, prj.project_budget, prj.project_name, prj.farm_name, prj.status, prj.cover_url, prj.farm_address, prj.client, prj.client_contact, prj.client_phone, prj.inspection_unit,
prj.inspection_contact, prj.inspection_phone, prj.scale, prj.turbine_model, prj.project_manager_id, pm.name AS project_manager_name, prj.constructor_ids,
GROUP_CONCAT(DISTINCT con.name) AS constructor_name, prj.start_date, prj.end_date, tp.taskPendingCount, tp.task_progress_count, tp.task_complete_count, tp.task_count
FROM project prj