From 3a583be2297a3cc98edae23577ce985a332dfc36 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 三月 2021 13:25:03 +0800
Subject: [PATCH] 加入 停车场属性
---
java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
index b0ce23b..980af99 100644
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
@@ -26,10 +26,10 @@
<if test="planUserId !=null and planUserId != ''">
and t.plan_user_id= #{planUserId}
</if>
- <if test="actInsTime !=null and actInsTime != ''">
+ <if test="actInsTime !=null ">
and t.act_ins_time= #{actInsTime}
</if>
- <if test="planInsTime !=null and planInsTime != ''">
+ <if test="planInsTime !=null ">
and t.plan_ins_time= #{planInsTime}
</if>
<if test="actUserName !=null and actUserName != ''">
@@ -76,10 +76,10 @@
<if test="planUserId !=null and planUserId != ''">
and t.plan_user_id= #{planUserId}
</if>
- <if test="actInsTime !=null and actInsTime != ''">
+ <if test="actInsTime !=null">
and t.act_ins_time= #{actInsTime}
</if>
- <if test="planInsTime !=null and planInsTime != ''">
+ <if test="planInsTime !=null ">
and t.plan_ins_time= #{planInsTime}
</if>
<if test="actUserName !=null and actUserName != ''">
@@ -121,8 +121,8 @@
statusCd,t.act_user_name,t.act_user_name actUserName,t.sign_type,t.sign_type
signType,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name
planUserName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id
- actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName
- from inspection_task t,t_dict td1,t_dict td2
+ actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name inspectionPlanName
+ from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
where 1 =1
and t.sign_type = td1.status_cd
and td1.table_name = 'inspection_task'
@@ -130,14 +130,19 @@
and t.state = td2.status_cd
and td2.table_name = 'inspection_task'
and td2.table_columns = 'state'
+ and ip.inspection_plan_id = t.inspection_plan_id
+ and ip.status_cd = '0'
<if test="planUserId !=null and planUserId != ''">
and t.plan_user_id= #{planUserId}
</if>
- <if test="actInsTime !=null and actInsTime != ''">
+ <if test="actInsTime !=null ">
and t.act_ins_time= #{actInsTime}
</if>
- <if test="planInsTime !=null and planInsTime != ''">
+ <if test="planInsTime !=null ">
and t.plan_ins_time= #{planInsTime}
+ </if>
+ <if test="todayPlanInsTime !=null ">
+ and t.plan_ins_time > #{todayPlanInsTime}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -169,6 +174,16 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="states !=null ">
+ and t.state in
+ <foreach collection="states" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="scopeTime !=null ">
+ and t.create_time < #{scopeTime}
+ and t.create_time > #{createTime}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -189,10 +204,10 @@
<if test="state !=null and state != ''">
, t.state= #{state}
</if>
- <if test="actInsTime !=null and actInsTime != ''">
+ <if test="actInsTime !=null ">
, t.act_ins_time= #{actInsTime}
</if>
- <if test="planInsTime !=null and planInsTime != ''">
+ <if test="planInsTime !=null ">
, t.plan_ins_time= #{planInsTime}
</if>
<if test="actUserName !=null and actUserName != ''">
@@ -226,7 +241,7 @@
<!-- 鏌ヨ娲诲姩鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryInspectionTasksCount" parameterType="Map" resultType="Map">
select count(1) count
- from inspection_task t,t_dict td1,t_dict td2
+ from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
where 1 =1
and t.sign_type = td1.status_cd
and td1.table_name = 'inspection_task'
@@ -234,13 +249,15 @@
and t.state = td2.status_cd
and td2.table_name = 'inspection_task'
and td2.table_columns = 'state'
+ and ip.inspection_plan_id = t.inspection_plan_id
+ and ip.status_cd = '0'
<if test="planUserId !=null and planUserId != ''">
and t.plan_user_id= #{planUserId}
</if>
- <if test="actInsTime !=null and actInsTime != ''">
+ <if test="actInsTime !=null ">
and t.act_ins_time= #{actInsTime}
</if>
- <if test="planInsTime !=null and planInsTime != ''">
+ <if test="planInsTime !=null ">
and t.plan_ins_time= #{planInsTime}
</if>
<if test="statusCd !=null and statusCd != ''">
@@ -270,6 +287,15 @@
<if test="taskId !=null and taskId != ''">
and t.task_id= #{taskId}
</if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="states !=null ">
+ and t.state in
+ <foreach collection="states" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
</select>
@@ -287,6 +313,7 @@
ip.staff_name planUserName
FROM
inspection_plan ip
+ inner join
LEFT JOIN inspection_task it ON ip.inspection_plan_id = it.inspection_plan_id
AND ip.staff_id = it.plan_user_id
AND it.status_cd = '0'
@@ -313,11 +340,23 @@
<!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
<insert id="insertInspectionTask" parameterType="Map">
insert into inspection_task(
- plan_user_id,plan_ins_time,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,task_id,state
- )
+ plan_user_id,plan_ins_time,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,task_id,state,ip_staff_id
+ ) values
<foreach collection="tasks" item="task" separator=",">
- (#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId},'20200405')
+ (#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId},'20200405',#{task.ipStaffId})
</foreach>
</insert>
+ <!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
+ <insert id="insertInspectionTaskDetail" parameterType="Map">
+ insert into inspection_task_detail(
+ task_detail_id,b_id,community_id,task_id,inspection_id,inspection_name,state
+ ) values
+ <foreach collection="tasks" item="task" separator=",">
+ (#{task.taskDetailId},'-1',#{task.communityId},#{task.taskId},#{task.inspectionId},#{task.inspectionName},'20200405')
+ </foreach>
+ </insert>
+
+
+
</mapper>
--
Gitblit v1.8.0