diff --git a/fund-mobile/src/views/project/Add.vue b/fund-mobile/src/views/project/Add.vue
index aa186da..ded73e7 100644
--- a/fund-mobile/src/views/project/Add.vue
+++ b/fund-mobile/src/views/project/Add.vue
@@ -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,
diff --git a/fund-mobile/src/views/project/List.vue b/fund-mobile/src/views/project/List.vue
index 2168e39..fbfd71f 100644
--- a/fund-mobile/src/views/project/List.vue
+++ b/fund-mobile/src/views/project/List.vue
@@ -31,10 +31,6 @@
-
- 合同金额
- {{ formatMoney(item.contractAmount) }}
-
预算金额
{{ formatMoney(item.budgetAmount) }}
diff --git a/fund-proj/src/main/java/com/fundplatform/proj/data/entity/Project.java b/fund-proj/src/main/java/com/fundplatform/proj/data/entity/Project.java
index 3d014ed..78e2bfb 100644
--- a/fund-proj/src/main/java/com/fundplatform/proj/data/entity/Project.java
+++ b/fund-proj/src/main/java/com/fundplatform/proj/data/entity/Project.java
@@ -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;
}
diff --git a/fund-proj/src/main/java/com/fundplatform/proj/dto/ProjectCreateDTO.java b/fund-proj/src/main/java/com/fundplatform/proj/dto/ProjectCreateDTO.java
index e56f00c..c2a6b6d 100644
--- a/fund-proj/src/main/java/com/fundplatform/proj/dto/ProjectCreateDTO.java
+++ b/fund-proj/src/main/java/com/fundplatform/proj/dto/ProjectCreateDTO.java
@@ -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;
}
diff --git a/fund-proj/src/main/java/com/fundplatform/proj/service/impl/ProjectServiceImpl.java b/fund-proj/src/main/java/com/fundplatform/proj/service/impl/ProjectServiceImpl.java
index d12b63d..45c7883 100644
--- a/fund-proj/src/main/java/com/fundplatform/proj/service/impl/ProjectServiceImpl.java
+++ b/fund-proj/src/main/java/com/fundplatform/proj/service/impl/ProjectServiceImpl.java
@@ -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());
diff --git a/fund-proj/src/main/java/com/fundplatform/proj/vo/ProjectVO.java b/fund-proj/src/main/java/com/fundplatform/proj/vo/ProjectVO.java
index 3009064..232dfa3 100644
--- a/fund-proj/src/main/java/com/fundplatform/proj/vo/ProjectVO.java
+++ b/fund-proj/src/main/java/com/fundplatform/proj/vo/ProjectVO.java
@@ -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;
}