大屏

hjzx-mapper/src/main/java/api/mapper/report/ReportMapper.java

@@ -37,6 +37,8 @@ public interface ReportMapper {
 
     /**工单分类表**/
     public  List<CompleteView> selectBusinessType (String time,Long area );
+    public  List<CompleteView> selectBusinessAreaType (String time,Long area );
+
     /**工单处理趋势**/
     public  List<HourReport> selectDealingWithTrends(Date beginTime, Date endTime);
     /**话务量统计**/

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

@@ -253,6 +253,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectBusinessType"  parameterType="long" resultMap="CompleteView">
+		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  isdelete=0
+		<if test="time != null and time !='' ">
+			and YEAR(createtime) = YEAR(CURRENT_DATE)
+			AND ${time}(createtime) = ${time}(CURRENT_DATE)
+		</if>
+		group by ancestors)  b on  CONCAT(b.ancestors,',')  LIKE CONCAT('%', a.ancestors,',' '%')
+		group by Name
+
+	</select>
+
+
+	<select id="selectBusinessAreaType"  parameterType="long" resultMap="CompleteView">
 		WITH RECURSIVE sub_areas AS (
 
 		SELECT id FROM sys_area WHERE id = #{area}
@@ -439,7 +455,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		GROUP BY a.root_id, a.root_name;
 	</select>
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
-		select count(note=${note} or null) total,
+		select count(1) total,
 		count(note=${note} and call_type = 1 or null )	incoming,		count(call_type = 2
 		or null )	exhalation  from rep_record
 		where 1=1

hjzx-service/src/main/java/api/service/report/impl/DataAnalysisServiceImpl.java

@@ -75,6 +75,8 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         RecordDateView view1=reportMapper.selectTelephoneData(time,1L);//八院话务数据
         RecordDateView view2=reportMapper.selectTelephoneData(time,2L);//九院话务数据
         view2.setExhalation(0L);
+        view1.setTotal(view1.getIncoming()+view1.getExhalation());
+        view2.setTotal(view2.getIncoming());
         RecordDateView view3=new RecordDateView();
         view3.setTotal(view1.getTotal()+view2.getTotal());
         view3.setIncoming(view1.getIncoming()+view2.getIncoming());
@@ -361,7 +363,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
             }
         }
         List<HashMap<String,Object>> MapList = new ArrayList<HashMap<String,Object>>();
-        List<CompleteView>  BusinessType= reportMapper.selectBusinessType( time,area);
+        List<CompleteView>  BusinessType= reportMapper.selectBusinessAreaType( time,area);
         if (BusinessType!=null)
         {
             long total=BusinessType.stream().filter(x->x.getNumber()!=null).mapToLong(CompleteView::getNumber).sum();

hjzx-service/src/main/java/api/service/report/impl/ReportBaseServiceImpl.java

@@ -74,7 +74,6 @@ public class ReportBaseServiceImpl implements IReportBaseService {
     /**工单分类表**/
     @Override
     public List<HashMap<String,Object>>  selectBusinessType()  {
-
         List<HashMap<String,Object>> MapList = new ArrayList<HashMap<String,Object>>();
         List<CompleteView>  BusinessType= reportMapper.selectBusinessType("", 0L);
         if (BusinessType!=null)