From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml | 148 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 103 insertions(+), 45 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 2651d08..7140dba
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
@@ -7,30 +7,33 @@
<!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessInspectionTaskInfo" parameterType="Map">
insert into business_inspection_task(
- plan_user_id,act_ins_time,plan_ins_time,act_user_name,operate,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id,state
+ plan_user_id,act_ins_time,plan_ins_time,plan_end_time,act_user_name,operate,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id,state,original_plan_user_id,original_plan_user_name,transfer_desc,task_type
) values (
- #{planUserId},#{actInsTime},#{planInsTime},#{actUserName},#{operate},#{signType},#{inspectionPlanId},#{planUserName},#{communityId},#{bId},#{actUserId},#{taskId},#{state}
+ #{planUserId},#{actInsTime},#{planInsTime},#{planEndTime},#{actUserName},#{operate},#{signType},#{inspectionPlanId},#{planUserName},#{communityId},#{bId},#{actUserId},#{taskId},#{state},#{originalPlanUserId},#{originalPlanUserName},#{transferDesc},#{taskType}
)
</insert>
-
<!-- 鏌ヨ娲诲姩淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessInspectionTaskInfo" parameterType="Map" resultType="Map">
select t.plan_user_id,t.plan_user_id planUserId,t.act_ins_time,t.act_ins_time
- actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.act_user_name,t.act_user_name
- actUserName,t.operate,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
- from business_inspection_task t
+ actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.plan_end_time,t.plan_end_time planEndTime,
+ t.act_user_name,t.act_user_name actUserName,t.operate,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,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
+ t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType from business_inspection_task t
where 1 =1
<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="planEndTime !=null ">
+ and t.plan_end_time= #{planEndTime}
</if>
<if test="actUserName !=null and actUserName != ''">
and t.act_user_name= #{actUserName}
@@ -62,25 +65,26 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
-
</select>
-
<!-- 淇濆瓨娲诲姩淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveInspectionTaskInfoInstance" parameterType="Map">
insert into inspection_task(
- plan_user_id,act_ins_time,plan_ins_time,status_cd,act_user_name,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id,state
+ plan_user_id,act_ins_time,plan_ins_time,plan_end_time,status_cd,act_user_name,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id,state,original_plan_user_id,original_plan_user_name,transfer_desc,task_type
) select
- t.plan_user_id,t.act_ins_time,t.plan_ins_time,'0',t.act_user_name,t.sign_type,t.inspection_plan_id,t.plan_user_name,t.community_id,t.b_id,t.act_user_id,t.task_id,t.state
+ t.plan_user_id,t.act_ins_time,t.plan_ins_time,t.plan_end_time,'0',t.act_user_name,t.sign_type,t.inspection_plan_id,t.plan_user_name,t.community_id,t.b_id,t.act_user_id,t.task_id,t.state,t.original_plan_user_id,t.original_plan_user_name,t.transfer_desc,t.task_type
from business_inspection_task t where 1=1
<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="planEndTime !=null ">
+ and t.plan_end_time= #{planEndTime}
</if>
<if test="actUserName !=null and actUserName != ''">
and t.act_user_name= #{actUserName}
@@ -110,18 +114,18 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
-
</insert>
-
<!-- 鏌ヨ娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
<select id="getInspectionTaskInfo" parameterType="Map" resultType="Map">
select t.plan_user_id,t.plan_user_id planUserId,t.act_ins_time,t.act_ins_time
- actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.status_cd,t.status_cd
- statusCd,t.act_user_name,t.act_user_name actUserName,t.sign_type,t.sign_type
+ actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.plan_end_time,t.plan_end_time planEndTime,
+ t.status_cd,t.status_cd 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,ip.inspection_plan_name inspectionPlanName
+ actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name
+ inspectionPlanName,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
+ t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType
from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
where 1 =1
and t.sign_type = td1.status_cd
@@ -135,11 +139,23 @@
<if test="planUserId !=null and planUserId != ''">
and t.plan_user_id= #{planUserId}
</if>
- <if test="actInsTime !=null and actInsTime != ''">
- and t.act_ins_time= #{actInsTime}
+ <if test="startTime != null">
+ and t.act_ins_time >= #{startTime}
</if>
- <if test="planInsTime !=null and planInsTime != ''">
+ <if test="endTime != null">
+ and t.act_ins_time <= #{endTime}
+ </if>
+ <if test="planInsTime !=null ">
and t.plan_ins_time= #{planInsTime}
+ </if>
+ <if test="planEndTime !=null ">
+ and t.plan_end_time= #{planEndTime}
+ </if>
+ <if test="dayTask !=null ">
+ and DateDiff(plan_ins_time,NOW())=0
+ </if>
+ <if test="todayPlanInsTime !=null ">
+ and t.plan_ins_time > #{todayPlanInsTime}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -153,8 +169,11 @@
<if test="inspectionPlanId !=null and inspectionPlanId != ''">
and t.inspection_plan_id= #{inspectionPlanId}
</if>
+ <if test="inspectionPlanName != null and inspectionPlanName != ''">
+ and ip.inspection_plan_name = #{inspectionPlanName}
+ </if>
<if test="planUserName !=null and planUserName != ''">
- and t.plan_user_name= #{planUserName}
+ and t.plan_user_name like '%${planUserName}%'
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -171,11 +190,20 @@
<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}
</if>
-
</select>
@@ -191,11 +219,14 @@
<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="planEndTime !=null ">
+ , t.plan_end_time= #{planEndTime}
</if>
<if test="actUserName !=null and actUserName != ''">
, t.act_user_name= #{actUserName}
@@ -215,6 +246,18 @@
<if test="actUserId !=null and actUserId != ''">
, t.act_user_id= #{actUserId}
</if>
+ <if test="originalPlanUserId !=null and originalPlanUserId != ''">
+ , t.original_plan_user_id= #{originalPlanUserId}
+ </if>
+ <if test="originalPlanUserName !=null and originalPlanUserName != ''">
+ , t.original_plan_user_name= #{original_plan_user_name}
+ </if>
+ <if test="transferDesc !=null and transferDesc != ''">
+ , t.transfer_desc= #{transferDesc}
+ </if>
+ <if test="taskType !=null and taskType != ''">
+ , t.task_type= #{taskType}
+ </if>
where 1=1
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -222,7 +265,6 @@
<if test="taskId !=null and taskId != ''">
and t.task_id= #{taskId}
</if>
-
</update>
<!-- 鏌ヨ娲诲姩鏁伴噺 add by wuxw 2018-07-03 -->
@@ -241,11 +283,20 @@
<if test="planUserId !=null and planUserId != ''">
and t.plan_user_id= #{planUserId}
</if>
- <if test="actInsTime !=null and actInsTime != ''">
- and t.act_ins_time= #{actInsTime}
+ <if test="startTime != null">
+ and t.act_ins_time >= #{startTime}
</if>
- <if test="planInsTime !=null and planInsTime != ''">
+ <if test="endTime != null">
+ and t.act_ins_time <= #{endTime}
+ </if>
+ <if test="planInsTime !=null ">
and t.plan_ins_time= #{planInsTime}
+ </if>
+ <if test="planEndTime !=null ">
+ and t.plan_end_time= #{planEndTime}
+ </if>
+ <if test="dayTask !=null ">
+ and DateDiff(plan_ins_time,NOW())=0
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -259,8 +310,11 @@
<if test="inspectionPlanId !=null and inspectionPlanId != ''">
and t.inspection_plan_id= #{inspectionPlanId}
</if>
+ <if test="inspectionPlanName != null and inspectionPlanName != ''">
+ and ip.inspection_plan_name = #{inspectionPlanName}
+ </if>
<if test="planUserName !=null and planUserName != ''">
- and t.plan_user_name= #{planUserName}
+ and t.plan_user_name like '%${planUserName}%'
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -274,8 +328,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>
<!-- 鏌ヨ鏈畨鎺掔殑宸℃璁″垝 -->
@@ -297,7 +358,7 @@
AND it.status_cd = '0'
AND ip.community_id = it.community_id
<if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020023'">
- and it.plan_ins_time > DATE_SUB(curdate(),INTERVAL 7 DAY)
+ and it.plan_ins_time > DATE_SUB(curdate(),INTERVAL 7 DAY)
</if>
<if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020024'">
and it.plan_ins_time > DATE_SUB(curdate(),INTERVAL 30 DAY)
@@ -318,23 +379,20 @@
<!-- 淇濆瓨娲诲姩淇℃伅 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,plan_end_time,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,task_id,state,ip_staff_id,original_plan_user_id,original_plan_user_name,transfer_desc,task_type
+ ) 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.planEndTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId},'20200405',#{task.ipStaffId},#{task.originalPlanUserId},#{task.originalPlanUserName},#{task.transferDesc},#{task.taskType})
</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
- )
+ task_detail_id,b_id,community_id,task_id,inspection_id,inspection_name,state,point_start_time,point_end_time,sort_number
+ ) values
<foreach collection="tasks" item="task" separator=",">
- (#{task.taskDetailId},'-1',#{task.communityId},#{task.taskId},#{task.inspectionId},#{task.inspectionName},'20200405')
+ (#{task.taskDetailId},'-1',#{task.communityId},#{task.taskId},#{task.inspectionId},#{task.inspectionName},'20200405',#{task.pointStartTime},#{task.pointEndTime},#{task.sortNumber})
</foreach>
</insert>
-
-
-
</mapper>
--
Gitblit v1.8.0