diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index ff2c4d5..7de65ee 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -134,6 +134,11 @@ public class Project { */ @Column(name = "main_contract_collection_terms") private String mainContractCollectionTerms; + /** + * 价值及风险 + */ + @Column(name = "value_risk") + private String valueRisk; /** * 项目创建时的配置的阀值 */ @@ -366,6 +371,14 @@ public class Project { this.mainContractCollectionTerms = mainContractCollectionTerms; } + public String getValueRisk() { + return valueRisk; + } + + public void setValueRisk(String valueRisk) { + this.valueRisk = valueRisk; + } + public BigDecimal getProjectContributionProfitRateThreshold() { return projectContributionProfitRateThreshold; } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index eb88375..7b09e07 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -189,6 +189,7 @@ public class ProjectService { projectInDb.setHuazhiProductAmount(project.getHuazhiProductAmount()); projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount()); projectInDb.setMainContractCollectionTerms(project.getMainContractCollectionTerms()); + projectInDb.setValueRisk(project.getValueRisk()); /// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 50f59fd..4e24fc4 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -248,7 +248,13 @@
- +
+
*价值及风险
+
+
${project.valueRisk!}
+
+
+
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index fd50df6..4a570c8 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -197,6 +197,16 @@
+
+
*价值及风险
+
+ +
+
+
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 73f4327..58e7da6 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -170,7 +170,16 @@
- +
+
*价值及风险
+
+ +
+
+
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 18fe219..a6c4ef1 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -177,7 +177,16 @@
- +
+
*价值及风险
+
+ +
+
+
diff --git a/src/main/resources/templates/admin/project_statistics.ftl b/src/main/resources/templates/admin/project_statistics.ftl index bcb7ff9..8e03f18 100644 --- a/src/main/resources/templates/admin/project_statistics.ftl +++ b/src/main/resources/templates/admin/project_statistics.ftl @@ -1,6 +1,23 @@ <#assign base=request.contextPath /> <#import "../common/defaultLayout.ftl" as defaultLayout> <@defaultLayout.layout> + + + +
@@ -28,40 +45,40 @@
- - - - - - - - - - - - - - - +
项目名称收入--设备类收入--工程类收入--服务类采购成本--设备类采购成本--施工类采购成本--服务类采购成本--其他成本--其他成本--项目管理成本财务费用--资金占用成本公司管理费用
+ + + + + + + + + + + + + + - + <#if (pager)?exists> <#list pager as list> - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -75,44 +92,44 @@
-
项目名称收入--设备类收入--工程类收入--服务类采购成本--设备类采购成本--施工类采购成本--服务类采购成本--其他成本--其他成本--项目管理成本财务费用--资金占用成本公司管理费用
${list.projectName!}${(list.incomeDevice!0)?string("0.##")}${(list.incomeEngineer!0)?string("0.##")}${(list.incomeService!0)?string("0.##")}${(list.costPurchaseDevice!0)?string("0.##")}${(list.costPurchaseBuild!0)?string("0.##")}${(list.costPurchaseService!0)?string("0.##")}${(list.costPurchaseOther!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}
${list.projectName!}${(list.incomeDevice!0)?string("0.##")}${(list.incomeEngineer!0)?string("0.##")}${(list.incomeService!0)?string("0.##")}${(list.costPurchaseDevice!0)?string("0.##")}${(list.costPurchaseBuild!0)?string("0.##")}${(list.costPurchaseService!0)?string("0.##")}${(list.costPurchaseOther!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}
- - - - - - - - - - - - - - - - +
项目名称营业收入营业成本项目管理成本其他财务费用项目毛利项目毛利率公司管理费用项目贡献利润项目贡献利润率所得税费用项目净利润项目净利润率
+ + + + + + + + + + + + + + + + - + <#if (pager)?exists> <#list pager as list> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -125,46 +142,46 @@
-
项目名称营业收入营业成本项目管理成本其他财务费用项目毛利项目毛利率公司管理费用项目贡献利润项目贡献利润率所得税费用项目净利润项目净利润率
${list.projectName!}${(list.incomeTotal!0)?string("0.##")}${(list.costTotal2!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.grossProfit!0)?string("0.##")}${(list.grossProfitProfitMargin!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}${(list.contributionProfit!0)?string("0.##")}${(list.contributionProfitProfitMargin!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.netProfit!0)?string("0.##")}${(list.netProfitProfitMargin!0)?string("0.##")}
${list.projectName!}${(list.incomeTotal!0)?string("0.##")}${(list.costTotal2!0)?string("0.##")}${(list.costProjectManage!0)?string("0.##")}${(list.costOther!0)?string("0.##")}${(list.costExpropriation!0)?string("0.##")}${(list.grossProfit!0)?string("0.##")}${(list.grossProfitProfitMargin!0)?string("0.##")}${(list.costCompanyManage!0)?string("0.##")}${(list.contributionProfit!0)?string("0.##")}${(list.contributionProfitProfitMargin!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.netProfit!0)?string("0.##")}${(list.netProfitProfitMargin!0)?string("0.##")}
- - - - - - - - - - - - - - - - - +
项目名称销售商品、提供劳务收到的现金收到的税费返还收到的其他与经营活动有关的现金购买商品、接受劳务支付的现金支付的各项税费支付其他与经营活动有关的现金经营活动产生的现金流量净额投资活动现金流入投资活动现金流出投资活动产生的现金流量净额借款资金流入还款资金流出筹资活动产生的现金流量净额货币资金净增加额
+ + + + + + + + + + + + + + + + + - + <#if (pager)?exists> <#list pager as list> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
项目名称销售商品、提供劳务收到的现金收到的税费返还收到的其他与经营活动有关的现金购买商品、接受劳务支付的现金支付的各项税费支付其他与经营活动有关的现金经营活动产生的现金流量净额投资活动现金流入投资活动现金流出投资活动产生的现金流量净额借款资金流入还款资金流出筹资活动产生的现金流量净额货币资金净增加额
${list.projectName!}${(list.saleIncomeCash!0)?string("0.##")}${(list.taxReturn!0)?string("0.##")}${(list.earnestMoneyIncome!0)?string("0.##")}${(list.purchaseCost!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.earnestMoneyCost!0)?string("0.##")}${(list.netCashFlow!0)?string("0.##")}${(list.cashInflowFromInvestingActivities!0)?string("0.##")}${(list.cashOutflowFromInvestingActivities!0)?string("0.##")}${(list.netCashFromInvestingActivities!0)?string("0.##")}${(list.financingCapitalInflow!0)?string("0.##")}${(list.financingCapitalOutflow!0)?string("0.##")}${(list.financingCapitalCashflow!0)?string("0.##")}${(list.netIncreaseMonetaryFunds!0)?string("0.##")}
${list.projectName!}${(list.saleIncomeCash!0)?string("0.##")}${(list.taxReturn!0)?string("0.##")}${(list.earnestMoneyIncome!0)?string("0.##")}${(list.purchaseCost!0)?string("0.##")}${(list.taxCost!0)?string("0.##")}${(list.earnestMoneyCost!0)?string("0.##")}${(list.netCashFlow!0)?string("0.##")}${(list.cashInflowFromInvestingActivities!0)?string("0.##")}${(list.cashOutflowFromInvestingActivities!0)?string("0.##")}${(list.netCashFromInvestingActivities!0)?string("0.##")}${(list.financingCapitalInflow!0)?string("0.##")}${(list.financingCapitalOutflow!0)?string("0.##")}${(list.financingCapitalCashflow!0)?string("0.##")}${(list.netIncreaseMonetaryFunds!0)?string("0.##")}