From e3c0736a4bd1f93dbdf3a70c15eda98aff0ebebf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 16 Oct 2024 19:48:47 +0800
Subject: [PATCH] 项目管理查询增加已支付资金

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml |   13 ++++++++++++-
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbProjectVO.java        |    2 ++
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
index 1e345fe..539890a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
@@ -48,10 +48,21 @@
     <select id="getList" resultType="cn.gistack.sm.sjztmd.vo.TbProjectVO">
 
         SELECT
-            *
+            tb.*,b."actual_fund"
         FROM SJZT_MD."tb_project" tb
+        left join (
+            SELECT "tb_project_id",sum("actual_fund") as "actual_fund" from SJZT_MD."tb_project_schedule"
+            <if test="vo.tbYear != null and vo.tbYear != ''">
+                where "year" = #{vo.tbYear}
+            </if>
+            group by "tb_project_id"
+        ) b
+        on (tb."guid" = b."tb_project_id")
         where
             tb."is_deleted" = 0
+        <if test="vo.tbYear != null and vo.tbYear != ''">
+            and tb."tb_year" = #{vo.tbYear}
+        </if>
         <if test="vo.cityCode != null and vo.cityCode != ''">
             and tb."city_code" = #{vo.cityCode}
         </if>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbProjectVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbProjectVO.java
index dbcb4c4..3ab5d08 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbProjectVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbProjectVO.java
@@ -13,4 +13,6 @@
 	private String startTime;
 	private String endTime;
 
+	private String actualFund;
+
 }

--
Gitblit v1.9.3