Lianxun_Java.git

			@@ -1,24 +1,28 @@
			<?xml version="1.0" encoding="UTF-8" ?>
			<!DOCTYPE mapper
			PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="inspectionTaskDetailServiceDaoImpl">

			<!-- 保存巡检任务明细信息 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,patrol_type,description
			inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description,longitude,latitude,
			inspection_time,inspection_state,point_start_time,point_end_time,sort_number,act_user_id,act_user_name
			) values (
			#{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId},#{patrolType},#{description}
			#{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId},#{patrolType},#{description},
			#{longitude},#{latitude},#{inspectionTime},#{inspectionState},#{pointStartTime},#{pointEndTime},#{sortNumber},#{actUserId},#{actUserName}
			)
			</insert>


			<!-- 查询巡检任务明细信息（Business） add by wuxw 2018-07-03 -->
			<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,t.patrol_type,t.description,t.patrol_type patrolType
			taskId,t.task_detail_id,t.task_detail_id taskDetailId,t.patrol_type,t.description,t.patrol_type patrolType,
			t.longitude,t.latitude,t.inspection_time,t.inspection_time inspectionTime,t.inspection_state,
			t.inspection_state inspectionState,t.point_start_time,t.point_start_time
			pointStartTime,t.point_end_time,t.point_end_time pointEndTime,t.sort_number,t.sort_number sortNumber,t.act_user_id,
			t.act_user_id actUserId,t.act_user_name,t.act_user_name actUserName,t.send_flag sendFlag
			from business_inspection_task_detail t
			where 1 =1
			<if test="inspectionId !=null and inspectionId != ''">
			@@ -45,15 +49,28 @@
			<if test="taskDetailId !=null and taskDetailId != ''">
			and t.task_detail_id= #{taskDetailId}
			</if>

			<if test="longitude !=null and longitude != ''">
			and t.longitude= #{longitude}
			</if>
			<if test="latitude !=null and latitude != ''">
			and t.latitude= #{latitude}
			</if>
			<if test="inspectionTime !=null">
			and t.inspection_time= #{inspectionTime}
			</if>
			<if test="inspectionState !=null and inspectionState != ''">
			and t.inspection_state= #{inspectionState}
			</if>
			</select>


			<!-- 保存巡检任务明细信息至 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,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
			inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description,longitude,latitude,inspection_time,
			inspection_state,point_start_time,point_end_time,sort_number,act_user_id,act_user_name
			) 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,t.longitude,t.latitude,
			t.inspection_time,t.inspection_state,t.point_start_time,t.point_end_time,t.sort_number,t.act_user_id,t.act_user_name
			from
			business_inspection_task_detail t where 1=1
			<if test="inspectionId !=null and inspectionId != ''">
			@@ -78,20 +95,53 @@
			<if test="taskDetailId !=null and taskDetailId != ''">
			and t.task_detail_id= #{taskDetailId}
			</if>

			<if test="longitude !=null and longitude != ''">
			and t.longitude= #{longitude}
			</if>
			<if test="latitude !=null and latitude != ''">
			and t.latitude= #{latitude}
			</if>
			<if test="inspectionTime !=null">
			and t.inspection_time= #{inspectionTime}
			</if>
			<if test="inspectionState !=null and inspectionState != ''">
			and t.inspection_state= #{inspectionState}
			</if>
			</insert>


			<!-- 查询巡检任务明细信息 add by wuxw 2018-07-03 -->
			<select id="getInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
			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,t.patrol_type,t.description,t.patrol_type patrolType,td2.name patrolTypeName
			t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time
			pointEndTime,t.sort_number,t.sort_number sortNumber,t.act_user_id,t.act_user_id actUserId,t.act_user_name,t.act_user_name actUserName,
			td1.name stateName,t.patrol_type,t.description,t.patrol_type patrolType,td2.name patrolTypeName,
			it.plan_ins_time planInsTime,it.plan_end_time planEndTime,t.longitude,t.latitude,t.inspection_time,
			t.inspection_time inspectionTime,t.inspection_state,t.inspection_state inspectionState,td3.name
			inspectionStateName,
			ipl.inspection_plan_name,ipl.inspection_plan_name inspectionPlanName,ir.route_name,ir.route_name routeName,
			it.plan_user_name,it.plan_user_name planUserName,it.plan_user_id,it.plan_user_id planUserId,it.act_user_name,it.act_user_name actUserName,td4.name,td4.name
			signTypeName,td5.name taskStateName,ip.item_id itemId,t.send_flag sendFlag,t.create_time createTime
			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
			LEFT JOIN inspection_point ip on t.inspection_id = ip.inspection_id and ip.status_cd = '0'
			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'
			left join t_dict td3 on t.inspection_state = td3.status_cd and td3.table_name = 'inspection_task_detail'
			and td3.table_columns = 'inspection_state'
			left join inspection_task it on t.task_id = it.task_id and it.status_cd = '0'
			left join inspection_plan ipl on it.inspection_plan_id = ipl.inspection_plan_id
			left join inspection_route ir on ipl.inspection_route_id = ir.inspection_route_id
			left join t_dict td4 on it.sign_type = td4.status_cd and td4.table_name = 'inspection_task'
			and td4.table_columns = 'sign_type'
			left join t_dict td5 on it.state = td5.status_cd and td5.table_name = 'inspection_task' and
			td5.table_columns = 'state'
			where 1 = 1
			<if test="pointObjId !=null and pointObjId != ''">
			and ip.point_obj_id = #{pointObjId}
			</if>
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			@@ -103,6 +153,9 @@
			</if>
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="taskState !=null and taskState != ''">
			and it.state= #{taskState}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			@@ -119,13 +172,72 @@
			<if test="patrolType !=null and patrolType != ''">
			and t.patrol_type= #{patrolType}
			</if>
			order by t.create_time desc
			<if test="longitude !=null and longitude != ''">
			and t.longitude= #{longitude}
			</if>
			<if test="latitude !=null and latitude != ''">
			and t.latitude= #{latitude}
			</if>
			<if test="inspectionTime !=null">
			and t.inspection_time= #{inspectionTime}
			</if>
			<if test="inspectionState !=null and inspectionState != ''">
			and t.inspection_state= #{inspectionState}
			</if>
			<if test='inspectionTimeFlag !=null and inspectionTimeFlag =="1"'>
			and t.inspection_time is NULL and t.inspection_state is NULL
			</if>
			<if test='inspectionTimeFlag !=null and inspectionTimeFlag =="2"'>
			and t.inspection_time is NOT NULL and t.inspection_state is NOT NULL
			</if>
			<if test="planUserName !=null and planUserName != ''">
			and it.plan_user_name= #{planUserName}
			</if>
			<if test="planUserId !=null and planUserId != ''">
			and it.plan_user_id= #{planUserId}
			</if>
			<if test="inspectionPlanName !=null and inspectionPlanName != ''">
			and ipl.inspection_plan_name= #{inspectionPlanName}
			</if>
			<if test="routeName !=null and routeName != ''">
			and ir.route_name= #{routeName}
			</if>
			<if test="inspectionPlanId !=null and inspectionPlanId != ''">
			and ipl.inspection_plan_id= #{inspectionPlanId}
			</if>
			<if test="inspectionRouteId !=null and inspectionRouteId != ''">
			and ipl.inspection_route_id= #{inspectionRouteId}
			</if>
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			<if test="nowTime != null">
			and t.create_time < #{nowTime}
			</if>
			<!--<if test="qrCodeTime != null">-->
			<!--and t.create_time > #{qrCodeTime}-->
			<!--</if>-->
			<if test="qrCodeTime != null">
			and it.plan_ins_time < #{qrCodeTime}
			and it.plan_end_time > #{qrCodeTime}
			</if>
			<if test="queryTime != null">
			and DATE_FORMAT(it.plan_ins_time, '%Y-%m-%d') = #{queryTime}
			</if>
			<if test="inspectionStartTime !=null and inspectionStartTime != ''">
			and t.inspection_time >= #{inspectionStartTime}
			</if>
			<if test="inspectionEndTime !=null and inspectionEndTime != ''">
			and t.inspection_time <= #{inspectionEndTime}
			</if>
			<if test="sendFlag !=null and sendFlag != ''">
			and t.send_flag = #{sendFlag}
			</if>
			order by t.create_time desc,t.sort_number asc
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>

			</select>


			<!-- 修改巡检任务明细信息 add by wuxw 2018-07-03 -->
			<update id="updateInspectionTaskDetailInfoInstance" parameterType="Map">
			@@ -154,6 +266,27 @@
			<if test="patrolType !=null and patrolType != ''">
			, t.patrol_type= #{patrolType}
			</if>
			<if test="longitude !=null and longitude != ''">
			, t.longitude= #{longitude}
			</if>
			<if test="latitude !=null and latitude != ''">
			, t.latitude= #{latitude}
			</if>
			<if test="inspectionTime !=null">
			, t.inspection_time= #{inspectionTime}
			</if>
			<if test="inspectionState !=null and inspectionState != ''">
			, t.inspection_state= #{inspectionState}
			</if>
			<if test="actUserId !=null and actUserId != ''">
			, t.act_user_id= #{actUserId}
			</if>
			<if test="actUserName !=null and actUserName != ''">
			, t.act_user_name= #{actUserName}
			</if>
			<if test="sendFlag !=null and sendFlag != ''">
			, t.send_flag = #{sendFlag}
			</if>
			where 1=1
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			@@ -161,15 +294,25 @@
			<if test="taskDetailId !=null and taskDetailId != ''">
			and t.task_detail_id= #{taskDetailId}
			</if>

			</update>

			<!-- 查询巡检任务明细数量 add by wuxw 2018-07-03 -->
			<select id="queryInspectionTaskDetailsCount" parameterType="Map" resultType="Map">
			select count(1) count
			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'
			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'
			left join t_dict td3 on t.inspection_state = td3.status_cd and td3.table_name = 'inspection_task_detail' and
			td2.table_columns = 'inspection_state'
			left join inspection_task it on t.task_id = it.task_id
			left join inspection_plan ipl on it.inspection_plan_id = ipl.inspection_plan_id
			left join inspection_route ir on ipl.inspection_route_id = ir.inspection_route_id
			left join t_dict td4 on it.sign_type = td4.status_cd and td4.table_name = 'inspection_task'
			and td4.table_columns = 'sign_type'
			left join t_dict td5 on it.state = td5.status_cd and td5.table_name = 'inspection_task' and
			td5.table_columns = 'state'
			where 1 =1
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			@@ -182,6 +325,9 @@
			</if>
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="taskState !=null and taskState != ''">
			and it.state= #{taskState}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			@@ -198,8 +344,51 @@
			<if test="patrolType !=null and patrolType != ''">
			and t.patrol_type= #{patrolType}
			</if>


			<if test="longitude !=null and longitude != ''">
			and t.longitude= #{longitude}
			</if>
			<if test="latitude !=null and latitude != ''">
			and t.latitude= #{latitude}
			</if>
			<if test="inspectionTime !=null">
			and t.inspection_time= #{inspectionTime}
			</if>
			<if test="inspectionState !=null and inspectionState != ''">
			and t.inspection_state= #{inspectionState}
			</if>
			<if test="planUserName !=null and planUserName != ''">
			and it.plan_user_name= #{planUserName}
			</if>
			<if test="planUserId !=null and planUserId != ''">
			and it.plan_user_id= #{planUserId}
			</if>
			<if test="inspectionPlanName !=null and inspectionPlanName != ''">
			and ipl.inspection_plan_name= #{inspectionPlanName}
			</if>
			<if test="routeName !=null and routeName != ''">
			and ir.route_name= #{routeName}
			</if>
			<if test="inspectionPlanId !=null and inspectionPlanId != ''">
			and ipl.inspection_plan_id= #{inspectionPlanId}
			</if>
			<if test="inspectionRouteId !=null and inspectionRouteId != ''">
			and ipl.inspection_route_id= #{inspectionRouteId}
			</if>
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			<if test="qrCodeTime != null">
			and it.plan_ins_time < #{qrCodeTime}
			and it.plan_end_time > #{qrCodeTime}
			</if>
			<if test="inspectionStartTime !=null and inspectionStartTime != ''">
			and t.inspection_time >= #{inspectionStartTime}
			</if>
			<if test="inspectionEndTime !=null and inspectionEndTime != ''">
			and t.inspection_time <= #{inspectionEndTime}
			</if>
			<if test="sendFlag !=null and sendFlag != ''">
			and t.send_flag = #{sendFlag}
			</if>
			</select>

			</mapper>