From d3397094c217c642d68313ca6b9996e6a133b362 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 31 Dec 2021 11:41:47 +0800
Subject: [PATCH] 1. 保安员导入去除是否持证 2. 考试成绩统计查询新增查询接口 3. 新增保安员证导入接口 4. 上岗证导出修改为导出即修改制证状态

---
 src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
index feba11b..95078b5 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -12,8 +12,19 @@
             blade_dept bt
         ON
             sc.dept_id = bt.id
+        left join
+            sys_information si
+        on
+            si.departmentid = bt.id
+        left join
+            sys_jurisdiction sj
+        on
+            sj.id = si.jurisdiction
         WHERE
             1=1
+        <if test="car.jurisdiction!=null and car.jurisdiction!='' and car.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{car.jurisdiction} or sj.parent_id = #{car.jurisdiction})
+        </if>
         <if test="car.tenantName!=null and  car.tenantName!=''">
             and bt.dept_name like concat('%', #{car.tenantName},'%')
         </if>
@@ -56,4 +67,8 @@
             and sc.id = #{car.id}
         </if>
     </select>
+
+    <select id="selectCar" resultType="java.util.HashMap">
+        SELECT equipment_code as code,car_number as carnumber FROM `sys_car` WHERE equipment_code IS NOT NULL
+    </select>
 </mapper>

--
Gitblit v1.9.3