From cddd83f139af1786517759277ced8479cbe80d3b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 12:57:09 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml
index 1538315..aa20bae 100644
--- a/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml
@@ -174,9 +174,15 @@
t.b_id bId,
t.staff_id staffId,
t.staff_name staffName,
- t.create_time createTime
+ t.create_time createTime,
+ d.name stateName,
+ c.name inspectionPlanPeriodName,
+ i.name signTypeName
from
inspection_plan t
+ inner join t_dict d on t.state = d.status_cd and d.table_name = 'inspection_plan' and d.table_columns = 'state'
+ inner join t_dict c on t.inspection_plan_period = c.status_cd and c.table_name = 'inspection_plan' and c.table_columns = 'inspection_plan_period'
+ inner join t_dict i on t.sign_type = i.status_cd and i.table_name = 'inspection_plan' and i.table_columns = 'sign_type'
where 1 =1
<if test="inspectionPlanName !=null and inspectionPlanName != ''">
and t.inspection_plan_name= #{inspectionPlanName}
@@ -309,9 +315,6 @@
<if test="startTime !=null and startTime != ''">
and t.start_time= #{startTime}
</if>
- <if test="createUser !=null and createUser != ''">
- and t.create_user= #{createUser}
- </if>
<if test="inspectionPlanId !=null and inspectionPlanId != ''">
and t.inspection_plan_id= #{inspectionPlanId}
</if>
@@ -327,6 +330,9 @@
<if test="staffId !=null and staffId != ''">
and t.staff_id= #{staffId}
</if>
+ <if test="keyWord !=null and keyWord != ''">
+ and (t.inspection_plan_name like concat('%',#{keyWord},'%') or t.staff_name like concat('%',#{keyWord},'%'))
+ </if>
</select>
--
Gitblit v1.8.0