From 5e1c11b9a46b04f5a755438c2767ab55431403b6 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Mon, 4 Sep 2023 01:00:54 +0800
Subject: [PATCH] update code

---
 .../ProjectCostOutputController.java          | 12 +++++++
 .../mapper/SurProjectCostOutputMapper.java    |  2 ++
 .../service/ISurProjectCostOutputService.java |  2 ++
 .../impl/SurProjectCostOutputServiceImpl.java |  5 +++
 .../project/SurProjectBuildNodeDataMapper.xml |  1 -
 .../project/SurProjectCostOutputMapper.xml    | 34 +++++++++++++++++++
 6 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java
index 92471a61..54390128 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java
@@ -34,4 +34,16 @@ public class ProjectCostOutputController {
         redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
+
+    @PostMapping("/sumByDeptId")
+    public AjaxResult sumByDeptId(@RequestBody SurProjectCostOutput where){
+        String key="bgscreen_costOut_sumByDeptId_"+where.getYear()+"-"+where.getMonth()+"-"+where.getId()+"-"+where.getProjectId();
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return AjaxResult.success(obj);
+        }
+        List<SurProjectCostOutput> list=surProjectCostOutputService.sumByDeptId(where);
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return AjaxResult.success(list);
+    }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java
index ff90817e..affeec3f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java
@@ -61,4 +61,6 @@ public interface SurProjectCostOutputMapper
     public int deleteSurProjectCostOutputByIds(Long[] ids);
 
     public List<SurProjectCostOutput> selectYearAndMonth(SurProjectCostOutput where);
+
+    List<SurProjectCostOutput> sumByDeptId(SurProjectCostOutput where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java
index 626183f6..1aeb45d8 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java
@@ -71,4 +71,6 @@ public interface ISurProjectCostOutputService
     public void addMonthInvestment(SurProjectCostOutput where);
 
     public List<SurProjectCostOutput> selectYearAndMonth(SurProjectCostOutput where);
+
+    public List<SurProjectCostOutput> sumByDeptId(SurProjectCostOutput where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java
index 0ef8b360..feb0dd7c 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java
@@ -161,5 +161,10 @@ public class SurProjectCostOutputServiceImpl implements ISurProjectCostOutputSer
     public List<SurProjectCostOutput> selectYearAndMonth(SurProjectCostOutput where) {
         return surProjectCostOutputMapper.selectYearAndMonth(where);
     }
+
+    @Override
+    public List<SurProjectCostOutput> sumByDeptId(SurProjectCostOutput where) {
+        return surProjectCostOutputMapper.sumByDeptId(where);
+    }
 }
 
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
index 358857d7..6db1b9eb 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
@@ -198,5 +198,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE is_del=0 AND project_id IN (
         SELECT id FROM sur_project WHERE isdel=0 AND projecttype=#{type})
     </select>
-
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml
index 7c71145d..eb3d8f04 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml
@@ -109,4 +109,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR (cost_type = 9 AND YEAR &lt; #{year})
             )
     </select>
+
+    <select id="sumByDeptId"  parameterType="SurProjectCostOutput" resultMap="SurProjectCostOutputResult">
+        SELECT 10 cost_type , SUM(money) money FROM sur_project_cost_output
+        WHERE ( (cost_type=9 AND YEAR=#{year} AND MONTH &lt;= #{month}) OR (cost_type=9 AND YEAR &lt;#{year}))
+        <if test="id!=null and id>0">
+            and  project_id IN  (SELECT id FROM sur_project WHERE deptid=#{id})
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and project_id=#{projectId}
+        </if>
+
+        UNION
+
+        SELECT 2 cost_type , SUM(money) money FROM sur_project_cost_output
+        WHERE  (cost_type=2 AND YEAR=#{year} )
+        <if test="id!=null and id>0">
+            and  project_id IN  (SELECT id FROM sur_project WHERE deptid=#{id})
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and project_id=#{projectId}
+        </if>
+        UNION
+
+        SELECT 9 cost_type , SUM(money) money FROM sur_project_cost_output
+        WHERE  (cost_type=9 AND YEAR=#{year} AND MONTH= #{month} )
+        <if test="id!=null and id>0">
+           and  project_id IN  (SELECT id FROM sur_project WHERE deptid=#{id})
+        </if>
+        <if test="projectId!=null and projectId>0">
+         and project_id=#{projectId}
+        </if>
+
+
+    </select>
 </mapper>
\ No newline at end of file