From 146474552c615d14b18ffd40a04962036377c7a4 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 17 Nov 2021 21:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/model/ProjectSettleCostManageRepository.java    | 2 ++
 .../palmte/work/model/ProjectSettleCostRepository.java   | 2 ++
 .../palmte/work/model/ProjectSettleIncomeRepository.java | 2 +-
 src/main/resources/templates/admin/project_list.ftl      | 9 +++++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java b/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java
index d6d71a1..b4bcacf 100644
--- a/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java
+++ b/src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java
@@ -18,4 +18,6 @@ public interface ProjectSettleCostManageRepository extends JpaRepository<Project
 
     @Query(value = "select sum(cost_tax_exclude) from project_settle_cost_manage where project_id = ? and type = ?", nativeQuery = true)
     long costTaxExcludeSum(int projectId,int type);
+
+    List<ProjectSettleCostManage> findAllByProjectId(int id);
 }
diff --git a/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java b/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java
index f73df6f..9021158 100644
--- a/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java
+++ b/src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java
@@ -18,4 +18,6 @@ public interface ProjectSettleCostRepository extends JpaRepository<ProjectSettle
 
     @Query(value = "select sum(cost_tax_exclude) from project_settle_cost where project_id = ? and type = ?", nativeQuery = true)
     long costTaxExcludeSum(int projectId,int type);
+
+    List<ProjectSettleCost> findAllByProjectId(int id);
 }
diff --git a/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java b/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java
index 1458909..06578db 100644
--- a/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java
+++ b/src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java
@@ -19,5 +19,5 @@ public interface ProjectSettleIncomeRepository extends JpaRepository<ProjectSett
     @Query(value = "select sum(income_tax_exclude) from project_settle_income where project_id = ? and type = ?", nativeQuery = true)
     long incomeTaxExcludeSum(int projectId,int type);
 
-
+    List<ProjectSettleIncome> findAllByProjectId(int id);
 }
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 70b8f9b..4f63189 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -230,6 +230,15 @@
                                                 </button>
                                             </#if>
 
+                                            <#-- 除了审核通过都能编辑结算表-->
+                                            <#if list.approveStatusBudget=2 && list.approveStatusSettle !=1 && list.approveStatusFinal !=2>
+                                                <button type="button"
+                                                        class="am-btn am-btn-default am-btn-xs am-text-secondary"
+                                                        onclick="location.href='${base}/project/settle/edit?id=${list.id}'"><span
+                                                            class="am-icon-pencil-square-o"></span>编辑结算表
+                                                </button>
+                                            </#if>
+
                                             <#-- 项目为结算状态 并且结算审批通过  或者 结算审批不通过 才能发起决算-->
                                             <#if (list.status== 10 && list.approveStatusSettle== 2) ||  (list.status== 15 && list.approveStatusFinal== 0) || (list.status== 15 && list.approveStatusFinal== 3)>
                                                 <button type="button"