From f303e78e4ae6aee0e55fae7c2d2e0e9cdf9b6391 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 5 Sep 2023 22:49:23 +0800
Subject: [PATCH] update code

---
 .../SmzProjectQuarterlyAssessMapper.xml       |  1 +
 .../mapper/project/SurProjectMapper.xml       | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
index f1a53944..80a82810 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="projectName"    column="projectName"    />
             <result property="paretProjectName"    column="paretProjectName"    />
             <result property="projectSchedule" column="projectSchedule"/>
+            <result property="deptName" column="dept_name"/>
         </association>
     </resultMap>
 
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
index 4f66e66b..3de8b66d 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
@@ -280,6 +280,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="groupByCategory" parameterType="SurProject" resultMap="SurProjectResult">
+        <if test="id==2">
+            SELECT b.dict_value id,b.dict_label projectName,cnt  deptId FROM (
+            SELECT b.dict_value,  b.dict_label,sum(c.money)
+            cnt FROM sur_project a, sys_dict_data b,sur_project_cost_output c WHERE b.dict_type='project_category'  AND a.id=c.project_id AND c.cost_type=2 and c.year=#{isDel}
+            AND a.projectType=b.dict_value and a.isDel=0
+            <if test="deptId>0">AND deptid=#{deptId}</if>
+            GROUP BY dict_value,dict_label
+            ) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_category'  ORDER BY cnt DESC
+        </if>
+        <if test="id!=2">
         SELECT b.dict_value id,b.dict_label projectName,cnt  deptId FROM (
         SELECT b.dict_value,  b.dict_label,
         <if test="id==0">COUNT(1)*10000</if>
@@ -290,19 +300,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId>0">AND deptid=#{deptId}</if>
         GROUP BY dict_value,dict_label
         ) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_category'  ORDER BY cnt DESC
+        </if>
     </select>
     <select id="groupByLevel" parameterType="SurProject" resultMap="SurProjectResult">
+        <if test="id==2">
+            SELECT b.dict_value id,b.dict_label projectName,cnt  deptId FROM (
+            SELECT b.dict_value,  b.dict_label,sum(c.money) cnt
+            FROM sur_project a,sys_dict_data b ,sur_project_cost_output c WHERE b.dict_type='project_level'  AND a.id=c.project_id AND c.cost_type=2 and c.year=#{isDel}
+            AND a.projiectLevel=b.dict_value and a.isDel=0
+            <if test="deptId>0">AND deptid=#{deptId}</if>
+            GROUP BY dict_value,dict_label
+            ) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_level'  ORDER BY cnt DESC
+        </if>
+        <if test="id!=2">
         SELECT b.dict_value id,b.dict_label projectName,cnt  deptId FROM (
         SELECT b.dict_value,  b.dict_label,
                <if test="id==0">COUNT(1)*10000</if>
                 <if test="id==1">SUM(c.totalInvestment)</if>
-                <if test="id==2">COUNT(1)*10000</if>
 
         cnt FROM sur_project a, sys_dict_data b ,vw_sur_project_cost_output c WHERE b.dict_type='project_level'  AND a.id=c.project_id
         AND a.projiectLevel=b.dict_value and a.isDel=0
         <if test="deptId>0">AND deptid=#{deptId}</if>
         GROUP BY dict_value,dict_label
         ) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_level'  ORDER BY cnt DESC
+
+        </if>
     </select>
 
     <select id="selectProgressProjects"  parameterType="Long" resultMap="SurProjectResult">