fix: 项目列表字段对齐,ProjectVO的id改为projectId,添加customerName
This commit is contained in:
parent
83e8712dfc
commit
df2f1cdfa2
@ -251,6 +251,7 @@ const onSubmit = async () => {
|
|||||||
projectCode: form.value.projectCode,
|
projectCode: form.value.projectCode,
|
||||||
projectName: form.value.projectName,
|
projectName: form.value.projectName,
|
||||||
customerId: form.value.customerId,
|
customerId: form.value.customerId,
|
||||||
|
customerName: form.value.customerName,
|
||||||
projectType: form.value.projectType,
|
projectType: form.value.projectType,
|
||||||
budgetAmount: form.value.budgetAmount ? parseFloat(form.value.budgetAmount) : null,
|
budgetAmount: form.value.budgetAmount ? parseFloat(form.value.budgetAmount) : null,
|
||||||
startDate: form.value.startDate || null,
|
startDate: form.value.startDate || null,
|
||||||
|
|||||||
@ -31,10 +31,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="project-amount">
|
<div class="project-amount">
|
||||||
<div class="amount-item">
|
|
||||||
<span class="label">合同金额</span>
|
|
||||||
<span class="value">{{ formatMoney(item.contractAmount) }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="amount-item">
|
<div class="amount-item">
|
||||||
<span class="label">预算金额</span>
|
<span class="label">预算金额</span>
|
||||||
<span class="value">{{ formatMoney(item.budgetAmount) }}</span>
|
<span class="value">{{ formatMoney(item.budgetAmount) }}</span>
|
||||||
|
|||||||
@ -15,6 +15,7 @@ public class Project extends BaseEntity {
|
|||||||
private String projectCode;
|
private String projectCode;
|
||||||
private String projectName;
|
private String projectName;
|
||||||
private Long customerId;
|
private Long customerId;
|
||||||
|
private String customerName;
|
||||||
private String projectType;
|
private String projectType;
|
||||||
private BigDecimal budgetAmount;
|
private BigDecimal budgetAmount;
|
||||||
private LocalDate startDate;
|
private LocalDate startDate;
|
||||||
@ -46,6 +47,14 @@ public class Project extends BaseEntity {
|
|||||||
this.customerId = customerId;
|
this.customerId = customerId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getCustomerName() {
|
||||||
|
return customerName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCustomerName(String customerName) {
|
||||||
|
this.customerName = customerName;
|
||||||
|
}
|
||||||
|
|
||||||
public String getProjectType() {
|
public String getProjectType() {
|
||||||
return projectType;
|
return projectType;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,6 +20,8 @@ public class ProjectCreateDTO {
|
|||||||
@NotNull(message = "客户ID不能为空")
|
@NotNull(message = "客户ID不能为空")
|
||||||
private Long customerId;
|
private Long customerId;
|
||||||
|
|
||||||
|
private String customerName;
|
||||||
|
|
||||||
@NotBlank(message = "项目类型不能为空")
|
@NotBlank(message = "项目类型不能为空")
|
||||||
private String projectType;
|
private String projectType;
|
||||||
|
|
||||||
@ -53,6 +55,14 @@ public class ProjectCreateDTO {
|
|||||||
this.customerId = customerId;
|
this.customerId = customerId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getCustomerName() {
|
||||||
|
return customerName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCustomerName(String customerName) {
|
||||||
|
this.customerName = customerName;
|
||||||
|
}
|
||||||
|
|
||||||
public String getProjectType() {
|
public String getProjectType() {
|
||||||
return projectType;
|
return projectType;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,6 +45,7 @@ public class ProjectServiceImpl implements ProjectService {
|
|||||||
project.setProjectCode(dto.getProjectCode());
|
project.setProjectCode(dto.getProjectCode());
|
||||||
project.setProjectName(dto.getProjectName());
|
project.setProjectName(dto.getProjectName());
|
||||||
project.setCustomerId(dto.getCustomerId());
|
project.setCustomerId(dto.getCustomerId());
|
||||||
|
project.setCustomerName(dto.getCustomerName());
|
||||||
project.setProjectType(dto.getProjectType());
|
project.setProjectType(dto.getProjectType());
|
||||||
project.setBudgetAmount(dto.getBudgetAmount());
|
project.setBudgetAmount(dto.getBudgetAmount());
|
||||||
project.setStartDate(dto.getStartDate());
|
project.setStartDate(dto.getStartDate());
|
||||||
@ -157,10 +158,11 @@ public class ProjectServiceImpl implements ProjectService {
|
|||||||
|
|
||||||
private ProjectVO convertToVO(Project project) {
|
private ProjectVO convertToVO(Project project) {
|
||||||
ProjectVO vo = new ProjectVO();
|
ProjectVO vo = new ProjectVO();
|
||||||
vo.setId(project.getId());
|
vo.setProjectId(project.getId());
|
||||||
vo.setProjectCode(project.getProjectCode());
|
vo.setProjectCode(project.getProjectCode());
|
||||||
vo.setProjectName(project.getProjectName());
|
vo.setProjectName(project.getProjectName());
|
||||||
vo.setCustomerId(project.getCustomerId());
|
vo.setCustomerId(project.getCustomerId());
|
||||||
|
vo.setCustomerName(project.getCustomerName());
|
||||||
vo.setProjectType(project.getProjectType());
|
vo.setProjectType(project.getProjectType());
|
||||||
vo.setBudgetAmount(project.getBudgetAmount());
|
vo.setBudgetAmount(project.getBudgetAmount());
|
||||||
vo.setStartDate(project.getStartDate());
|
vo.setStartDate(project.getStartDate());
|
||||||
|
|||||||
@ -8,10 +8,11 @@ import java.time.LocalDate;
|
|||||||
*/
|
*/
|
||||||
public class ProjectVO {
|
public class ProjectVO {
|
||||||
|
|
||||||
private Long id;
|
private Long projectId;
|
||||||
private String projectCode;
|
private String projectCode;
|
||||||
private String projectName;
|
private String projectName;
|
||||||
private Long customerId;
|
private Long customerId;
|
||||||
|
private String customerName;
|
||||||
private String projectType;
|
private String projectType;
|
||||||
private BigDecimal budgetAmount;
|
private BigDecimal budgetAmount;
|
||||||
private LocalDate startDate;
|
private LocalDate startDate;
|
||||||
@ -20,12 +21,12 @@ public class ProjectVO {
|
|||||||
private Integer status;
|
private Integer status;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
public Long getId() {
|
public Long getProjectId() {
|
||||||
return id;
|
return projectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Long id) {
|
public void setProjectId(Long projectId) {
|
||||||
this.id = id;
|
this.projectId = projectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProjectCode() {
|
public String getProjectCode() {
|
||||||
@ -52,6 +53,14 @@ public class ProjectVO {
|
|||||||
this.customerId = customerId;
|
this.customerId = customerId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getCustomerName() {
|
||||||
|
return customerName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCustomerName(String customerName) {
|
||||||
|
this.customerName = customerName;
|
||||||
|
}
|
||||||
|
|
||||||
public String getProjectType() {
|
public String getProjectType() {
|
||||||
return projectType;
|
return projectType;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user