大屏

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

@@ -70,7 +70,7 @@ public interface ReportMapper {
     /**话务简报**/
     public  TelephoneBriefing selectTelephoneBriefing (String startTime,  String endTime  );
     /**话务数据**/
-    public  RecordDateView selectTelephoneData (String time  );
+    public  RecordDateView selectTelephoneData (String time ,Long note );
     /**区域关键词数量**/
     public  List<CompleteView> selectAreaKeywordCount (String time ,Long area  );
 

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

@@ -416,7 +416,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
 		select count(1) total,
-		count(note=1 or null )	incoming,		count(note=2 or null )	exhalation  from rep_record
+		count(note=${note} and call_type = 1 or null )	incoming,		count(note=${note} and call_type = 2
+		or null )	exhalation  from rep_record
 		where 1=1
 		<if test="time != null and time !='' ">
 			and YEAR(create_time) = YEAR(CURRENT_DATE)

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

@@ -72,7 +72,16 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
             }
         }
         HashMap<String,Object> obj=new HashMap<>();
-        obj.put("traffic", reportMapper.selectTelephoneData(time));//话务数据
+        RecordDateView view1=reportMapper.selectTelephoneData(time,1L);//八院话务数据
+        RecordDateView view2=reportMapper.selectTelephoneData(time,2L);//九院话务数据
+        RecordDateView view3=new RecordDateView();
+        view3.setTotal(view1.getTotal()+view2.getTotal());
+        view3.setIncoming(view1.getIncoming()+view2.getIncoming());
+        view3.setExhalation(view1.getExhalation()+view2.getExhalation());
+
+        obj.put("traffic",view3 );//话务数据
+        obj.put("eightTraffic",view1 );//八院话务数据
+        obj.put("nineTraffic", view2);//九院话务数据
         obj.put("order", reportMapper.selectRegionOrderCount(time,level,area));//工单数据
 
        return obj;
@@ -314,7 +323,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         SatisfactionView view=      reportMapper.selectSatisfaction();
         long total=view.getBasically()+ view.getDissatisfied()+ view.getSatisfied();//总数
         HashMap<String,Object> obj=new HashMap<>();
-        DecimalFormat df = new DecimalFormat("#.00");
+        DecimalFormat df = new DecimalFormat("0.00");
         obj.put("basically",view.getBasically());
         obj.put("satisfied",view.getSatisfied());
         obj.put("dissatisfied",view.getDissatisfied());