From c0a78b608d90f13fc34018c8d88ddf5c44acdbd7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 10:17:09 +0800
Subject: [PATCH] 1.数据源修改 2.单位添加字段
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 67cd837..8bdbc51 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -23,6 +23,9 @@
<result column="departmentid" property="departmentid"/>
<result column="stats" property="stats"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="representativecell" property="representativecell"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contactscell" property="contactscell"/>
</resultMap>
@@ -149,9 +152,9 @@
SELECT IFNULL(A.lastmonth, 0) AS lastmonth,
IFNULL(B.thismouth, 0) AS thismouth,
IFNULL(A.amount, 0) AS lastamount,
- IFNULL(b.amount, 0) AS thisamount
+ IFNULL(B.amount, 0) AS thisamount
FROM (
- SELECT COUNT
+ SELECT COUNTb.
(*) AS lastmonth,
amount,
deptid
@@ -460,7 +463,7 @@
) B ON A.deptid = B.deptid
) C
LEFT JOIN blade_dept d ON C.deptid = d.id
- LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction where 1=1
+ LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and C.jurisdiction =#{jurisdiction}
</if>
@@ -503,7 +506,7 @@
) B ON A.dept_id = B.dept_id
) C
LEFT JOIN blade_dept d ON C.dept_id = d.id
- LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction WHERE 1=1
+ LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction WHERE 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and C.jurisdiction =#{jurisdiction}
</if>
@@ -540,7 +543,7 @@
GROUP BY dept_id, jurisdiction
) B ON A.dept_id = B.dept_id) C
LEFT JOIN blade_dept d ON C.dept_id = d.id
- LEFT JOIN sys_jurisdiction j ON j.id = c.jurisdiction where 1=1
+ LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and C.jurisdiction =#{jurisdiction}
</if>
--
Gitblit v1.9.3