From c17c4687562d61a5663510ae7fbd0ce7ce73873f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 16 五月 2021 12:18:58 +0800
Subject: [PATCH] 优化代码
---
java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml | 75 ++++++++++++++-----------------------
1 files changed, 28 insertions(+), 47 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 1538315..623f49c
--- a/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml
@@ -14,19 +14,17 @@
remark,
end_time,
operate,
- staff_name,
sign_type,
start_time,
inspection_plan_id,
state,
community_id,
b_id,
- staff_id,
create_user_id,
create_user_name)
values (#{inspectionPlanName},#{inspectionRouteId},#{inspectionPlanPeriod},#{remark},
- #{endTime},#{operate},#{staffName},#{signType},#{startTime},
- #{inspectionPlanId},#{state},#{communityId},#{bId},#{staffId},#{createUserId},
+ #{endTime},#{operate},#{signType},#{startTime},
+ #{inspectionPlanId},#{state},#{communityId},#{bId},#{createUserId},
#{createUserName})
</insert>
@@ -38,10 +36,10 @@
t.inspection_route_id inspectionRouteId,
t.inspection_plan_period inspectionPlanPeriod,
t.remark,t.end_time endTime,
- t.operate,t.staff_name staffName,t.sign_type signType,
+ t.operate,t.sign_type signType,
t.start_time startTime,t.create_user_id createUserId,
t.inspection_plan_id inspectionPlanId,t.state,
- t.community_id communityId,t.b_id bId,t.staff_id staffId
+ t.community_id communityId,t.b_id bId
from business_inspection_plan t
where 1 =1
<if test="inspectionPlanName !=null and inspectionPlanName != ''">
@@ -62,9 +60,7 @@
<if test="operate !=null and operate != ''">
and t.operate= #{operate}
</if>
- <if test="staffName !=null and staffName != ''">
- and t.staff_name= #{staffName}
- </if>
+
<if test="signType !=null and signType != ''">
and t.sign_type= #{signType}
</if>
@@ -86,9 +82,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="staffId !=null and staffId != ''">
- and t.staff_id= #{staffId}
- </if>
+
</select>
@@ -100,12 +94,12 @@
inspection_plan_name,inspection_route_id,
inspection_plan_period,remark,status_cd,end_time,
sign_type,start_time,create_user_id,create_user_name,
- inspection_plan_id,state,community_id,b_id,staff_id,staff_name
+ inspection_plan_id,state,community_id,b_id
) select
t.inspection_plan_name,t.inspection_route_id,t.inspection_plan_period,t.remark,'0',
t.end_time,t.sign_type,t.start_time,t.create_user_id,t.create_user_name,
t.inspection_plan_id,t.state,
- t.community_id,t.b_id,t.staff_id,t.staff_name
+ t.community_id,t.b_id
from business_inspection_plan t where 1=1
<if test="inspectionPlanName !=null and inspectionPlanName != ''">
and t.inspection_plan_name= #{inspectionPlanName}
@@ -123,9 +117,6 @@
and t.end_time= #{endTime}
</if>
and t.operate= 'ADD'
- <if test="staffName !=null and staffName != ''">
- and t.staff_name= #{staffName}
- </if>
<if test="signType !=null and signType != ''">
and t.sign_type= #{signType}
</if>
@@ -147,9 +138,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="staffId !=null and staffId != ''">
- and t.staff_id= #{staffId}
- </if>
+
</insert>
@@ -163,7 +152,6 @@
t.remark,
t.status_cd statusCd,
t.end_time endTime,
- t.staff_name staffName,
t.sign_type signType,
t.start_time startTime,
t.create_user_id createUserId,
@@ -172,11 +160,15 @@
t.state,
t.community_id communityId,
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}
@@ -190,17 +182,20 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
- <if test="staffName !=null and staffName != ''">
- and t.staff_name= #{staffName}
- </if>
+
<if test="signType !=null and signType != ''">
and t.sign_type= #{signType}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
+ </if>
+
+ <if test="curTime !=null ">
+ and t.start_time < #{curTime}
+ and t.end_time > #{curTime}
</if>
<if test="createUserId !=null and createUserId != ''">
and t.create_user_id= #{createUserId}
@@ -216,9 +211,6 @@
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
- </if>
- <if test="staffId !=null and staffId != ''">
- and t.staff_id= #{staffId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -249,9 +241,7 @@
<if test="endTime !=null">
, t.end_time= #{endTime}
</if>
- <if test="staffName !=null and staffName != ''">
- , t.staff_name= #{staffName}
- </if>
+
<if test="signType !=null and signType != ''">
, t.sign_type= #{signType}
</if>
@@ -264,9 +254,7 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
- <if test="staffId !=null and staffId != ''">
- , t.staff_id= #{staffId}
- </if>
+
where 1=1
<if test="inspectionPlanId !=null and inspectionPlanId != ''">
and t.inspection_plan_id= #{inspectionPlanId}
@@ -300,17 +288,12 @@
<if test="endTime !=null and endTime != ''">
and t.end_time= #{endTime}
</if>
- <if test="staffName !=null and staffName != ''">
- and t.staff_name= #{staffName}
- </if>
+
<if test="signType !=null and signType != ''">
and t.sign_type= #{signType}
</if>
<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}
@@ -324,9 +307,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="staffId !=null and staffId != ''">
- and t.staff_id= #{staffId}
- </if>
+
</select>
--
Gitblit v1.8.0