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 f020906..c5a6281 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -143,10 +143,10 @@ public class ProjectController extends BaseController { downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream"); String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额", "华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "最终用户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "战略合作对象", - "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"}; + "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "项目开始时间", "项目结束时间", "最后更新时间"}; String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound", "huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlan", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator", - "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"}; + "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName","stageName", "startDate", "endDate", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList()); } diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 0ee22b2..63af0c3 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -329,6 +329,9 @@ public class Project { @Transient private String actTaskName; + @Transient + private String stageName; + public int getId() { return id; } @@ -1025,4 +1028,12 @@ public class Project { public void setStageRemark(String stageRemark) { this.stageRemark = stageRemark; } + + public String getStageName() { + return stageName; + } + + public void setStageName(String stageName) { + this.stageName = stageName; + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 6fe1798..4c5ca49 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -286,11 +286,42 @@ public class ProjectService { project.setAdvancePeakAmountRound(project.getAdvancePeakAmountRound2()); project.setAdvanceInterestAmountRound(project.getAdvanceInterestAmountRound2()); } + if(null == project.getStage()){ + project.setStageName(getStageName(-1)); + }else { + project.setStageName(getStageName(project.getStage())); + } } } return page; } + public String getStageName(int stage){ + if(stage == 0){ + return "S0-概算立项"; + }else if(stage == 1){ + return "S1-项目调研"; + }else if(stage == 2){ + return "S2-方案设计"; + }else if(stage == 3){ + return "S3-预算评估"; + }else if(stage == 4){ + return "S4-招标期"; + }else if(stage == 5){ + return "S5-合同期"; + }else if(stage == 6){ + return "S6-交付期"; + }else if(stage == 7){ + return "S7-结算期"; + }else if(stage == 8){ + return "S8-决算期"; + }else if(stage == 9){ + return "L-项目丢失"; + }else { + return "无项目阶段"; + } + } + /** * 找到待我审核项目 diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 801b505..2996d5d 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -330,7 +330,6 @@ 项目阶段: + + + + + + + + + + + + + + + 当前进度描述: + + + +