From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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..f00bacf 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
@@ -2,26 +2,43 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.equipage.mapper.EquipageMapper">
- <!--车辆分页信息-->
+ <!--装备分页信息-->
<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
+ 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="equipage.jurisdiction!=null and equipage.jurisdiction!='' and equipage.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{equipage.jurisdiction} or sj.parent_id = #{equipage.jurisdiction})
+ </if>
<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},'%')
</if>
<if test="equipage.name!=null and equipage.name!=''">
and se.name like concat('%', #{equipage.name},'%')
+ </if>
+ <if test="equipage.brand!=null and equipage.brand!=''">
+ and se.brand like concat('%', #{equipage.brand},'%')
</if>
<if test="equipage.personInCharge!=null and equipage.personInCharge!=''">
and se.person_in_charge like concat('%', #{equipage.personInCharge},'%')
@@ -31,13 +48,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