From f42983b35c738a28ed4b9d1732d1045c5f2a19bb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 09 五月 2021 16:57:12 +0800
Subject: [PATCH] 优化代码
---
java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 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 bb69a3e..55d8137
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨宸℃浠诲姟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessInspectionTaskDetailInfo" parameterType="Map">
insert into business_inspection_task_detail(
- inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id
+ inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description
) values (
- #{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId}
+ #{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId},#{patrolType},#{description}
)
</insert>
@@ -18,7 +18,7 @@
<select id="getBusinessInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
select t.inspection_id,t.inspection_id inspectionId,t.operate,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
+ taskId,t.task_detail_id,t.task_detail_id taskDetailId,t.patrol_type,t.description,t.patrol_type patrolType
from business_inspection_task_detail t
where 1 =1
<if test="inspectionId !=null and inspectionId != ''">
@@ -52,8 +52,9 @@
<!-- 淇濆瓨宸℃浠诲姟鏄庣粏淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveInspectionTaskDetailInfoInstance" parameterType="Map">
insert into inspection_task_detail(
- inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id
- ) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id from
+ inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description
+ ) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id,t.patrol_type,t.description
+ from
business_inspection_task_detail t where 1=1
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
@@ -86,12 +87,11 @@
select t.inspection_id,t.inspection_id inspectionId,t.status_cd,t.status_cd
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
- from inspection_task_detail t,t_dict td1
+ td1.name stateName,t.patrol_type,t.description,t.patrol_type patrolType,td2.name patrolTypeName
+ 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'
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
@@ -115,6 +115,9 @@
</if>
<if test="taskDetailId !=null and taskDetailId != ''">
and t.task_detail_id= #{taskDetailId}
+ </if>
+ <if test="patrolType !=null and patrolType != ''">
+ and t.patrol_type= #{patrolType}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -145,6 +148,12 @@
<if test="taskId !=null and taskId != ''">
, t.task_id= #{taskId}
</if>
+ <if test="description !=null and description != ''">
+ , t.description= #{description}
+ </if>
+ <if test="patrolType !=null and patrolType != ''">
+ , t.patrol_type= #{patrolType}
+ </if>
where 1=1
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -158,11 +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
+ 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'
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
@@ -187,6 +195,9 @@
<if test="taskDetailId !=null and taskDetailId != ''">
and t.task_detail_id= #{taskDetailId}
</if>
+ <if test="patrolType !=null and patrolType != ''">
+ and t.patrol_type= #{patrolType}
+ </if>
</select>
--
Gitblit v1.8.0