From 19cfdf59d7e3a5f2ab1bc8acf5d0eaf81d9a2b29 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 3 Dec 2021 16:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../work/controller/backend/ProjectController.java | 11 ++++++-----
.../resources/templates/admin/project_approve.ftl | 10 +++++-----
.../resources/templates/admin/project_final_add.ftl | 2 +-
.../resources/templates/admin/project_final_edit.ftl | 2 +-
4 files changed, 13 insertions(+), 12 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 317b06e..75cfd0d 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -380,11 +380,12 @@ public class ProjectController extends BaseController {
ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords,model);
String time;
if (!searchInfo.containsKey("time")) {
- Calendar instance = Calendar.getInstance();
- instance.setTime(new Date());
- instance.set(Calendar.MONTH, instance.get(Calendar.MONTH));
- Date current = project.getStartDate();
- time = DateKit.toStr(current, DateKit.DATE_FORMAT_YEAR_MONTH2);
+ ProjectSettleIncome projectSettleIncome = projectSettleIncomeRepository.findNewByProjectId(id);
+ if(null != projectSettleIncome){
+ time = projectSettleIncome.getTime();
+ }else {
+ time = "";
+ }
model.put("time", time);
model.put("check", 1);
} else {
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index d04f488..7840934 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -850,8 +850,8 @@
</tr>
<tr>
<td>项目毛利</td>
- <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.grossProfitTaxExclude,'0')}" required readonly title="项目毛利概算总额"></td>
- <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.grossProfitTaxExclude,'0')}" required readonly title="项目毛利预算总额"></td>
+ <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利概算总额"></td>
+ <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利预算总额"></td>
<td><input name="grossProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
<td><input type="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
@@ -859,8 +859,8 @@
</tr>
<tr>
<td>项目贡献利润</td>
- <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.contributionProfitTaxExclude,'0')}" required readonly title="项目贡献利润概算总额"></td>
- <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.contributionProfitTaxExclude,'0')}" required readonly title="项目贡献利润预算总额"></td>
+ <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润概算总额"></td>
+ <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润预算总额"></td>
<td><input name="contributionProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" required readonly title="项目贡献利润本月结算金额"></td>
<td><input type="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
@@ -869,7 +869,7 @@
<tr>
<td>项目净利润</td>
<td>/</td>
- <td><input name="netProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.netProfitTaxExclude,'0')}" required readonly title="项目净利润预算总额"></td>
+ <td>/<#--<input name="netProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额">--></td>
<td><input name="netProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" required readonly title="项目净利润本月结算金额"></td>
<td><input type="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index 084597d..253a4d9 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -149,7 +149,7 @@
<td>合计</td>
<td></td>
<td></td>
- <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
+ <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
<td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
<td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
<td><input name="costFinalTotal" type="number" readonly required title="此列累计"></td>
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index 4602ee1..e325074 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -149,7 +149,7 @@
<td>合计</td>
<td></td>
<td></td>
- <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
+ <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude()(),'0')}" type="number" readonly required title="此列累计"></td>
<td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
<td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
<td><input name="costFinalTotal" type="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>