hbwri/skjcmanager.git

			@@ -5,14 +5,31 @@
			<!--自定义分页查询-->
			<select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
			SELECT
			spt.*,spt2.name as patrolTypeName,
			route.ROUTE_COORDINATES routeRange,
			spt.id,
			spt.start_time,
			spt.end_time,
			spt.to_user_id,
			spt.state,
			spt.create_time,
			spt.project_id,
			spt.reservoir_name,
			spt.title,
			spt.content,
			spt.task_type,
			spt.patrol_group_item_id,
			spt.problem_count,
			spt.report_problem_count,
			spt.patrol_role,


			spt2.name as patrolTypeName,
			u.real_name toUserName,
			u2.real_name createUserName,
			arb."res_loc" regionName
			arb."res_loc" regionName,
			arb."center_long" lon,
			arb."center_lat" lat
			FROM sm_patrol_task spt
			left join sm_patrol_type spt2 on spt.task_type = spt2.id
			LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
			LEFT JOIN blade_user u ON u.id = spt.to_user_id
			LEFT JOIN blade_user u2 ON u2.id = spt.create_user
			LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = spt.project_id
			@@ -27,10 +44,10 @@
			AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
			</if>
			<if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
			AND spt.start_time >= #{patrolTask.startTime}
			AND spt.create_time >= #{patrolTask.startTime}
			</if>
			<if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
			AND spt.end_time <= #{patrolTask.endTime}
			AND spt.create_time <= #{patrolTask.endTime}
			</if>
			<if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
			AND spt.project_id = #{patrolTask.projectId}
			@@ -61,12 +78,6 @@
			<if test="patrolTask.title !=null and patrolTask.title!=''">
			AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
			</if>
			<!-- <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">-->
			<!-- AND spt.start_time >= #{patrolTask.startTime}-->
			<!-- </if>-->
			<!-- <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">-->
			<!-- AND spt.end_time <= #{patrolTask.endTime}-->
			<!-- </if>-->
			<if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
			AND spt.create_time >= #{patrolTask.startTime}
			</if>
			@@ -119,10 +130,10 @@
			AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
			</if>
			<if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
			AND spt.start_time >= #{patrolTask.startTime}
			AND spt.create_time >= #{patrolTask.startTime}
			</if>
			<if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
			AND spt.end_time <= #{patrolTask.endTime}
			AND spt.create_time <= #{patrolTask.endTime}
			</if>
			<if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
			AND spt.project_id = #{patrolTask.projectId}
			@@ -740,10 +751,10 @@
			and concat(aab."ad_code",aa."ad_code",ab."ad_code",ac."ad_code") like CONCAT('%',#{vo.adCode},'%')
			</if>
			<if test="vo.startTime !=null and vo.startTime !=''">
			AND T.start_time >= #{vo.startTime}
			AND T.create_time >= #{vo.startTime}
			</if>
			<if test="vo.endTime !=null and vo.endTime !=''">
			AND T.end_time <= #{vo.endTime}
			AND T.create_time <= #{vo.endTime}
			</if>
			<if test="vo.reservoirName !=null and vo.reservoirName !='' ">
			AND T.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
			@@ -772,15 +783,72 @@
			and concat(aab."ad_code",aa."ad_code",ab."ad_code",ac."ad_code") like CONCAT('%',#{vo.adCode},'%')
			</if>
			<if test="vo.startTime !=null and vo.startTime !=''">
			AND T.start_time >= #{vo.startTime}
			AND T.create_time >= #{vo.startTime}
			</if>
			<if test="vo.endTime !=null and vo.endTime !=''">
			AND T.end_time <= #{vo.endTime}
			AND T.create_time <= #{vo.endTime}
			</if>
			<if test="vo.reservoirName !=null and vo.reservoirName !='' ">
			AND T.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
			</if>
			</select>

			<resultMap id="item" type="cn.gistack.sm.patrol.entity.PatrolGroupItem">
			<result property="id" column="itemId"/>
			<result property="itemsName" column="itemsName"/>
			<result property="groupId" column="groupId"/>
			<result property="description" column="description"/>
			</resultMap>

			<resultMap id="groupDTO" type="cn.gistack.sm.patrol.dto.PatrolGroupDTOS">
			<id property="id" column="groupId"/>
			<result property="name" column="groupName"/>
			<collection property="itemList" resultMap="item"/>
			</resultMap>

			<resultMap id="taskDTO" type="cn.gistack.sm.patrol.dto.PatrolTaskDTO">
			<id property="id" column="taskId"/>
			<result property="projectId" column="projectId"/>
			<result property="state" column="state"/>
			<result property="title" column="title"/>
			<result property="content" column="content"/>
			<collection property="groupList" resultMap="groupDTO"/>
			</resultMap>

			<select id="getTaskDTO" resultMap="taskDTO">
			SELECT
			task.id as taskId,
			task.project_id as projectId,
			task.state as state,
			task.title as title,
			task.content as content,

			spg.id as groupId,
			spg.name as groupName,

			spgi.id as itemId,
			spgi.items_name as itemsName,
			spgi.description as description
			FROM YWXT.SM_PATROL_TASK TASK
			LEFT JOIN SM_PATROL_GROUP_ITEM SPGI ON task.patrol_group_item_id like CONCAT('%',spgi.id,'%')
			LEFT JOIN SM_PATROL_GROUP SPG ON SPG.ID = SPGI.GROUP_ID
			WHERE task.is_deleted = 0 and TASK.ID = #{taskId}
			</select>

			<select id="getMyTask" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
			SELECT
			id,title,project_id,content,state,to_user_id,real_end_time

			from sm_patrol_task spt
			where spt.is_deleted = 0
			<if test="patrolTask.toUserId != null and patrolTask.toUserId != ''">
			AND spt.to_user_id LIKE CONCAT('%',#{patrolTask.toUserId},'%')
			</if>
			<if test="patrolTask.state != null and patrolTask.state != ''">
			AND spt.state = #{patrolTask.state}
			</if>
			order by spt.create_time desc
			</select>


			</mapper>