报表

hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -377,21 +377,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectRegionOrderCount"  parameterType="String" resultMap="RegionOrderResult">
+		WITH RECURSIVE AreaCTE AS (
 		SELECT
-		a.id region,
-		a.name  AS name,
-		COUNT(wo.workordercode) number ,
+		id AS root_id,
+		id AS child_id,
+		name AS root_name,
+		parent_id
+		FROM sys_area
+		WHERE   type=#{type} and parent_id=#{area}
+		UNION ALL
+		SELECT
+		a.root_id,
+		s.id AS child_id,
+		a.root_name,
+		s.parent_id
+		FROM sys_area s
+		INNER JOIN AreaCTE a ON s.parent_id = a.child_id
+		)
+		SELECT
+		a.root_id AS region,
+		a.root_name AS name,
+		COUNT(wo.workordercode) AS number,
 		COUNT(DISTINCT wo.call_id) AS callNumber,
 		COUNT(DISTINCT lv.workordercode) AS visitNumber,
 		CONCAT(
 		COALESCE(
-		ROUND(AVG(CASE WHEN lv.myd >0 and lv.myd<![CDATA[<]]> 3 THEN 1 ELSE 0 END) * 100, 2),
+		ROUND(
+		AVG(CASE WHEN lv.myd > 0 AND lv.myd <![CDATA[<]]>  3 THEN 1 ELSE 0 END) * 100,
+		2
+		),
 		0
 		),
 		'%'
 		) AS mydRate
-		FROM sys_area a
-		LEFT JOIN wo_workorderbase wo ON a.id = wo.area
+		FROM AreaCTE a
+		LEFT JOIN wo_workorderbase wo
+		ON a.child_id = wo.area
 		<if test="time != null and time !='' ">
 			and YEAR(wo.createtime) = YEAR(CURRENT_DATE)
 			AND ${time}(wo.createtime) = ${time}(CURRENT_DATE)
@@ -407,12 +428,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		MAX(visit_id) AS visit_id
 		FROM wo_visitlog
 		GROUP BY workordercode
-		) v2 ON v1.workordercode = v2.workordercode
+		) v2
+		ON v1.workordercode = v2.workordercode
 		AND v1.visit_id = v2.visit_id
-		) lv ON wo.workordercode = lv.workordercode
-		where 1=1
-		 and  a.type=#{type} and a.parent_id=#{area}
-		GROUP BY a.id ;
+		) lv
+		ON wo.workordercode = lv.workordercode
+		GROUP BY a.root_id, a.root_name;
 	</select>
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
 		select count(1) total,