From 8e8c3113eea4c29a6c5a23ca35c4d460e81f3465 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 24 Feb 2022 09:47:03 +0800
Subject: [PATCH] 暂停模拟考试后,继续考试修改,状态修改为考试中,题目查询按本次模拟考试题目排序,接口放行
---
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