From e0c3986f6d65135608e0eb7c07c42e34fb3c89f9 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Thu, 2 Dec 2021 11:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProjectController.java |  2 +-
 .../templates/admin/project_approve.ftl       | 28 +++++++++----------
 .../templates/admin/project_budget_edit.ftl   |  2 +-
 3 files changed, 16 insertions(+), 16 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 9dad8e4..8d041ee 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -386,7 +386,7 @@ public class ProjectController extends BaseController {
             Calendar instance = Calendar.getInstance();
             instance.setTime(new Date());
             instance.set(Calendar.MONTH, instance.get(Calendar.MONTH));
-            Date current = instance.getTime();
+            Date current = project.getStartDate();
             time = DateKit.toStr(current, DateKit.DATE_FORMAT_YEAR_MONTH2);
             model.put("time", time);
         } else {
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 4adb2d6..a3bffa8 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -568,59 +568,59 @@
                                     <td>金额（元）</td>
                                 </tr>
                                 <tr>
-                                    <td>销售商品、提供劳务收到的现金a</td>
+                                    <td>销售商品、提供劳务收到的现金</td>
                                     <td><input type="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
                                 </tr>
                                 <tr>
-                                    <td>收到的税费返还b</td>
+                                    <td>收到的税费返还</td>
                                     <td>/<input type="hidden" name="taxReturn" value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly required></td>
                                 </tr>
                                 <tr>
-                                    <td>收到其他与经营活动有关的现金c</td>
+                                    <td>收到其他与经营活动有关的现金</td>
                                     <td><input type="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
                                 </tr>
                                 <tr>
-                                    <td>购买商品、接受劳务支付的现d</td>
+                                    <td>购买商品、接受劳务支付的现金</td>
                                     <td><input type="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
                                 </tr>
                                 <tr>
-                                    <td>支付的各项税费e</td>
+                                    <td>支付的各项税费</td>
                                     <td>/<input type="hidden" name="taxCost" value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly required></td>
                                 </tr>
                                 <tr>
-                                    <td>支付其他与经营活动有关的现金f</td>
+                                    <td>支付其他与经营活动有关的现金</td>
                                     <td><input type="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
                                 </tr>
                                 <tr>
-                                    <td>经营活动产生的现金流量净额g</td>
+                                    <td>经营活动产生的现金流量净额</td>
                                     <td><input type="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
                                 </tr>
                                 <tr>
-                                    <td>投资活动现金流入h</td>
+                                    <td>投资活动现金流入</td>
                                     <td>/<input type="hidden" name="cashInflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}" readonly required></td>
                                 </tr>
                                 <tr>
-                                    <td>投资活动现金流出i</td>
+                                    <td>投资活动现金流出</td>
                                     <td>/<input type="hidden" name="cashOutflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}" readonly required></td>
                                 </tr>
                                 <tr>
-                                    <td>投资活动产生的现金流量净额j</td>
+                                    <td>投资活动产生的现金流量净额</td>
                                     <td>/<input type="hidden" name="netCashFromInvestingActivities" value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}" readonly required></td>
                                 </tr>
                                 <tr>
-                                    <td>融资资金流入k</td>
+                                    <td>融资资金流入</td>
                                     <td><input type="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
                                 </tr>
                                 <tr>
-                                    <td>还款资金流出l</td>
+                                    <td>还款资金流出</td>
                                     <td><input type="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
                                 </tr>
                                 <tr>
-                                    <td>筹资活动产生的现金流量净额m</td>
+                                    <td>筹资活动产生的现金流量净额</td>
                                     <td><input type="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
                                 </tr>
                                 <tr>
-                                    <td>货币资金净增加额n</td>
+                                    <td>货币资金净增加额</td>
                                     <td><input type="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
                                 </tr>
                                 </tbody>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 6850923..573f28e 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -366,7 +366,7 @@
                         <td><input type="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
                     </tr>
                     <tr>
-                        <td>购买商品、接受劳务支付的现<#--d--></td>
+                        <td>购买商品、接受劳务支付的现金<#--d--></td>
                         <td><input type="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
                     </tr>
                     <tr>