~liusuyi/ruoyi-api.git

			@@ -34,6 +34,8 @@
			<result property="taskId" column="sub1_task_id"/>
			<result property="status" column="sub1_status"/>
			<result property="clockInPicUrl" column="sub1_clock_in_pic_url"/>
			<result property="viewTime" column="sub1_view_time"/>
			<result property="viewPosition" column="sub1_view_position"/>
			</resultMap>
			<resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult">
			<result property="id" column="sub2_id"/>
			@@ -64,7 +66,36 @@
			left join sys_dept d on d.dept_id = c.dept_id
			left join sys_user u on u.user_id = c.user_id
			</sql>

			<sql id="selectArdAppTaskDto">
			select a.id,
			a.name,
			a.text,
			a.voice,
			a.dept_id,
			a.user_id,
			a.create_by,
			a.create_time,
			a.update_by,
			a.update_time,
			b.id as sub2_id,
			b.task_id as sub2_task_id,
			b.pic_url as sub2_pic_url,
			c.id as sub1_id,
			c.name as sub1_name,
			c.longitude as sub1_longitude,
			c.latitude as sub1_latitude,
			c.altitude as sub1_altitude,
			c.user_id as sub1_user_id,
			c.text as sub1_text,
			c.voice as sub1_voice,
			c.status as sub1_status,
			c.clock_in_pic_url as sub1_clock_in_pic_url,
			c.view_time as sub1_view_time,
			c.view_position as sub1_view_position
			from ard_app_task a
			left join ard_app_task_pic b on b.task_id = a.id
			left join ard_app_task_detail c on c.task_id = a.id
			</sql>
			<select id="selectArdAppTaskList" parameterType="ArdAppTask" resultMap="ArdAppTaskResult">
			<include refid="selectArdAppTaskVo"/>
			<where>
			@@ -83,32 +114,7 @@
			</where>
			</select>
			<select id="selectArdAppTaskListWithDetail" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
			select a.id,
			a.name,
			a.text,
			a.voice,
			a.dept_id,
			a.user_id,
			a.create_by,
			a.create_time,
			a.update_by,
			a.update_time,
			b.id as sub2_id,
			b.task_id as sub2_task_id,
			b.pic_url as sub2_pic_url,
			c.id as sub1_id,
			c.name as sub1_name,
			c.longitude as sub1_longitude,
			c.latitude as sub1_latitude,
			c.altitude as sub1_altitude,
			c.user_id as sub1_user_id,
			c.text as sub1_text,
			c.voice as sub1_voice,
			c.status as sub1_status,
			c.clock_in_pic_url as sub1_clock_in_pic_url
			from ard_app_task a
			left join ard_app_task_pic b on b.task_id = a.id
			left join ard_app_task_detail c on c.task_id = a.id
			<include refid="selectArdAppTaskDto"/>
			<where>
			<if test="userId != null and userId != ''">
			and c.user_id = #{userId}
			@@ -122,32 +128,7 @@
			</where>
			</select>
			<select id="selectArdAppTaskListWithDetailById" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
			select a.id,
			a.name,
			a.text,
			a.voice,
			a.dept_id,
			a.user_id,
			a.create_by,
			a.create_time,
			a.update_by,
			a.update_time,
			b.id as sub2_id,
			b.task_id as sub2_task_id,
			b.pic_url as sub2_pic_url,
			c.id as sub1_id,
			c.name as sub1_name,
			c.longitude as sub1_longitude,
			c.latitude as sub1_latitude,
			c.altitude as sub1_altitude,
			c.user_id as sub1_user_id,
			c.text as sub1_text,
			c.voice as sub1_voice,
			c.status as sub1_status,
			c.clock_in_pic_url as sub1_clock_in_pic_url
			from ard_app_task a
			left join ard_app_task_pic b on b.task_id = a.id
			left join ard_app_task_detail c on c.task_id = a.id
			<include refid="selectArdAppTaskDto"/>
			<where>
			<if test="id != null and id != ''">
			and a.id = #{id}
			@@ -163,74 +144,9 @@
			</if>
			</where>
			</select>

			<select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
			select a.id,
			a.name,
			a.text,
			a.voice,
			a.dept_id,
			a.user_id,
			a.create_by,
			a.create_time,
			a.update_by,
			a.update_time,
			b.id as sub2_id,
			b.task_id as sub2_task_id,
			b.pic_url as sub2_pic_url,
			c.id as sub1_id,
			c.name as sub1_name,
			c.longitude as sub1_longitude,
			c.latitude as sub1_latitude,
			c.altitude as sub1_altitude,
			c.user_id as sub1_user_id,
			c.text as sub1_text,
			c.voice as sub1_voice
			from ard_app_task a
			left join ard_app_task_pic b on b.task_id = a.id
			left join ard_app_task_detail c on c.task_id = a.id
			where a.id = #{id}
			</select>
			<select id="selectArdAppTaskByIdWithPic" parameterType="String" resultMap="ArdAppTaskArdAppTaskPicResult">
			select a.id,
			a.name,
			a.text,
			a.voice,
			a.dept_id,
			a.user_id,
			a.create_by,
			a.create_time,
			a.update_by,
			a.update_time,
			b.id as sub2_id,
			b.task_id as sub2_task_id,
			b.pic_url as sub2_pic_url
			from ard_app_task a
			left join ard_app_task_pic b on b.task_id = a.id
			where a.id = #{id}
			</select>
			<select id="selectArdAppTaskByIdWithDetail" parameterType="String" resultMap="ArdAppTaskArdAppTaskDetailResult">
			select a.id,
			a.name,
			a.text,
			a.voice,
			a.dept_id,
			a.user_id,
			a.create_by,
			a.create_time,
			a.update_by,
			a.update_time,
			c.id as sub1_id,
			c.name as sub1_name,
			c.longitude as sub1_longitude,
			c.latitude as sub1_latitude,
			c.altitude as sub1_altitude,
			c.user_id as sub1_user_id,
			c.text as sub1_text,
			c.voice as sub1_voice,
			c.status as sub1_status,
			c.clock_in_pic_url as sub1_clock_in_pic_url
			from ard_app_task a
			left join ard_app_task_detail c on c.task_id = a.id
			<include refid="selectArdAppTaskDto"/>
			where a.id = #{id}
			</select>

			@@ -340,6 +256,8 @@
			<if test="clockInPicUrl != null">clock_in_pic_url = #{clockInPicUrl},</if>
			<if test="text != null">text = #{text},</if>
			<if test="voice != null">voice = #{voice},</if>
			<if test="viewTime != null">view_time = #{viewTime},</if>
			<if test="viewPosition != null">view_position = #{vviewPosition},</if>
			</trim>
			where id = #{id}
			</update>
			@@ -365,6 +283,8 @@
			c.voice,
			c.status,
			c.clock_in_pic_url
			c.view_time,
			c.view_position
			from ard_app_task_detail c
			where c.id = #{id}
			</select>