From 0cabea1fb1196c666b6e676e0f3446815c4ae82f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Dec 2021 11:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 d5bf2de..37e69e1 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -3207,4 +3207,30 @@
ischild != 0
)
</select>
+
+ <select id="selectBxc" resultType="java.util.HashMap">
+ SELECT u.real_name as realName,
+ d.dept_name as deptName,
+ u.sex,
+ u.cardid,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(u.cardid, 7, 4), 0) AS age,
+ u.securitynumber,
+ u.phone,
+ p.score
+ FROM sys_performance p
+ LEFT JOIN blade_user u ON p.securityId = u.id
+ LEFT JOIN blade_dept d ON d.id = p.departmentid
+ LEFT JOIN sys_jurisdiction j ON j.id = p.jurisdiction
+ WHERE 1 =1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
+ </if>
+ <if test="type!=null and type=='1'.toString()">
+ and to_days(p.time) = to_days(now())
+ </if>
+ <if test="type!=null and type=='2'.toString()">
+ and DATE_FORMAT(p.time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+ </if>
+ and p.score = 3
+ </select>
</mapper>
--
Gitblit v1.9.3