From 96d377d5eeb2987ad4879255c070b5a2b9342044 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Mon, 12 Dec 2022 10:26:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E7=AE=97=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=A6=82=E7=AE=97=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 10 +- .../cn/palmte/work/model/ProjectBudget.java | 962 +++++------------- .../work/model/ProjectBudgetRepository.java | 2 + .../templates/admin/project_budget_edit.ftl | 349 ++++++- 4 files changed, 611 insertions(+), 712 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index cbad382..e30cdda 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -89,6 +89,8 @@ public class ProjectController extends BaseController { private NumSeqService numSeqService; @Autowired private AdminRepository adminRepository; + @Autowired + private ProjectBudgetRepository projectBudgetRepository; /** * 项目列表 @@ -335,6 +337,8 @@ public class ProjectController extends BaseController { public String budget(@RequestParam("id") int id, Map model) { Project project = projectService.getProject(id); model.put("project", project); + ProjectBudget projectBudget = projectBudgetRepository.findFirstByProjectId(project.getId()); + model.put("projectBudget", projectBudget); model.put("planStartStr", project.getPlanStartStr()); model.put("planStartDate", project.getPlanStartStr()); @@ -418,8 +422,9 @@ public class ProjectController extends BaseController { * 进行项目预算保存 */ @RequestMapping("/budgetEditSave") - public String budgetEditSave(Project project, BindingResult bindingResult, BudgetBean budgetBean, Map model) { + public String budgetEditSave(Project project, ProjectBudget projectBudget, BindingResult bindingResult, BudgetBean budgetBean, Map model) { Project projectInDb = projectService.getProject(project.getId()); + projectBudgetRepository.save(projectBudget); projectBudgetService.budgetEditSave(project, projectInDb, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); return "redirect:/project/list"; } @@ -428,8 +433,9 @@ public class ProjectController extends BaseController { * 进行项目预算保存并提交审核 */ @RequestMapping("/budgetEditSaveAndApprove") - public String budgetEditSaveAndApprove(Project project, BudgetBean budgetBean, Map model) throws Exception { + public String budgetEditSaveAndApprove(Project project, ProjectBudget projectBudget, BudgetBean budgetBean, Map model) throws Exception { Project projectInDb = projectService.getProject(project.getId()); + projectBudgetRepository.save(projectBudget); projectBudgetService.budgetEditSaveAndApprove(project, projectInDb, budgetBean, InterfaceUtil.getAdmin()); return "redirect:/project/list"; } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudget.java b/src/main/java/cn/palmte/work/model/ProjectBudget.java index aab494d..20af118 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudget.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudget.java @@ -30,297 +30,172 @@ public class ProjectBudget { /** * 项目编号 */ - private String projectNo; + @Column(name = "project_no_budget") + private String projectNoBudget; /** * 项目名称 */ - private String name; + @Column(name = "name_budget") + private String nameBudget; /** * 项目类型：1工程集成类、2设备集成类、3战略合作类 */ - private int type; - @Column(name = "type_desc") - private String typeDesc; - /** - * 项目状态：1项目创建(概算)，5预算，10结算，15决算 - */ - private int status; - @Column(name = "status_desc") - private String statusDesc; - /** - * 概算、预算、结算、决算：审核状态：0草稿，1待审核，2审核通过，3审核不通过 - */ - @Column(name = "approve_status_estimate") - private int approveStatusEstimate = -1; - @Column(name = "approve_status_budget") - private int approveStatusBudget = -1; - @Column(name = "approve_status_settle") - private int approveStatusSettle = -1; - @Column(name = "approve_status_final") - private int approveStatusFinal = -1; + @Column(name = "type_budget") + private int typeBudget; + + @Column(name = "type_desc_budget") + private String typeDescBudget; - /** - * 审核人id - */ - @Column(name = "approve_id") - private int approveId = 0; - @Column(name = "approve_name") - private String approveName; - /** - * 项目创建者id - */ - @Column(name = "creator_id") - private int creatorId; - @Column(name = "creator_name") - private String creatorName; /** * 项目部门id */ - @Column(name = "dept_id") - private int deptId; - @Column(name = "dept_name") - private String deptName; + @Column(name = "dept_id_budget") + private int deptIdBudget; + + @Column(name = "dept_name_budget") + private String deptNameBudget; /** * 项目开始时间，精确到月 */ - @Column(name = "start_date") + @Column(name = "start_date_budget") @Temporal(TemporalType.TIMESTAMP) - private Date startDate; + private Date startDateBudget; /** * 项目结束时间，精确到月 */ - @Column(name = "end_date") + @Column(name = "end_date_budget") @Temporal(TemporalType.TIMESTAMP) - private Date endDate; + private Date endDateBudget; /** * 垫资模式：1A类-不垫资（战略合作），2B类-不垫资（背靠背），3C类-垫资（账期覆盖），4D类-垫资（账期不覆盖） */ - @Column(name = "underwritten_mode") - private int underwrittenMode; + @Column(name = "underwritten_mode_budget") + private int underwrittenModeBudget; /** * 合作对象 */ - @Column(name = "collaborator") - private String collaborator; + @Column(name = "collaborator_budget") + private String collaboratorBudget; /** * 合作对象url */ - @Column(name = "collaborator_url") - private String collaboratorUrl; + @Column(name = "collaborator_url_budget") + private String collaboratorUrlBudget; /** * 客户名称 */ - @Column(name = "customer") - private String customer; + @Column(name = "customer_budget") + private String customerBudget; /** * 最终用户名称 */ - @Column(name = "terminal_customer") - private String terminalCustomer; + @Column(name = "terminal_customer_budget") + private String terminalCustomerBudget; /** * 垫资利息（元为单位） */ - @Column(name = "advance_interest_amount") - private BigDecimal advanceInterestAmount; + @Column(name = "advance_interest_amount_budget") + private BigDecimal advanceInterestAmountBudget; /** * 垫资峰值 */ - @Column(name = "advance_peak_amount") - private BigDecimal advancePeakAmount; + @Column(name = "advance_peak_amount_budget") + private BigDecimal advancePeakAmountBudget; /** * 合同金额 */ - @Column(name = "contract_amount") - private BigDecimal contractAmount; + @Column(name = "contract_amount_budget") + private BigDecimal contractAmountBudget; /** * 行业场景应用 */ - @Column(name = "industry_scene") - private Integer industryScene; + @Column(name = "industry_scene_budget") + private Integer industrySceneBudget; /** * 行业场景应用 */ - @Column(name = "industry_scenario") - private String industryScenario; + @Column(name = "industry_scenario_budget") + private String industryScenarioBudget; /** *华智产品金额 */ - @Column(name = "huazhi_product_amount") - private BigDecimal huazhiProductAmount; + @Column(name = "huazhi_product_amount_budget") + private BigDecimal huazhiProductAmountBudget; /** *其他产品金额 */ - @Column(name = "ziguang_other_amount") - private BigDecimal ziguangOtherAmount; + @Column(name = "ziguang_other_amount_budget") + private BigDecimal ziguangOtherAmountBudget; /** * 主合同收款条款 */ - @Column(name = "main_contract_collection_terms") - private String mainContractCollectionTerms; + @Column(name = "main_contract_collection_terms_budget") + private String mainContractCollectionTermsBudget; /** * 价值及风险 */ - @Column(name = "value_risk") - private String valueRisk; - /** - * 其他中的小类名称 - */ - @Column(name = "other_name") - private String otherName; - /** - * 项目创建时的配置的阀值 - */ - @Column(name = "project_contribution_profit_rate_threshold") - private BigDecimal projectContributionProfitRateThreshold; - /** - * 项目创建配置的年利率 - */ - @Column(name = "underwritten_tax_rate") - private BigDecimal underwrittenTaxRate; - /** - * 创建时间 - */ - @Column(name = "create_time") - @Temporal(TemporalType.TIMESTAMP) - private Date createTime; - /** - * 最后更新时间 - */ - @Column(name = "last_update_time") - @Temporal(TemporalType.TIMESTAMP) - private Date lastUpdateTime; + @Column(name = "value_risk_budget") + private String valueRiskBudget; - @Column(name = "plan_start_str") - private String planStartStr; + @Column(name = "underwritten_mode_str_budget") + private String underwrittenModeStrBudget; - @Column(name = "plan_end_str") - private String planEndStr; + @Column(name = "cooperate_type_budget") + private Integer cooperateTypeBudget; - @Column(name = "underwritten_mode_str") - private String underwrittenModeStr; + @Column(name = "cooperate_type_str_budget") + private String cooperateTypeStrBudget; - @Column(name = "cooperate_type") - private Integer cooperateType; + @Column(name = "certainty_budget") + private Integer certaintyBudget; - @Column(name = "cooperate_type_str") - private String cooperateTypeStr; + @Column(name = "certainty_str_budget") + private String certaintyStrBudget; - @Column(name = "certainty") - private Integer certainty; + @Column(name = "gross_profit_budget") + private BigDecimal grossProfitBudget; - @Column(name = "certainty_str") - private String certaintyStr; + @Column(name = "gross_profit_margin_budget") + private BigDecimal grossProfitMarginBudget; - @Column(name = "gross_profit") - private BigDecimal grossProfit; + @Column(name = "huizhi_product_amount_budget") + private BigDecimal huizhiProductAmountBudget; - @Column(name = "gross_profit_margin") - private BigDecimal grossProfitMargin; + @Column(name = "huasan_product_amount_budget") + private BigDecimal huasanProductAmountBudget; - @Column(name = "huizhi_product_amount") - private BigDecimal huizhiProductAmount; + @Column(name = "principal_budget") + private String principalBudget; - @Column(name = "huasan_product_amount") - private BigDecimal huasanProductAmount; + @Column(name = "contract_time_budget") + private Date contractTimeBudget; - @Column(name = "principal") - private String principal; + @Column(name = "bids_time_budget") + private Date bidsTimeBudget; - @Column(name = "contract_time") - private Date contractTime; + @Column(name = "is_second_budget") + private Integer isSecondBudget; - @Column(name = "bids_time") - private Date bidsTime; + @Column(name = "is_second_str_budget") + private String isSecondStrBudget; - @Column(name = "is_second") - private Integer isSecond; + @Column(name = "sign_type_budget") + private Integer signTypeBudget; - @Column(name = "is_second_str") - private String isSecondStr; + @Column(name = "sign_type_str_budget") + private String signTypeStrBudget; - @Column(name = "sign_type") - private Integer signType; + @Column(name = "resolve_plan_budget") + private Integer resolvePlanBudget; - @Column(name = "sign_type_str") - private String signTypeStr; + @Column(name = "resolve_plan_str_budget") + private String resolvePlanStrBudget; - @Column(name = "resolve_plan") - private Integer resolvePlan; + @Column(name = "main_contract_resolve_plan_budget") + private String mainContractResolvePlanBudget; - @Column(name = "resolve_plan_str") - private String resolvePlanStr; - - @Column(name = "main_contract_resolve_plan") - private String mainContractResolvePlan; - - @Column(name = "calculation_collection") - private String calculationCollection; - - @Transient - private String contractRound; - - @Transient - private String huazhiRound; - - @Transient - private String ziguangRound; - - @Transient - private String huizhiRound; - - @Transient - private String huasanRound; - - @Transient - private String grossProfitRound; - - @Transient - private String grossProfitMarginRound; - - @Transient - private String advanceInterestAmountRound; - - @Transient - private String advancePeakAmountRound; - - @Transient - private String contractRound2; - - @Transient - private String huazhiRound2; - - @Transient - private String ziguangRound2; - - @Transient - private String huizhiRound2; - - @Transient - private String huasanRound2; - - @Transient - private String grossProfitRound2; - - @Transient - private String grossProfitMarginRound2; - - @Transient - private String advanceInterestAmountRound2; - - @Transient - private String advancePeakAmountRound2; - - @Transient - private int isBudget; - - @Transient - private String remark; - - /** - * 审批任务节点 - */ - @Transient - private String actTaskName; + @Column(name = "calculation_collection_budget") + private String calculationCollectionBudget; public int getId() { return id; @@ -338,668 +213,339 @@ public class ProjectBudget { this.projectId = projectId; } - public String getProjectNo() { - return projectNo; + public String getProjectNoBudget() { + return projectNoBudget; } - public void setProjectNo(String projectNo) { - this.projectNo = projectNo; + public void setProjectNoBudget(String projectNoBudget) { + this.projectNoBudget = projectNoBudget; } - public String getName() { - return name; + public String getNameBudget() { + return nameBudget; } - public void setName(String name) { - this.name = name; + public void setNameBudget(String nameBudget) { + this.nameBudget = nameBudget; } - public int getType() { - return type; + public int getTypeBudget() { + return typeBudget; } - public void setType(int type) { - this.type = type; + public void setTypeBudget(int typeBudget) { + this.typeBudget = typeBudget; } - public String getTypeDesc() { - return typeDesc; + public String getTypeDescBudget() { + return typeDescBudget; } - public void setTypeDesc(String typeDesc) { - this.typeDesc = typeDesc; + public void setTypeDescBudget(String typeDescBudget) { + this.typeDescBudget = typeDescBudget; } - public int getStatus() { - return status; + public int getDeptIdBudget() { + return deptIdBudget; } - public void setStatus(int status) { - this.status = status; + public void setDeptIdBudget(int deptIdBudget) { + this.deptIdBudget = deptIdBudget; } - public String getStatusDesc() { - return statusDesc; + public String getDeptNameBudget() { + return deptNameBudget; } - public void setStatusDesc(String statusDesc) { - this.statusDesc = statusDesc; + public void setDeptNameBudget(String deptNameBudget) { + this.deptNameBudget = deptNameBudget; } - - public int getApproveStatus() { - if(status == STATUS_ESTIMATE){ - return approveStatusEstimate; - } - if(status == STATUS_BUDGET){ - return approveStatusBudget; - } - if(status == STATUS_SETTLE){ - return approveStatusSettle; - } - if(status == STATUS_FINAL){ - return approveStatusFinal; - } - return -1; - } - - public String getApproveStatusDesc() { - int approveStatus = getApproveStatus(); - if(-1 == approveStatus){ - return "未知"; - } - return ApproveStatusEnum.parseApproveStatus(approveStatus).getApproveStatusDesc(); - } - - public int getApproveStatusEstimate() { - return approveStatusEstimate; - } - - public void setApproveStatusEstimate(int approveStatusEstimate) { - this.approveStatusEstimate = approveStatusEstimate; - } - - public int getApproveStatusBudget() { - return approveStatusBudget; - } - - public void setApproveStatusBudget(int approveStatusBudget) { - this.approveStatusBudget = approveStatusBudget; - } - - public int getApproveStatusSettle() { - return approveStatusSettle; - } - - public void setApproveStatusSettle(int approveStatusSettle) { - this.approveStatusSettle = approveStatusSettle; - } - - public int getApproveStatusFinal() { - return approveStatusFinal; - } - - public void setApproveStatusFinal(int approveStatusFinal) { - this.approveStatusFinal = approveStatusFinal; - } - - public int getApproveId() { - return approveId; - } - - public void setApproveId(int approveId) { - this.approveId = approveId; - } - - public String getApproveName() { - return approveName; - } - - public void setApproveName(String approveName) { - this.approveName = approveName; - } - - public int getCreatorId() { - return creatorId; - } - - public void setCreatorId(int creatorId) { - this.creatorId = creatorId; - } - - public String getCreatorName() { - return creatorName; - } - - public void setCreatorName(String creatorName) { - this.creatorName = creatorName; - } - - public int getDeptId() { - return deptId; - } - - public void setDeptId(int deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public int getUnderwrittenMode() { - return underwrittenMode; - } - - public void setUnderwrittenMode(int underwrittenMode) { - this.underwrittenMode = underwrittenMode; - } - - public String getCollaborator() { - return collaborator; - } - - public void setCollaborator(String collaborator) { - this.collaborator = collaborator; - } - - public String getCollaboratorUrl() { - return collaboratorUrl; - } - - public void setCollaboratorUrl(String collaboratorUrl) { - this.collaboratorUrl = collaboratorUrl; - } - - public String getCustomer() { - return customer; - } - - public void setCustomer(String customer) { - this.customer = customer; - } - - public String getTerminalCustomer() { - return terminalCustomer; - } - - public void setTerminalCustomer(String terminalCustomer) { - this.terminalCustomer = terminalCustomer; - } - - public BigDecimal getAdvanceInterestAmount() { - return advanceInterestAmount; - } - - public void setAdvanceInterestAmount(BigDecimal advanceInterestAmount) { - this.advanceInterestAmount = advanceInterestAmount; - } - - public BigDecimal getAdvancePeakAmount() { - return advancePeakAmount; - } - - public void setAdvancePeakAmount(BigDecimal advancePeakAmount) { - this.advancePeakAmount = advancePeakAmount; - } - - public BigDecimal getContractAmount() { - return contractAmount; - } - - public void setContractAmount(BigDecimal contractAmount) { - this.contractAmount = contractAmount; - } - - public Integer getIndustryScene() { - return industryScene; - } - - public void setIndustryScene(Integer industryScene) { - this.industryScene = industryScene; - } - - public String getIndustryScenario() { - return industryScenario; - } - - public void setIndustryScenario(String industryScenario) { - this.industryScenario = industryScenario; - } - - public BigDecimal getHuazhiProductAmount() { - return huazhiProductAmount; - } - - public void setHuazhiProductAmount(BigDecimal huazhiProductAmount) { - this.huazhiProductAmount = huazhiProductAmount; - } - - public BigDecimal getZiguangOtherAmount() { - return ziguangOtherAmount; - } - - public void setZiguangOtherAmount(BigDecimal ziguangOtherAmount) { - this.ziguangOtherAmount = ziguangOtherAmount; - } - - public String getMainContractCollectionTerms() { - return mainContractCollectionTerms; - } - - public void setMainContractCollectionTerms(String mainContractCollectionTerms) { - this.mainContractCollectionTerms = mainContractCollectionTerms; - } - - public String getValueRisk() { - return valueRisk; - } - - public void setValueRisk(String valueRisk) { - this.valueRisk = valueRisk; - } - - public String getOtherName() { - return otherName; - } - - public void setOtherName(String otherName) { - this.otherName = otherName; - } - - public BigDecimal getProjectContributionProfitRateThreshold() { - return projectContributionProfitRateThreshold; - } - - public void setProjectContributionProfitRateThreshold(BigDecimal projectContributionProfitRateThreshold) { - this.projectContributionProfitRateThreshold = projectContributionProfitRateThreshold; - } - - public BigDecimal getUnderwrittenTaxRate() { - return underwrittenTaxRate; - } - - public void setUnderwrittenTaxRate(BigDecimal underwrittenTaxRate) { - this.underwrittenTaxRate = underwrittenTaxRate; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getLastUpdateTime() { - return lastUpdateTime; - } - - public void setLastUpdateTime(Date lastUpdateTime) { - this.lastUpdateTime = lastUpdateTime; - } - - public String getPlanStartStr() { - return planStartStr; - } - - public void setPlanStartStr(String planStartStr) { - this.planStartStr = planStartStr; - } - - public String getPlanEndStr() { - return planEndStr; - } - - public void setPlanEndStr(String planEndStr) { - this.planEndStr = planEndStr; - } - - public String getUnderwrittenModeStr() { - return underwrittenModeStr; - } - - public void setUnderwrittenModeStr(String underwrittenModeStr) { - this.underwrittenModeStr = underwrittenModeStr; - } - - public Integer getCooperateType() { - return cooperateType; - } - - public void setCooperateType(Integer cooperateType) { - this.cooperateType = cooperateType; - } - - public String getCooperateTypeStr() { - return cooperateTypeStr; - } - - public void setCooperateTypeStr(String cooperateTypeStr) { - this.cooperateTypeStr = cooperateTypeStr; - } - - public Integer getCertainty() { - return certainty; - } - - public void setCertainty(Integer certainty) { - this.certainty = certainty; - } - - public String getCertaintyStr() { - return certaintyStr; - } - - public void setCertaintyStr(String certaintyStr) { - this.certaintyStr = certaintyStr; - } - - public BigDecimal getGrossProfit() { - return grossProfit; + public Date getStartDateBudget() { + return startDateBudget; } - public void setGrossProfit(BigDecimal grossProfit) { - this.grossProfit = grossProfit; + public void setStartDateBudget(Date startDateBudget) { + this.startDateBudget = startDateBudget; } - public BigDecimal getGrossProfitMargin() { - return grossProfitMargin; + public Date getEndDateBudget() { + return endDateBudget; } - public void setGrossProfitMargin(BigDecimal grossProfitMargin) { - this.grossProfitMargin = grossProfitMargin; + public void setEndDateBudget(Date endDateBudget) { + this.endDateBudget = endDateBudget; } - public BigDecimal getHuizhiProductAmount() { - return huizhiProductAmount; + public int getUnderwrittenModeBudget() { + return underwrittenModeBudget; } - public void setHuizhiProductAmount(BigDecimal huizhiProductAmount) { - this.huizhiProductAmount = huizhiProductAmount; + public void setUnderwrittenModeBudget(int underwrittenModeBudget) { + this.underwrittenModeBudget = underwrittenModeBudget; } - public BigDecimal getHuasanProductAmount() { - return huasanProductAmount; + public String getCollaboratorBudget() { + return collaboratorBudget; } - public void setHuasanProductAmount(BigDecimal huasanProductAmount) { - this.huasanProductAmount = huasanProductAmount; + public void setCollaboratorBudget(String collaboratorBudget) { + this.collaboratorBudget = collaboratorBudget; } - public String getPrincipal() { - return principal; + public String getCollaboratorUrlBudget() { + return collaboratorUrlBudget; } - public void setPrincipal(String principal) { - this.principal = principal; + public void setCollaboratorUrlBudget(String collaboratorUrlBudget) { + this.collaboratorUrlBudget = collaboratorUrlBudget; } - public Date getContractTime() { - return contractTime; + public String getCustomerBudget() { + return customerBudget; } - public void setContractTime(Date contractTime) { - this.contractTime = contractTime; + public void setCustomerBudget(String customerBudget) { + this.customerBudget = customerBudget; } - public Date getBidsTime() { - return bidsTime; + public String getTerminalCustomerBudget() { + return terminalCustomerBudget; } - public void setBidsTime(Date bidsTime) { - this.bidsTime = bidsTime; + public void setTerminalCustomerBudget(String terminalCustomerBudget) { + this.terminalCustomerBudget = terminalCustomerBudget; } - public Integer getIsSecond() { - return isSecond; + public BigDecimal getAdvanceInterestAmountBudget() { + return advanceInterestAmountBudget; } - public void setIsSecond(Integer isSecond) { - this.isSecond = isSecond; + public void setAdvanceInterestAmountBudget(BigDecimal advanceInterestAmountBudget) { + this.advanceInterestAmountBudget = advanceInterestAmountBudget; } - public String getIsSecondStr() { - return isSecondStr; + public BigDecimal getAdvancePeakAmountBudget() { + return advancePeakAmountBudget; } - public void setIsSecondStr(String isSecondStr) { - this.isSecondStr = isSecondStr; + public void setAdvancePeakAmountBudget(BigDecimal advancePeakAmountBudget) { + this.advancePeakAmountBudget = advancePeakAmountBudget; } - public Integer getSignType() { - return signType; + public BigDecimal getContractAmountBudget() { + return contractAmountBudget; } - public void setSignType(Integer signType) { - this.signType = signType; + public void setContractAmountBudget(BigDecimal contractAmountBudget) { + this.contractAmountBudget = contractAmountBudget; } - public String getSignTypeStr() { - return signTypeStr; + public Integer getIndustrySceneBudget() { + return industrySceneBudget; } - public void setSignTypeStr(String signTypeStr) { - this.signTypeStr = signTypeStr; + public void setIndustrySceneBudget(Integer industrySceneBudget) { + this.industrySceneBudget = industrySceneBudget; } - public Integer getResolvePlan() { - return resolvePlan; + public String getIndustryScenarioBudget() { + return industryScenarioBudget; } - public void setResolvePlan(Integer resolvePlan) { - this.resolvePlan = resolvePlan; + public void setIndustryScenarioBudget(String industryScenarioBudget) { + this.industryScenarioBudget = industryScenarioBudget; } - public String getResolvePlanStr() { - return resolvePlanStr; + public BigDecimal getHuazhiProductAmountBudget() { + return huazhiProductAmountBudget; } - public void setResolvePlanStr(String resolvePlanStr) { - this.resolvePlanStr = resolvePlanStr; + public void setHuazhiProductAmountBudget(BigDecimal huazhiProductAmountBudget) { + this.huazhiProductAmountBudget = huazhiProductAmountBudget; } - public String getMainContractResolvePlan() { - return mainContractResolvePlan; + public BigDecimal getZiguangOtherAmountBudget() { + return ziguangOtherAmountBudget; } - public void setMainContractResolvePlan(String mainContractResolvePlan) { - this.mainContractResolvePlan = mainContractResolvePlan; + public void setZiguangOtherAmountBudget(BigDecimal ziguangOtherAmountBudget) { + this.ziguangOtherAmountBudget = ziguangOtherAmountBudget; } - public String getCalculationCollection() { - return calculationCollection; + public String getMainContractCollectionTermsBudget() { + return mainContractCollectionTermsBudget; } - public void setCalculationCollection(String calculationCollection) { - this.calculationCollection = calculationCollection; + public void setMainContractCollectionTermsBudget(String mainContractCollectionTermsBudget) { + this.mainContractCollectionTermsBudget = mainContractCollectionTermsBudget; } - public String getContractRound() { - return contractRound; + public String getValueRiskBudget() { + return valueRiskBudget; } - public void setContractRound(String contractRound) { - this.contractRound = contractRound; + public void setValueRiskBudget(String valueRiskBudget) { + this.valueRiskBudget = valueRiskBudget; } - public String getHuazhiRound() { - return huazhiRound; + public String getUnderwrittenModeStrBudget() { + return underwrittenModeStrBudget; } - public void setHuazhiRound(String huazhiRound) { - this.huazhiRound = huazhiRound; + public void setUnderwrittenModeStrBudget(String underwrittenModeStrBudget) { + this.underwrittenModeStrBudget = underwrittenModeStrBudget; } - public String getZiguangRound() { - return ziguangRound; + public Integer getCooperateTypeBudget() { + return cooperateTypeBudget; } - public void setZiguangRound(String ziguangRound) { - this.ziguangRound = ziguangRound; + public void setCooperateTypeBudget(Integer cooperateTypeBudget) { + this.cooperateTypeBudget = cooperateTypeBudget; } - public String getHuizhiRound() { - return huizhiRound; + public String getCooperateTypeStrBudget() { + return cooperateTypeStrBudget; } - public void setHuizhiRound(String huizhiRound) { - this.huizhiRound = huizhiRound; + public void setCooperateTypeStrBudget(String cooperateTypeStrBudget) { + this.cooperateTypeStrBudget = cooperateTypeStrBudget; } - public String getHuasanRound() { - return huasanRound; + public Integer getCertaintyBudget() { + return certaintyBudget; } - public void setHuasanRound(String huasanRound) { - this.huasanRound = huasanRound; + public void setCertaintyBudget(Integer certaintyBudget) { + this.certaintyBudget = certaintyBudget; } - public String getGrossProfitRound() { - return grossProfitRound; + public String getCertaintyStrBudget() { + return certaintyStrBudget; } - public void setGrossProfitRound(String grossProfitRound) { - this.grossProfitRound = grossProfitRound; + public void setCertaintyStrBudget(String certaintyStrBudget) { + this.certaintyStrBudget = certaintyStrBudget; } - public String getGrossProfitMarginRound() { - return grossProfitMarginRound; + public BigDecimal getGrossProfitBudget() { + return grossProfitBudget; } - public void setGrossProfitMarginRound(String grossProfitMarginRound) { - this.grossProfitMarginRound = grossProfitMarginRound; + public void setGrossProfitBudget(BigDecimal grossProfitBudget) { + this.grossProfitBudget = grossProfitBudget; } - public String getAdvanceInterestAmountRound() { - return advanceInterestAmountRound; + public BigDecimal getGrossProfitMarginBudget() { + return grossProfitMarginBudget; } - public void setAdvanceInterestAmountRound(String advanceInterestAmountRound) { - this.advanceInterestAmountRound = advanceInterestAmountRound; + public void setGrossProfitMarginBudget(BigDecimal grossProfitMarginBudget) { + this.grossProfitMarginBudget = grossProfitMarginBudget; } - public String getAdvancePeakAmountRound() { - return advancePeakAmountRound; + public BigDecimal getHuizhiProductAmountBudget() { + return huizhiProductAmountBudget; } - public void setAdvancePeakAmountRound(String advancePeakAmountRound) { - this.advancePeakAmountRound = advancePeakAmountRound; + public void setHuizhiProductAmountBudget(BigDecimal huizhiProductAmountBudget) { + this.huizhiProductAmountBudget = huizhiProductAmountBudget; } - public String getContractRound2() { - return contractRound2; + public BigDecimal getHuasanProductAmountBudget() { + return huasanProductAmountBudget; } - public void setContractRound2(String contractRound2) { - this.contractRound2 = contractRound2; + public void setHuasanProductAmountBudget(BigDecimal huasanProductAmountBudget) { + this.huasanProductAmountBudget = huasanProductAmountBudget; } - public String getHuazhiRound2() { - return huazhiRound2; + public String getPrincipalBudget() { + return principalBudget; } - public void setHuazhiRound2(String huazhiRound2) { - this.huazhiRound2 = huazhiRound2; + public void setPrincipalBudget(String principalBudget) { + this.principalBudget = principalBudget; } - public String getZiguangRound2() { - return ziguangRound2; + public Date getContractTimeBudget() { + return contractTimeBudget; } - public void setZiguangRound2(String ziguangRound2) { - this.ziguangRound2 = ziguangRound2; + public void setContractTimeBudget(Date contractTimeBudget) { + this.contractTimeBudget = contractTimeBudget; } - public String getHuizhiRound2() { - return huizhiRound2; + public Date getBidsTimeBudget() { + return bidsTimeBudget; } - public void setHuizhiRound2(String huizhiRound2) { - this.huizhiRound2 = huizhiRound2; + public void setBidsTimeBudget(Date bidsTimeBudget) { + this.bidsTimeBudget = bidsTimeBudget; } - public String getHuasanRound2() { - return huasanRound2; + public Integer getIsSecondBudget() { + return isSecondBudget; } - public void setHuasanRound2(String huasanRound2) { - this.huasanRound2 = huasanRound2; + public void setIsSecondBudget(Integer isSecondBudget) { + this.isSecondBudget = isSecondBudget; } - public String getGrossProfitRound2() { - return grossProfitRound2; + public String getIsSecondStrBudget() { + return isSecondStrBudget; } - public void setGrossProfitRound2(String grossProfitRound2) { - this.grossProfitRound2 = grossProfitRound2; + public void setIsSecondStrBudget(String isSecondStrBudget) { + this.isSecondStrBudget = isSecondStrBudget; } - public String getGrossProfitMarginRound2() { - return grossProfitMarginRound2; + public Integer getSignTypeBudget() { + return signTypeBudget; } - public void setGrossProfitMarginRound2(String grossProfitMarginRound2) { - this.grossProfitMarginRound2 = grossProfitMarginRound2; + public void setSignTypeBudget(Integer signTypeBudget) { + this.signTypeBudget = signTypeBudget; } - public String getAdvanceInterestAmountRound2() { - return advanceInterestAmountRound2; + public String getSignTypeStrBudget() { + return signTypeStrBudget; } - public void setAdvanceInterestAmountRound2(String advanceInterestAmountRound2) { - this.advanceInterestAmountRound2 = advanceInterestAmountRound2; + public void setSignTypeStrBudget(String signTypeStrBudget) { + this.signTypeStrBudget = signTypeStrBudget; } - public String getAdvancePeakAmountRound2() { - return advancePeakAmountRound2; + public Integer getResolvePlanBudget() { + return resolvePlanBudget; } - public void setAdvancePeakAmountRound2(String advancePeakAmountRound2) { - this.advancePeakAmountRound2 = advancePeakAmountRound2; + public void setResolvePlanBudget(Integer resolvePlanBudget) { + this.resolvePlanBudget = resolvePlanBudget; } - public int getIsBudget() { - return isBudget; + public String getResolvePlanStrBudget() { + return resolvePlanStrBudget; } - public void setIsBudget(int isBudget) { - this.isBudget = isBudget; + public void setResolvePlanStrBudget(String resolvePlanStrBudget) { + this.resolvePlanStrBudget = resolvePlanStrBudget; } - public String getActTaskName() { - return actTaskName; + public String getMainContractResolvePlanBudget() { + return mainContractResolvePlanBudget; } - public void setActTaskName(String actTaskName) { - this.actTaskName = actTaskName; + public void setMainContractResolvePlanBudget(String mainContractResolvePlanBudget) { + this.mainContractResolvePlanBudget = mainContractResolvePlanBudget; } - public String getRemark() { - return remark; + public String getCalculationCollectionBudget() { + return calculationCollectionBudget; } - public void setRemark(String remark) { - this.remark = remark; + public void setCalculationCollectionBudget(String calculationCollectionBudget) { + this.calculationCollectionBudget = calculationCollectionBudget; } } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetRepository.java b/src/main/java/cn/palmte/work/model/ProjectBudgetRepository.java index cef7a8e..f54c23c 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetRepository.java @@ -3,4 +3,6 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; public interface ProjectBudgetRepository extends JpaRepository { + + ProjectBudget findFirstByProjectId(int projectId); } diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 56815fa..6f7995b 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -94,7 +94,7 @@
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
项目基本信息
*部门名称:*项目编号:
*项目名称: + +
*项目类型: + + *项目计划开始时间: + <#-- --> + + *项目计划结束时间: + <#-- --> + +
*垫资模式: + + hidden>hidden>*垫资利息:hidden> + + hidden>*垫资峰值:hidden> + +
*合作类型: + + hidden >*合作对象:hidden > +
+ + + + + + <#if projectBudget.collaboratorUrlBudget??>已上传 + + +
+ 		hidden>
*合同金额: + + *项目毛利: + + *项目毛利率: + +
*汇智产品金额: + + *华智产品金额: + + *华三产品金额: + +
*其他产品金额: + + *项目把握度: + + *行业场景应用: + +
*项目解决方案: + + *客户名称: + + *最终用户名称: + +
*价值及风险: + +
*项目负责人: + + 预计合同签订时间: + + 项目计划招标时间: + +
是否二次合作: + + 直签: + +
主合同收款条款: + +
主合同具体解决方案: + +
计收计划: + +
+
@@ -1087,11 +1398,13 @@ var changeCheck = function () { var underwrittenMode = $("#underwrittenMode").val(); if (underwrittenMode <= 2) { + $("#noUnder0").show(); $("#noUnder1").hide(); $("#noUnder2").hide(); $("#noUnder3").hide(); $("#noUnder4").hide(); } else { + $("#noUnder0").hide(); $("#noUnder1").show(); $("#noUnder2").show(); $("#noUnder3").show(); @@ -1102,15 +1415,47 @@ var changeCheck2 = function () { var cooperateType = $("#cooperateType").val(); if (cooperateType == 1) { + $("#coop0").hide(); $("#coop1").show(); $("#coop2").show(); } else { + $("#coop0").show(); $("#coop1").hide(); $("#coop2").hide(); } }; - function ajaxUploadFile(id, url) { + var changeCheckB = function () { + var underwrittenModeBudget = $("#underwrittenModeBudget").val(); + if (underwrittenModeBudget <= 2) { + $("#noUnder0b").show(); + $("#noUnder1b").hide(); + $("#noUnder2b").hide(); + $("#noUnder3b").hide(); + $("#noUnder4b").hide(); + } else { + $("#noUnder0b").hide(); + $("#noUnder1b").show(); + $("#noUnder2b").show(); + $("#noUnder3b").show(); + $("#noUnder4b").show(); + } + }; + + var changeCheck2B = function () { + var cooperateTypeBudget = $("#cooperateTypeBudget").val(); + if (cooperateTypeBudget == 1) { + $("#coop0b").hide(); + $("#coop1b").show(); + $("#coop2b").show(); + } else { + $("#coop0b").show(); + $("#coop1b").hide(); + $("#coop2b").hide(); + } + }; + + function ajaxUploadFile(id, url) { // if($('#modal')){ // $('#modal').modal('open'); // $('#span-'+id).html("    数据正在导入，请等待");