外呼

src/main/java/com/care/outcall/entity/KoalaLogDomain.java

@@ -25,6 +25,9 @@ public class KoalaLogDomain implements Serializable {
     @ApiModelProperty(dataType = "String", name = "contactId", value = "联系人id")
     private String contactId;
 
+    @ApiModelProperty(dataType = "String", name = "contactId", value = "事件工单ID")
+    private String orderId;
+
     @ApiModelProperty(dataType = "String", name = "phone", value = "被叫号码")
     private String phone;
 

src/main/java/com/care/outcall/entity/KoalaOlderDto.java

@@ -40,7 +40,10 @@ public class KoalaOlderDto implements Serializable {
      * 机构ID
      */
     private String contactId;
-
+    /**
+     * 事件工单ID
+     */
+    private String orderId;
     /**
      * 创建时间
      */

src/main/java/com/care/outcall/entity/KoalaOutCallBill.java

@@ -23,6 +23,7 @@ public class KoalaOutCallBill implements Serializable{
     private String stationId;
     private String olderId;
     private String contactId;
+    private String orderId;
     //'呼叫号码
     private String phone;
     //接通状态:{电信：以客户接通为准取1，其他取2},{联通：PCS000.已拨通电话，,PCS001.未获取,PCS002.已获取,PCS003.获取失败}',

src/main/java/com/care/outcall/schedule/KoalaOutCallBillSchuding.java

@@ -234,7 +234,8 @@ public class KoalaOutCallBillSchuding {
             koalaOutCallBill.setAudioUrl(audioUrl);
             koalaOutCallBill.setOutCallRadioStatus("2");//录件获取状态。1未获取，2已获取
             koalaOutCallBill.setOlderId(koalaOlderDto.getOlderId());
-            koalaOutCallBill.setStationId(koalaOlderDto.getOlderId());
+            koalaOutCallBill.setOrderId(koalaOlderDto.getOrderId());
+            koalaOutCallBill.setStationId(koalaOlderDto.getStationId());
             koalaOutCallBill.setContactId(koalaOlderDto.getContactId());
             koalaOutCallBill.setSessionId(sessionId);
             koalaOutCallBill.setTeleAgentId(agentId);

src/main/java/com/care/outcall/service/impl/KoalaOutCallServiceImpl.java

@@ -42,6 +42,7 @@ public class KoalaOutCallServiceImpl implements KoalaOutCallService {
         domain.setOrgId(koalaLogDomain.getOrgId());
         domain.setStationId(koalaLogDomain.getStationId());
         domain.setOlderId(koalaLogDomain.getOlderId());
+        domain.setOrderId(koalaLogDomain.getOrderId());
         domain.setContactId(koalaLogDomain.getContactId());
 
         domain.setOutDisplayNo(koalaLogDomain.getOutDisplayNo());

src/main/resources/mybatis/KoalaOutCallMapper.xml

@@ -26,6 +26,9 @@
             <if test="olderId!=null and olderId!='' ">
                 older_id,
             </if>
+            <if test="orderId!=null and orderId!='' ">
+                order_id,
+            </if>
             <if test="contactId!=null and contactId!='' ">
                 contact_id,
             </if>
@@ -78,6 +81,9 @@
             <if test="olderId!=null and olderId!='' ">
                 #{olderId},
             </if>
+            <if test="orderId!=null and orderId!='' ">
+                #{orderId},
+            </if>
             <if test="contactId!=null and contactId!='' ">
                 #{contactId},
             </if>
@@ -126,6 +132,7 @@
         org_id as orgId,
         station_id as stationId,
         older_id as olderId,
+         order_id as orderId,
         contact_id as contactId,
         phone as phone,
         tenant_id as tenantId,
@@ -167,7 +174,9 @@
             <if test="olderId!=null and olderId!='' ">
                 older_id,
             </if>
-
+            <if test="orderId!=null and orderId!='' ">
+                order_id,
+            </if>
             <if test="sessionId!=null and sessionId!='' ">
                 session_id,
             </if>
@@ -232,7 +241,9 @@
             <if test="olderId!=null and olderId!='' ">
                 #{olderId},
             </if>
-
+            <if test="orderId!=null and orderId!='' ">
+                #{orderId},
+            </if>
             <if test="sessionId!=null and sessionId!='' ">
                 #{sessionId},
             </if>
@@ -329,6 +340,9 @@
             <if test="olderId!=null and olderId!='' ">
                 older_id=#{olderId},
             </if>
+            <if test="orderId!=null and orderId!='' ">
+                order_id=#{orderId},
+            </if>
             <if test="orgId!=null and orgId!='' ">
                 org_id=#{orgId},
             </if>
@@ -370,6 +384,7 @@
         distinct ckl.session_id as sessionId,
         ckl.org_id as orgId,
         ckl.older_id as olderId,
+          ckl.order_id as orderId,
          ckl.contact_id as contactId,
         ckl.phone as phone,
         date_format(ckl.create_time, '%Y%m%d%H%i%s') createTime