外呼

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

@@ -35,6 +35,10 @@ public class CcCallResult implements Serializable {
     @TableField("called_id")
     private Long calledId;
 
+    @ApiModelProperty(dataType = "String", name = "calledName", value = "被呼叫人姓名")
+    @TableField("called_name")
+    private String calledName;
+
     @ApiModelProperty("被呼叫人类型：1、紧急联系人，2、管家，3、老人本人，4、120")
     @TableField("called_type")
     private String calledType;

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

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

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

@@ -25,7 +25,8 @@ public class CcTrafficBilled implements Serializable{
     private String olderId;
     @ApiModelProperty(dataType = "String", name = "calledId", value = "被呼叫人ID")
     private String calledId;
-
+    @ApiModelProperty(dataType = "String", name = "calledName", value = "被呼叫人姓名")
+    private String calledName;
     @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,7 @@ public class KoalaOutCallBillSchuding {
             ccTrafficBilled.setOrderId(callOlderVO.getOrderId());
             ccTrafficBilled.setStationId(callOlderVO.getStationId());
             ccTrafficBilled.setCalledId(callOlderVO.getCalledId());
+            ccTrafficBilled.setCalledName(callOlderVO.getCalledName());
             ccTrafficBilled.setCalledType(callOlderVO.getCalledType());
             ccTrafficBilled.setSessionId(sessionId);
             ccTrafficBilled.setTeleAgentId(agentId);

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

@@ -44,6 +44,7 @@ public class KoalaOutCallServiceImpl implements KoalaOutCallService {
         domain.setOlderId(ccKoalaLog.getOlderId());
         domain.setOrderId(ccKoalaLog.getOrderId());
         domain.setCalledId(ccKoalaLog.getCalledId());
+        domain.setCalledName(ccKoalaLog.getCalledName());
         domain.setCalledType(ccKoalaLog.getCalledType());
         domain.setOutDisplayNo(ccKoalaLog.getOutDisplayNo());
 

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

@@ -40,6 +40,9 @@ public class CallOlderVO implements Serializable {
     @ApiModelProperty(dataType = "String", name = "calledId", value = "被呼叫人ID")
     private String calledId;
 
+    @ApiModelProperty(dataType = "String", name = "calledName", value = "被呼叫人姓名")
+    private String calledName;
+
     @ApiModelProperty(dataType = "String", name = "calledType", value = "被呼叫人类型：1、紧急联系人，2、管家，3、老人本人，4、120")
     private String calledType;
 

src/main/resources/mybatis/KoalaOutCallMapper.xml

@@ -32,6 +32,9 @@
             <if test="calledId!=null and calledId!='' ">
                 called_id,
             </if>
+            <if test="calledName!=null and calledName!='' ">
+                called_name,
+            </if>
             <if test="calledType!=null and calledType!='' ">
                 called_type,
             </if>
@@ -90,6 +93,9 @@
             <if test="calledId!=null and calledId!='' ">
                 #{calledId},
             </if>
+            <if test="calledName!=null and calledName!='' ">
+                #{calledName},
+            </if>
             <if test="calledType!=null and calledType!='' ">
                 #{calledType},
             </if>
@@ -140,6 +146,7 @@
         older_id as olderId,
          order_id as orderId,
         called_id as calledId,
+        called_name as calledName,
          called_type as calledType,
         phone as phone,
         tenant_id as tenantId,
@@ -226,6 +233,9 @@
             <if test="calledId!=null and calledId!=''">
                 called_id,
             </if>
+            <if test="calledName!=null and calledName!=''">
+                called_name,
+            </if>
             <if test="calledType!=null and calledType!=''">
                 called_type,
             </if>
@@ -296,6 +306,9 @@
             <if test="calledId!=null">
                 #{calledId},
             </if>
+            <if test="calledName!=null">
+                #{calledName},
+            </if>
             <if test="calledType!=null">
                 #{calledType},
             </if>
@@ -365,6 +378,9 @@
             <if test="calledId!=null and calledId!='' ">
                 called_id=#{calledId},
             </if>
+            <if test="calledName!=null and calledName!='' ">
+                called_name=#{calledName},
+            </if>
             <if test="calledType!=null and calledType!='' ">
                 called_type=#{calledType},
             </if>
@@ -403,6 +419,7 @@
         ckl.older_id as olderId,
         ckl.order_id as orderId,
         ckl.called_id as calledId,
+        ckl.called_name as calledName,
         ckl.called_type as calledType,
         ckl.phone as phone,
         date_format(ckl.create_time, '%Y%m%d%H%i%s') createTime
@@ -419,7 +436,7 @@
          and ckl.station_id=#{stationId}
          and ckl.older_id=#{olderId}
          and ckl.called_id=#{calledId}
-          and ckl.called_type=#{calledType}
+         and ckl.called_type=#{calledType}
          and ckl.order_id=#{orderId}
          and ckl.phone=#{phone}
          order by ckl.create_time DESC