From f00e93a712edfa97dd298c19efe364a7d3449781 Mon Sep 17 00:00:00 2001 From: "suhang_max@163.com" Date: Mon, 12 Dec 2022 11:49:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5-=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_list_approve.ftl | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index a58c675..264dcde 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -562,8 +562,23 @@ ${Utils.format(list.contractAmount, "0.00")} <#--项目阶段--> - 找后端要字段 - <#--${Utils.format(list.contractAmount, "0.00")}--> +<#-- ${list.stage!} + 项目阶段 + 0：S0-概算立项； + 1：S1-项目调研； + 2：S2-方案设计； + 3：S3-预算评估； + 4：S4-招标期； + 5：S5-合同期； + 6：S6-交付期； + 7：S7-结算期； + 8：S8-决算期； + 9：L-项目丢失 +--> +<#-- <#if list.tage==0>--> +<#-- ${}--> +<#-- --> + ${handlerStage(list.stage)} <#--项目毛利--> <#--${Utils.format(list.grossProfit, "0.00")}--> @@ -667,7 +682,6 @@ From dac623cb278f340dee997eb8e8488c999d9c0100 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Mon, 12 Dec 2022 14:51:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/controller/backend/ProjectController.java | 4 ++-- src/main/java/cn/palmte/work/service/ProjectService.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 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 65efa03..b51e1af 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -166,10 +166,10 @@ public class ProjectController extends BaseController { ExportExcelUtils exportExcelUtils = new ExportExcelUtils(); String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "最终用户名称", - "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"}; + "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划","项目阶段"}; String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", - "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"}; + "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection","stageName"}; exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream); // String[] headers1 = {"项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"}; // String[] columns1 = {"principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"}; diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 4c5ca49..e4ef96a 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -775,6 +775,12 @@ public class ProjectService { ", FORMAT(p.gross_profit,2) as grossProfitRound, FORMAT(p.gross_profit_margin,2) as grossProfitMarginRound, FORMAT(p.advance_interest_amount,2) as advanceInterestAmountRound, FORMAT(p.advance_peak_amount,2) as advancePeakAmountRound","project","p"); queryHelper.addCondition("p.id=?", id); Project first = pagination.findFirst(queryHelper.getSql(), Project.class); + + if(null == first.getStage()){ + first.setStageName(getStageName(-1)); + }else { + first.setStageName(getStageName(first.getStage())); + } return first; }