处理冲突

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);
 }

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);
 }

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);
 }

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"