外呼

src/main/java/com/care/common/entity/CcCallResult.java

@@ -39,6 +39,14 @@ public class CcCallResult implements Serializable {
     @TableField("called_name")
     private String calledName;
 
+    @ApiModelProperty("关系类别")
+    @TableField("relation_type_desc")
+    private String relationTypeDesc;
+
+    @ApiModelProperty("联系级别")
+    @TableField("contact_level")
+    private  Integer contactLevel;
+
     @ApiModelProperty("被呼叫人类型：1、紧急联系人，2、管家，3、老人本人，4、120")
     @TableField("called_type")
     private String calledType;

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

@@ -28,6 +28,12 @@ public class CcKoalaLog implements Serializable {
     @ApiModelProperty(dataType = "String", name = "calledName", value = "被呼叫人姓名")
     private String calledName;
 
+    @ApiModelProperty("关系类别")
+    private String relationTypeDesc;
+
+    @ApiModelProperty("联系级别")
+    private  Integer contactLevel;
+
     @ApiModelProperty(dataType = "String", name = "calledType", value = "被呼叫人类型：1、紧急联系人，2、管家，3、老人本人，4、120")
     private String calledType;
 

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

@@ -27,6 +27,13 @@ public class CcTrafficBilled implements Serializable{
     private String calledId;
     @ApiModelProperty(dataType = "String", name = "calledName", value = "被呼叫人姓名")
     private String calledName;
+
+    @ApiModelProperty("关系类别")
+    private String relationTypeDesc;
+
+    @ApiModelProperty("联系级别")
+    private  Integer contactLevel;
+
     @ApiModelProperty(dataType = "String", name = "calledType", value = "被呼叫人类型：1、紧急联系人，2、管家，3、老人本人，4、120")
     private String calledType;
     private String orderId;

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

@@ -238,6 +238,8 @@ public class KoalaOutCallBillSchuding {
             ccTrafficBilled.setOrderId(callOlderVO.getOrderId());
             ccTrafficBilled.setStationId(callOlderVO.getStationId());
             ccTrafficBilled.setCalledId(callOlderVO.getCalledId());
+            ccTrafficBilled.setRelationTypeDesc(callOlderVO.getRelationTypeDesc());
+            ccTrafficBilled.setContactLevel(callOlderVO.getContactLevel());
             ccTrafficBilled.setCalledName(callOlderVO.getCalledName());
             ccTrafficBilled.setCalledType(callOlderVO.getCalledType());
             ccTrafficBilled.setSessionId(sessionId);

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

@@ -45,6 +45,8 @@ public class KoalaOutCallServiceImpl implements KoalaOutCallService {
         domain.setOrderId(ccKoalaLog.getOrderId());
         domain.setCalledId(ccKoalaLog.getCalledId());
         domain.setCalledName(ccKoalaLog.getCalledName());
+        domain.setRelationTypeDesc(ccKoalaLog.getRelationTypeDesc());
+        domain.setContactLevel(ccKoalaLog.getContactLevel());
         domain.setCalledType(ccKoalaLog.getCalledType());
         domain.setOutDisplayNo(ccKoalaLog.getOutDisplayNo());
 

src/main/java/com/care/outcall/vo/CallOlderVO.java

@@ -40,6 +40,12 @@ public class CallOlderVO implements Serializable {
     @ApiModelProperty(dataType = "String", name = "calledId", value = "被呼叫人ID")
     private String calledId;
 
+    @ApiModelProperty("关系类别")
+    private String relationTypeDesc;
+
+    @ApiModelProperty("联系级别")
+    private  Integer contactLevel;
+
     @ApiModelProperty(dataType = "String", name = "calledName", value = "被呼叫人姓名")
     private String calledName;
 

src/main/resources/mybatis/KoalaOutCallMapper.xml

@@ -35,6 +35,12 @@
             <if test="calledName!=null and calledName!='' ">
                 called_name,
             </if>
+            <if test="relationTypeDesc!=null and relationTypeDesc!='' ">
+                relation_type_desc,
+            </if>
+            <if test="contactLevel!=null and contactLevel!='' ">
+                contact_level,
+            </if>
             <if test="calledType!=null and calledType!='' ">
                 called_type,
             </if>
@@ -96,6 +102,12 @@
             <if test="calledName!=null and calledName!='' ">
                 #{calledName},
             </if>
+            <if test="relationTypeDesc!=null and relationTypeDesc!='' ">
+                #{relationTypeDesc},
+            </if>
+            <if test="contactLevel!=null and contactLevel!='' ">
+                #{contactLevel},
+            </if>
             <if test="calledType!=null and calledType!='' ">
                 #{calledType},
             </if>
@@ -147,7 +159,9 @@
          order_id as orderId,
         called_id as calledId,
         called_name as calledName,
-         called_type as calledType,
+         relation_type_desc as relationTypeDesc,
+        contact_level as contactLevel,
+        called_type as calledType,
         phone as phone,
         tenant_id as tenantId,
         agent_id as agentId,
@@ -236,6 +250,12 @@
             <if test="calledName!=null and calledName!=''">
                 called_name,
             </if>
+            <if test="relationTypeDesc!=null and relationTypeDesc!=''">
+                relation_type_desc,
+            </if>
+            <if test="contactLevel!=null and contactLevel!=''">
+                contact_level,
+            </if>
             <if test="calledType!=null and calledType!=''">
                 called_type,
             </if>
@@ -309,6 +329,12 @@
             <if test="calledName!=null">
                 #{calledName},
             </if>
+            <if test="relationTypeDesc!=null">
+                #{relationTypeDesc},
+            </if>
+            <if test="contactLevel!=null">
+                #{contactLevel},
+            </if>
             <if test="calledType!=null">
                 #{calledType},
             </if>
@@ -381,6 +407,12 @@
             <if test="calledName!=null and calledName!='' ">
                 called_name=#{calledName},
             </if>
+            <if test="relationTypeDesc!=null and relationTypeDesc!='' ">
+                relation_type_desc=#{relationTypeDesc},
+            </if>
+            <if test="contactLevel!=null and contactLevel!='' ">
+                contact_level=#{contactLevel},
+            </if>
             <if test="calledType!=null and calledType!='' ">
                 called_type=#{calledType},
             </if>
@@ -420,6 +452,8 @@
         ckl.order_id as orderId,
         ckl.called_id as calledId,
         ckl.called_name as calledName,
+        ckl.relation_type_desc as relationTypeDesc,
+        ckl.contact_level as contactLevel,
         ckl.called_type as calledType,
         ckl.phone as phone,
         date_format(ckl.create_time, '%Y%m%d%H%i%s') createTime