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 @@
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
-
+ <div class="am-g am-form-group am-margin-top">
+ <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
+ <div class="am-u-sm-6 am-u-md-6">
+ <div style="width:600px; height:auto; word-wrap:break-word;">${project.valueRisk!}</div>
+ </div>
+ <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+ </div>
</div>
<!--验证表单元素（validate end-->
</div>
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 @@
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
+ <div class="am-g am-form-group am-margin-top">
+ <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
+ <div class="am-u-sm-6 am-u-md-6">
+ <textarea rows="5" cols="20" id="valueRisk" name="valueRisk"
+ class="am-input" data-validate-async data-validation-message="请输入价值及风险"
+ placeholder="请输入价值及风险" required
+ >${project.valueRisk!}</textarea>
+ </div>
+ <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+ </div>
</div>
<!--验证表单元素（validate end-->
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 @@
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
-
+ <div class="am-g am-form-group am-margin-top">
+ <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
+ <div class="am-u-sm-6 am-u-md-6">
+ <textarea rows="5" cols="20" id="valueRisk" name="valueRisk"
+ class="am-input" data-validate-async data-validation-message="请输入价值及风险"
+ placeholder="请输入价值及风险" required
+ ></textarea>
+ </div>
+ <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+ </div>
</div>
<!--验证表单元素（validate end-->
</div>
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 @@
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
-
+ <div class="am-g am-form-group am-margin-top">
+ <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
+ <div class="am-u-sm-6 am-u-md-6">
+ <textarea rows="5" cols="20" id="valueRisk" name="valueRisk"
+ class="am-input" data-validate-async data-validation-message="请输入价值及风险"
+ placeholder="请输入价值及风险" required
+ >${project.valueRisk!}</textarea>
+ </div>
+ <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+ </div>
</div>
<!--验证表单元素（validate end-->
</div>
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>
+ <link rel="stylesheet" type="text/css" href="${base}/common/css/time-axis.css">
+
+ <style type="text/css">
+ .cal-table-column {
+ display: block;
+ }
+ .cal-table-left {
+ display: block;
+ float: left;
+ }
+ table {
+ display: block;
+ /*border: 1px solid;*/
+ width: 200px;
+ }
+ </style>
+
<div class="admin-content">
<div class="admin-content-body">
<div class="am-cf am-padding">
@@ -28,40 +45,40 @@
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active" id="tab1">
<div class="am-scrollable-horizontal">
- <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
- <thead>
- <tr class="am-text-nowrap">
- <th class="table-title">项目名称</th>
- <th class="table-title">收入--设备类</th>
- <th class="table-title">收入--工程类</th>
- <th class="table-title">收入--服务类</th>
- <th class="table-title">采购成本--设备类</th>
- <th class="table-title">采购成本--施工类</th>
- <th class="table-title">采购成本--服务类</th>
- <th class="table-title">采购成本--其他</th>
- <th class="table-title">成本--其他</th>
- <th class="table-title">成本--项目管理成本</th>
- <th class="table-title">财务费用--资金占用成本</th>
- <th class="table-title">公司管理费用</th>
+ <table class="am-table am-table-bordered am-table-radius table-main cal-table-table" style="padding:0;">
+ <thead class="cal-table-left">
+ <tr class="cal-table-left">
+ <th class="table-title cal-table-column">项目名称</th>
+ <th class="table-title cal-table-column">收入--设备类</th>
+ <th class="table-title cal-table-column">收入--工程类</th>
+ <th class="table-title cal-table-column">收入--服务类</th>
+ <th class="table-title cal-table-column">采购成本--设备类</th>
+ <th class="table-title cal-table-column">采购成本--施工类</th>
+ <th class="table-title cal-table-column">采购成本--服务类</th>
+ <th class="table-title cal-table-column">采购成本--其他</th>
+ <th class="table-title cal-table-column">成本--其他</th>
+ <th class="table-title cal-table-column">成本--项目管理成本</th>
+ <th class="table-title cal-table-column">财务费用--资金占用成本</th>
+ <th class="table-title cal-table-column">公司管理费用</th>
</tr>
</thead>
- <tbody>
+ <tbody class="cal-table-left">
<#if (pager)?exists>
<#list pager as list>
- <tr>
- <td>${list.projectName!}</td>
- <td>${(list.incomeDevice!0)?string("0.##")}</td>
- <td>${(list.incomeEngineer!0)?string("0.##")}</td>
- <td>${(list.incomeService!0)?string("0.##")}</td>
- <td>${(list.costPurchaseDevice!0)?string("0.##")}</td>
- <td>${(list.costPurchaseBuild!0)?string("0.##")}</td>
- <td>${(list.costPurchaseService!0)?string("0.##")}</td>
- <td>${(list.costPurchaseOther!0)?string("0.##")}</td>
- <td>${(list.costOther!0)?string("0.##")}</td>
- <td>${(list.costProjectManage!0)?string("0.##")}</td>
- <td>${(list.costExpropriation!0)?string("0.##")}</td>
- <td>${(list.costCompanyManage!0)?string("0.##")}</td>
+ <tr class="cal-table-left">
+ <td class="cal-table-column">${list.projectName!}</td>
+ <td class="cal-table-column">${(list.incomeDevice!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.incomeEngineer!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.incomeService!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costPurchaseDevice!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costPurchaseBuild!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costPurchaseService!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costPurchaseOther!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costOther!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costProjectManage!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costExpropriation!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costCompanyManage!0)?string("0.##")}</td>
</tr>
</#list>
</#if>
@@ -75,44 +92,44 @@
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab2">
<div class="am-scrollable-horizontal">
- <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
- <thead>
- <tr>
- <th class="table-title">项目名称</th>
- <th class="table-title">营业收入</th>
- <th class="table-title">营业成本</th>
- <th class="table-title">项目管理成本</th>
- <th class="table-title">其他</th>
- <th class="table-title">财务费用</th>
- <th class="table-title">项目毛利</th>
- <th class="table-title">项目毛利率</th>
- <th class="table-title">公司管理费用</th>
- <th class="table-title">项目贡献利润</th>
- <th class="table-title">项目贡献利润率</th>
- <th class="table-title">所得税费用</th>
- <th class="table-title">项目净利润</th>
- <th class="table-title">项目净利润率</th>
+ <table class="am-table am-table-bordered am-table-radius table-main cal-table-table" style="padding:0;">
+ <thead class="cal-table-left">
+ <tr class="cal-table-left">
+ <th class="table-title cal-table-column">项目名称</th>
+ <th class="table-title cal-table-column">营业收入</th>
+ <th class="table-title cal-table-column">营业成本</th>
+ <th class="table-title cal-table-column">项目管理成本</th>
+ <th class="table-title cal-table-column">其他</th>
+ <th class="table-title cal-table-column">财务费用</th>
+ <th class="table-title cal-table-column">项目毛利</th>
+ <th class="table-title cal-table-column">项目毛利率</th>
+ <th class="table-title cal-table-column">公司管理费用</th>
+ <th class="table-title cal-table-column">项目贡献利润</th>
+ <th class="table-title cal-table-column">项目贡献利润率</th>
+ <th class="table-title cal-table-column">所得税费用</th>
+ <th class="table-title cal-table-column">项目净利润</th>
+ <th class="table-title cal-table-column">项目净利润率</th>
</tr>
</thead>
- <tbody>
+ <tbody class="cal-table-left">
<#if (pager)?exists>
<#list pager as list>
- <tr>
- <td>${list.projectName!}</td>
- <td>${(list.incomeTotal!0)?string("0.##")}</td>
- <td>${(list.costTotal2!0)?string("0.##")}</td>
- <td>${(list.costProjectManage!0)?string("0.##")}</td>
- <td>${(list.costOther!0)?string("0.##")}</td>
- <td>${(list.costExpropriation!0)?string("0.##")}</td>
- <td>${(list.grossProfit!0)?string("0.##")}</td>
- <td>${(list.grossProfitProfitMargin!0)?string("0.##")}</td>
- <td>${(list.costCompanyManage!0)?string("0.##")}</td>
- <td>${(list.contributionProfit!0)?string("0.##")}</td>
- <td>${(list.contributionProfitProfitMargin!0)?string("0.##")}</td>
- <td>${(list.taxCost!0)?string("0.##")}</td>
- <td>${(list.netProfit!0)?string("0.##")}</td>
- <td>${(list.netProfitProfitMargin!0)?string("0.##")}</td>
+ <tr class="cal-table-left">
+ <td class="cal-table-column">${list.projectName!}</td>
+ <td class="cal-table-column">${(list.incomeTotal!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costTotal2!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costProjectManage!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costOther!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costExpropriation!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.grossProfit!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.grossProfitProfitMargin!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.costCompanyManage!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.contributionProfit!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.contributionProfitProfitMargin!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.taxCost!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.netProfit!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.netProfitProfitMargin!0)?string("0.##")}</td>
</tr>
</#list>
</#if>
@@ -125,46 +142,46 @@
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab3">
<div class="am-scrollable-horizontal">
- <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
- <thead>
- <tr class="am-text-nowrap">
- <th class="table-title">项目名称</th>
- <th class="table-title">销售商品、提供劳务收到的现金</th>
- <th class="table-title">收到的税费返还</th>
- <th class="table-title">收到的其他与经营活动有关的现金</th>
- <th class="table-title">购买商品、接受劳务支付的现金</th>
- <th class="table-title">支付的各项税费</th>
- <th class="table-title">支付其他与经营活动有关的现金</th>
- <th class="table-title">经营活动产生的现金流量净额</th>
- <th class="table-title">投资活动现金流入</th>
- <th class="table-title">投资活动现金流出</th>
- <th class="table-title">投资活动产生的现金流量净额</th>
- <th class="table-title">借款资金流入</th>
- <th class="table-title">还款资金流出</th>
- <th class="table-title">筹资活动产生的现金流量净额</th>
- <th class="table-title">货币资金净增加额</th>
+ <table class="am-table am-table-bordered am-table-radius table-main cal-table-table" style="padding:0;">
+ <thead class="cal-table-left">
+ <tr class="cal-table-left">
+ <th class="table-title cal-table-column">项目名称</th>
+ <th class="table-title cal-table-column">销售商品、提供劳务收到的现金</th>
+ <th class="table-title cal-table-column">收到的税费返还</th>
+ <th class="table-title cal-table-column">收到的其他与经营活动有关的现金</th>
+ <th class="table-title cal-table-column">购买商品、接受劳务支付的现金</th>
+ <th class="table-title cal-table-column">支付的各项税费</th>
+ <th class="table-title cal-table-column">支付其他与经营活动有关的现金</th>
+ <th class="table-title cal-table-column">经营活动产生的现金流量净额</th>
+ <th class="table-title cal-table-column">投资活动现金流入</th>
+ <th class="table-title cal-table-column">投资活动现金流出</th>
+ <th class="table-title cal-table-column">投资活动产生的现金流量净额</th>
+ <th class="table-title cal-table-column">借款资金流入</th>
+ <th class="table-title cal-table-column">还款资金流出</th>
+ <th class="table-title cal-table-column">筹资活动产生的现金流量净额</th>
+ <th class="table-title cal-table-column">货币资金净增加额</th>
</tr>
</thead>
- <tbody>
+ <tbody class="cal-table-left">
<#if (pager)?exists>
<#list pager as list>
- <tr>
- <td>${list.projectName!}</td>
- <td>${(list.saleIncomeCash!0)?string("0.##")}</td>
- <td>${(list.taxReturn!0)?string("0.##")}</td>
- <td>${(list.earnestMoneyIncome!0)?string("0.##")}</td>
- <td>${(list.purchaseCost!0)?string("0.##")}</td>
- <td>${(list.taxCost!0)?string("0.##")}</td>
- <td>${(list.earnestMoneyCost!0)?string("0.##")}</td>
- <td>${(list.netCashFlow!0)?string("0.##")}</td>
- <td>${(list.cashInflowFromInvestingActivities!0)?string("0.##")}</td>
- <td>${(list.cashOutflowFromInvestingActivities!0)?string("0.##")}</td>
- <td>${(list.netCashFromInvestingActivities!0)?string("0.##")}</td>
- <td>${(list.financingCapitalInflow!0)?string("0.##")}</td>
- <td>${(list.financingCapitalOutflow!0)?string("0.##")}</td>
- <td>${(list.financingCapitalCashflow!0)?string("0.##")}</td>
- <td>${(list.netIncreaseMonetaryFunds!0)?string("0.##")}</td>
+ <tr class="cal-table-left">
+ <td class="cal-table-column">${list.projectName!}</td>
+ <td class="cal-table-column">${(list.saleIncomeCash!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.taxReturn!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.earnestMoneyIncome!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.purchaseCost!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.taxCost!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.earnestMoneyCost!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.netCashFlow!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.cashInflowFromInvestingActivities!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.cashOutflowFromInvestingActivities!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.netCashFromInvestingActivities!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.financingCapitalInflow!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.financingCapitalOutflow!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.financingCapitalCashflow!0)?string("0.##")}</td>
+ <td class="cal-table-column">${(list.netIncreaseMonetaryFunds!0)?string("0.##")}</td>
</tr>
</#list>
</#if>