大屏

hjzx-api/src/main/java/api/controller/report/DataAnalysisController.java

@@ -10,6 +10,7 @@ import api.util.enums.BusinessType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.var;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -113,6 +114,10 @@ public class DataAnalysisController extends BaseController {
     @Log(title = "区域业务类型",businessType = BusinessType.QUERY)
     @GetMapping("/selectBusinessType/{type}")
     public AjaxResult selectBusinessAreaType(@PathVariable long type, Long area  )  {
+        if (area==null)
+        {
+            area=1743L;
+        }
         var obj =DataAnalysisService.selectBusinessType(type,area);
         return Success("成功",obj);
     }
@@ -120,6 +125,10 @@ public class DataAnalysisController extends BaseController {
     @Log(title = "区域关键词数量",businessType = BusinessType.QUERY)
     @GetMapping("/selectAreaKeywordCount/{type}")
     public AjaxResult selectAreaKeywordCount(@PathVariable long type, Long area )  {
+        if (area==null)
+        {
+            area=1743L;
+        }
         var obj =DataAnalysisService.selectAreaKeywordCount(type,area);
         return Success("成功",obj);
     }

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

@@ -253,20 +253,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectBusinessType"  parameterType="long" resultMap="CompleteView">
+		WITH RECURSIVE sub_areas AS (
 
+		SELECT id FROM sys_area WHERE id = #{area}
+		UNION ALL
+
+		SELECT a.id FROM sys_area a
+		INNER JOIN sub_areas sa ON a.parent_id = sa.id
+		)
 		select   Name , SUM(number) number  from
 		(select   CONCAT(ancestors, ',', id) ancestors,type_name Name  from  workorder_type where category=0 and parent_id=0 and is_delete=0) a
-		left join (select COUNT(1) number,  CONCAT((select ancestors from workorder_type where id=workordercate ),',',workordercate)  ancestors  from wo_workorderbase
-		where createtime >= CURDATE() - INTERVAL DAY(CURDATE()) - 1 DAY
-		AND createtime <![CDATA[<=]]> DATE_ADD(CURDATE() - DAY(CURDATE()) + 1, INTERVAL 1 MONTH)
-		and isdelete=0
+		left join (select COUNT(1) number,  CONCAT((select ancestors from workorder_type where id=workordercate ),',',workordercate)  ancestors  from
+		 wo_workorderbase  o JOIN sub_areas sa ON o.area = sa.id
+		where  isdelete=0
 		<if test="time != null and time !='' ">
 			and YEAR(createtime) = YEAR(CURRENT_DATE)
 			AND ${time}(createtime) = ${time}(CURRENT_DATE)
 		</if>
-		<if test="area >0  ">
-			AND `area`= #{area}
-		</if>
 		group by ancestors)  b on  CONCAT(b.ancestors,',')  LIKE CONCAT('%', a.ancestors,',' '%')
 		group by Name
 
@@ -474,6 +477,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 	<select id="selectAreaKeywordCount"  parameterType="Long" resultMap="CompleteView">
+		WITH RECURSIVE sub_areas AS (
+
+		SELECT id FROM sys_area WHERE id =  #{area}
+		UNION ALL
+
+		SELECT a.id FROM sys_area a
+		INNER JOIN sub_areas sa ON a.parent_id = sa.id
+		)
 		SELECT
 		keyword_text AS `Name`,
 		SUM(keyword_count) AS `number`
@@ -489,10 +500,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		keyword_count INT PATH '$.count'
 		)
 		) AS jt
+		JOIN sub_areas sa ON o.area = sa.id
 		WHERE
-		<if test="area >0   ">
-			o.area = #{area}
-		</if>
+		1=1
 		<if test="time != null and time !='' ">
 			and YEAR(createtime) = YEAR(CURRENT_DATE)
 			AND ${time}(createtime) = ${time}(CURRENT_DATE)