feat(资金计划): 完善资金计划功能并优化界面显示
- 在ProjectFundPlanService中添加payWay和payDate字段映射 - 为资金计划添加项目关联处理 - 优化付款计划表格的列名和显示 - 重构ProjectTabSkinFundPlan的service获取逻辑
This commit is contained in:
@@ -1,14 +1,5 @@
|
||||
package com.ecep.contract.controller.project;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.ecep.contract.ContractPayWay;
|
||||
import com.ecep.contract.controller.tab.TabSkin;
|
||||
import com.ecep.contract.controller.table.EditableEntityTableTabSkin;
|
||||
@@ -23,12 +14,18 @@ import com.ecep.contract.vo.ContractPayPlanVo;
|
||||
import com.ecep.contract.vo.ContractVo;
|
||||
import com.ecep.contract.vo.ProjectFundPlanVo;
|
||||
import com.ecep.contract.vo.ProjectVo;
|
||||
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Tab;
|
||||
import javafx.scene.control.TableColumn;
|
||||
import lombok.Setter;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 项目资金计划
|
||||
@@ -51,19 +48,13 @@ public class ProjectTabSkinFundPlan
|
||||
public TableColumn<ProjectFundPlanViewModel, String> payWayColumn;
|
||||
public Button updatePlanBtn;
|
||||
|
||||
@Setter
|
||||
private ProjectFundPlanService projectFundPlanService;
|
||||
|
||||
public ProjectTabSkinFundPlan(ProjectWindowController controller) {
|
||||
super(controller);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ProjectFundPlanService getViewModelService() {
|
||||
if (projectFundPlanService == null) {
|
||||
projectFundPlanService = getBean(ProjectFundPlanService.class);
|
||||
}
|
||||
return projectFundPlanService;
|
||||
return getProjectFundPlanService();
|
||||
}
|
||||
|
||||
public ContractPayPlanService getContractPayPlanService() {
|
||||
@@ -249,10 +240,7 @@ public class ProjectTabSkinFundPlan
|
||||
}
|
||||
|
||||
private ProjectFundPlanService getProjectFundPlanService() {
|
||||
if (projectFundPlanService == null) {
|
||||
projectFundPlanService = getBean(ProjectFundPlanService.class);
|
||||
}
|
||||
return projectFundPlanService;
|
||||
return getCachedBean(ProjectFundPlanService.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -149,6 +149,7 @@ public class ProjectWindowController extends AbstEntityController<ProjectVo, Pro
|
||||
registerTabSkin(costTab, tab -> new ProjectTabSkinCost(this));
|
||||
registerTabSkin(quotationApprovalTab, tab -> new ProjectTabSkinQuotation(this));
|
||||
registerTabSkin(bidTab, tab -> new ProjectTabSkinBid(this));
|
||||
// 资金计划
|
||||
registerTabSkin(fundPlanTab, tab -> new ProjectTabSkinFundPlan(this));
|
||||
// registerTabSkin(costItemTab, this::createCostItemTabSkin);
|
||||
registerTabSkin(satisfactionTab, tab -> new ProjectTabSkinCustomerSatisfactionSurvey(this));
|
||||
|
||||
Reference in New Issue
Block a user