From f1092d53966cf3b3b93be7fc59d913cd13d2ec37 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 16:17:47 +0800
Subject: [PATCH] 1.用户新增角色关联持证字段 2.新增接口，考试开始，修改考试的状态为考试中 3.考试查询接口修改
---
src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
index e8a5229..26b7381 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
@@ -5,17 +5,20 @@
<!--车辆分页信息-->
<select id="selectEquipagePage" resultType="org.springblade.modules.equipage.vo.EquipageVo">
SELECT
- se.*,bt.tenant_name AS tenantName
+ se.*,bt.dept_name AS tenantName
FROM
sys_equipage se
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- se.tenant_id = bt.tenant_id
+ se.dept_id = bt.id
WHERE
1=1
<if test="equipage.tenantName!=null and equipage.tenantName!=''">
- and bt.tenant_name like concat('%', #{equipage.tenantName},'%')
+ and bt.dept_name like concat('%', #{equipage.tenantName},'%')
+ </if>
+ <if test="equipage.deptId!=null and equipage.deptId!=''">
+ and se.dept_id = #{equipage.deptId}
</if>
<if test="equipage.number!=null and equipage.number!=''">
and se.number like concat('%', #{equipage.number},'%')
@@ -31,13 +34,13 @@
<!--车辆详情信息-->
<select id="selectEquipageInfo" resultType="org.springblade.modules.equipage.vo.EquipageVo">
SELECT
- se.*,bt.tenant_name AS tenantName
+ se.*,bt.dept_name AS tenantName
FROM
sys_equipage se
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- se.tenant_id = bt.tenant_id
+ se.dept_id = bt.id
WHERE
1=1
<if test="equipage.id!=null">
--
Gitblit v1.9.3