巡检报告问题处理

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1179,20 +1179,21 @@
 
 	<select id="getPlanTaskBasicInfo" resultType="Map">
 		SELECT
-			DISTINCT
-			ppk.id AS planTaskId,
-			pp.NAME AS taskName,
-			pp.biz_org_name AS stationName,
-			ppk.begin_time AS beginTime,
-			ppk.end_time AS endTime,
-			(UNIX_TIMESTAMP(ppk.end_time) - UNIX_TIMESTAMP(ppk.begin_time)) AS difSecond,
-			( CASE pptd.is_finish WHEN 0 THEN '未完成' WHEN 1 THEN '已完成' WHEN 2 THEN '超时漏检' END ) AS taskStatus
+		DISTINCT
+		ppk.id AS planTaskId,
+		pp.`name` AS taskName,
+		pp.biz_org_name AS stationName,
+		ppk.begin_time AS beginTime,
+		ppk.end_time AS endTime,
+		(UNIX_TIMESTAMP(ppk.end_time) - UNIX_TIMESTAMP(ppk.begin_time)) AS difSecond,
+		( CASE ppk.finish_status WHEN 0 THEN '未开始' WHEN 1 THEN '进行中' WHEN 2 THEN '已结束' WHEN 3 THEN '已超时' END ) AS taskStatus,
+		ppk.point_num as pointNum,
+		ppk.finish_num as finishNum
 		FROM
-			`p_plan_task` ppk
+		`p_plan_task` ppk
 		LEFT JOIN p_plan pp ON pp.id = ppk.plan_id
-		LEFT JOIN p_plan_task_detail pptd ON pptd.task_no = ppk.id
 		<where>
-			pptd.id = #{taskDetailId}
+		ppk.id = #{taskDetailId}
 		</where>
 	</select>