wjbl/fundplatform
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 项目列表字段对齐，ProjectVO的id改为projectId，添加customerName

Browse Source
This commit is contained in:
zhangjf 2026-02-23 14:36:59 +08:00
parent 83e8712dfc
commit df2f1cdfa2
6 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fund-mobile/src/views/project/Add.vue
View File

@ -251,6 +251,7 @@ const onSubmit = async () => {
projectCode: form.value.projectCode,
projectName: form.value.projectName,
customerId: form.value.customerId,
customerName: form.value.customerName,
projectType: form.value.projectType,
budgetAmount: form.value.budgetAmount ? parseFloat(form.value.budgetAmount) : null,
startDate: form.value.startDate || null,

4
fund-mobile/src/views/project/List.vue
View File

@ -31,10 +31,6 @@
</div>
</div>
<div class="project-amount">
<div class="amount-item">
<span class="label">合同金额</span>
<span class="value">{{ formatMoney(item.contractAmount) }}</span>
</div>
<div class="amount-item">
<span class="label">预算金额</span>
<span class="value">{{ formatMoney(item.budgetAmount) }}</span>

9
fund-proj/src/main/java/com/fundplatform/proj/data/entity/Project.java
View File

@ -15,6 +15,7 @@ public class Project extends BaseEntity {
private String projectCode;
private String projectName;
private Long customerId;
private String customerName;
private String projectType;
private BigDecimal budgetAmount;
private LocalDate startDate;
@ -46,6 +47,14 @@ public class Project extends BaseEntity {
this.customerId = customerId;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getProjectType() {
return projectType;
}

10
fund-proj/src/main/java/com/fundplatform/proj/dto/ProjectCreateDTO.java
View File

@ -20,6 +20,8 @@ public class ProjectCreateDTO {
@NotNull(message = "客户ID不能为空")
private Long customerId;
private String customerName;
@NotBlank(message = "项目类型不能为空")
private String projectType;
@ -53,6 +55,14 @@ public class ProjectCreateDTO {
this.customerId = customerId;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getProjectType() {
return projectType;
}

4
fund-proj/src/main/java/com/fundplatform/proj/service/impl/ProjectServiceImpl.java
View File

@ -45,6 +45,7 @@ public class ProjectServiceImpl implements ProjectService {
project.setProjectCode(dto.getProjectCode());
project.setProjectName(dto.getProjectName());
project.setCustomerId(dto.getCustomerId());
project.setCustomerName(dto.getCustomerName());
project.setProjectType(dto.getProjectType());
project.setBudgetAmount(dto.getBudgetAmount());
project.setStartDate(dto.getStartDate());
@ -157,10 +158,11 @@ public class ProjectServiceImpl implements ProjectService {
private ProjectVO convertToVO(Project project) {
ProjectVO vo = new ProjectVO();
vo.setId(project.getId());
vo.setProjectId(project.getId());
vo.setProjectCode(project.getProjectCode());
vo.setProjectName(project.getProjectName());
vo.setCustomerId(project.getCustomerId());
vo.setCustomerName(project.getCustomerName());
vo.setProjectType(project.getProjectType());
vo.setBudgetAmount(project.getBudgetAmount());
vo.setStartDate(project.getStartDate());

19
fund-proj/src/main/java/com/fundplatform/proj/vo/ProjectVO.java
View File

@ -8,10 +8,11 @@ import java.time.LocalDate;
*/
public class ProjectVO {
private Long id;
private Long projectId;
private String projectCode;
private String projectName;
private Long customerId;
private String customerName;
private String projectType;
private BigDecimal budgetAmount;
private LocalDate startDate;
@ -20,12 +21,12 @@ public class ProjectVO {
private Integer status;
private String remark;
public Long getId() {
return id;
public Long getProjectId() {
return projectId;
}
public void setId(Long id) {
this.id = id;
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
public String getProjectCode() {
@ -52,6 +53,14 @@ public class ProjectVO {
this.customerId = customerId;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getProjectType() {
return projectType;
}