Merge branch 'dev_20241205' of ssh://gitlab.fuxicarbon.com:1111/client_service/voice-gateway-service into dev_20241205

src/core/callcenter/agent.py

@@ -96,7 +96,7 @@ class AgentEventService:
 
         # 信道发起事件，触发完成发起（或桥）&& 坐席侧
         if CHANNEL_ORIGINATE == event_name and is_agent:
-            self.push_handler.push_on_agent_work_report(saas_id, flow_id, agent_num, call_id, AgentScene.MANUAL, WorkStatus.AGENT_RINGING,phone=caller)
+            self.push_handler.push_on_agent_work_report(saas_id, flow_id, agent_num, call_id, AgentScene.MANUAL, WorkStatus.AGENT_RINGING,phone=call_info.caller)
 
         # 进度事件，外呼时对方提醒。或者入呼时提醒 && 坐席侧
         if CHANNEL_PROGRESS == event_name and is_agent:
@@ -188,7 +188,7 @@ class AgentEventService:
         # 信道发起事件，触发完成发起（或桥）&& 坐席侧
         if CHANNEL_ORIGINATE == event_name and is_agent:
             self.push_handler.push_on_call_ring(saas_id, flow_id, agent_num, AgentScene.ROBOT, call_id, ServiceDirect.ROBOT_CALL.service_direct, called, caller, human_service_id)
-            self.push_handler.push_on_agent_work_report(saas_id, flow_id, agent_num, call_id, AgentScene.ROBOT, WorkStatus.AGENT_RINGING,phone=caller)
+            self.push_handler.push_on_agent_work_report(saas_id, flow_id, agent_num, call_id, AgentScene.ROBOT, WorkStatus.AGENT_RINGING,phone=call_info.caller)
 
 
         if CHANNEL_ANSWER == event_name:

src/core/callcenter/call.py

@@ -80,7 +80,7 @@ class CallService:
         self.agent_monitor_service.update_dialing(agent_monitor)
         self.push_handler.push_on_call_ring(call_info.saas_id, flow_id=call_info.cti_flow_id, user_id=agent_id, scene=AgentScene.MANUAL, call_id=call_info.call_id, service_direct=ServiceDirect.MANUAL_CALL.service_direct)
         self.agent_actionlog_service.insert_service_state(agent_monitor, AgentServiceState.DIALING, AgentLogState.DIALING)
-        self.data_handle_server.create_record(call_info.call_id, call_info.called, call_info.call_type, service_category=0, destination=agent_id)
+        self.data_handle_server.create_record(call_info.call_id, call_info.called, call_info.call_type, service_category=0, destination=agent_id, category=1)
 
     def hold(self, call_info: CallInfo, device_id):
         devices = call_info.device_list