From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 41e967e..55d8137
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
@@ -88,14 +88,10 @@
statusCd,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id
communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId,
td1.name stateName,t.patrol_type,t.description,t.patrol_type patrolType,td2.name patrolTypeName
- from inspection_task_detail t,t_dict td1,t_dict td2
+ from inspection_task_detail t
+ left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'inspection_task_detail' and td1.table_columns = 'state'
+ left join t_dict td2 on t.patrol_type = td2.status_cd and td2.table_name = 'inspection_task_detail' and td2.table_columns = 'patrol_type'
where 1 =1
- and t.state = td1.status_cd
- and td1.table_name = 'inspection_task_detail'
- and td1.table_columns = 'state'
- and t.patrol_type = td2.status_cd
- and td2.table_name = 'inspection_task_detail'
- and td2.table_columns = 'patrol_type'
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
@@ -171,14 +167,10 @@
<!-- 鏌ヨ宸℃浠诲姟鏄庣粏鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryInspectionTaskDetailsCount" parameterType="Map" resultType="Map">
select count(1) count
- from inspection_task_detail t,t_dict td1,t_dict td2
+ from inspection_task_detail t
+ left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'inspection_task_detail' and td1.table_columns = 'state'
+ left join t_dict td2 on t.patrol_type = td2.status_cd and td2.table_name = 'inspection_task_detail' and td2.table_columns = 'patrol_type'
where 1 =1
- and t.state = td1.status_cd
- and td1.table_name = 'inspection_task_detail'
- and td1.table_columns = 'state'
- and t.patrol_type = td2.status_cd
- and td2.table_name = 'inspection_task_detail'
- and td2.table_columns = 'patrol_type'
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
--
Gitblit v1.8.0