外呼

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

@@ -64,6 +64,10 @@ public class CcCallResult implements Serializable {
     @TableField("STATION_ID")
     private Long stationId;
 
+    @ApiModelProperty("房屋ID")
+    @TableField("house_id")
+    private Long houseId;
+
     @ApiModelProperty("被监护人ID")
     @TableField("older_id")
     private Long olderId;

src/main/java/com/care/common/vo/outcall/CcCallResultVO.java

@@ -55,6 +55,8 @@ public class CcCallResultVO implements Serializable {
     @ApiModelProperty("被监护人ID")
     private Long olderId;
 
+    @ApiModelProperty("房屋ID")
+    private Long houseId;
 
     @ApiModelProperty("事件工单ID")
     private Long orderId;

src/main/java/com/care/outcall/controller/KoalaOutCallController.java

@@ -87,6 +87,7 @@ public class KoalaOutCallController {
             CcKoalaLog ccKoalaLog = new CcKoalaLog();
             ccKoalaLog.setOrgId(ccCallResult.getOrgId().toString());
             ccKoalaLog.setStationId(ccCallResult.getStationId().toString());
+            ccKoalaLog.setHouseId(ccCallResult.getHouseId().toString());
             ccKoalaLog.setOlderId(ccCallResult.getOlderId().toString());
             ccKoalaLog.setOrderId(ccCallResult.getOrderId().toString());
             ccKoalaLog.setCalledId(ccCallResult.getCalledId().toString());

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

@@ -19,6 +19,9 @@ public class CcKoalaLog implements Serializable {
     @ApiModelProperty(dataType = "String", name = "stationId", value = "服务站ID")
     private String stationId;
 
+    @ApiModelProperty("房屋ID")
+    private String houseId;
+
     @ApiModelProperty(dataType = "String", name = "olderId", value = "被监护人ID")
     private String olderId;
 

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

@@ -22,6 +22,8 @@ public class CcTrafficBilled implements Serializable{
     private Date updateTime;
     private String orgId;
     private String stationId;
+    @ApiModelProperty("房屋ID")
+    private String houseId;
     private String olderId;
     @ApiModelProperty(dataType = "String", name = "calledId", value = "被呼叫人ID")
     private String calledId;

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

@@ -238,6 +238,7 @@ public class KoalaOutCallBillSchedule {
             ccTrafficBilled.setOrderId(callOlderVO.getOrderId());
             ccTrafficBilled.setStationId(callOlderVO.getStationId());
             ccTrafficBilled.setCalledId(callOlderVO.getCalledId());
+            ccTrafficBilled.setHouseId(callOlderVO.getHouseId());
             ccTrafficBilled.setRelationTypeDesc(callOlderVO.getRelationTypeDesc());
             ccTrafficBilled.setContactLevel(callOlderVO.getContactLevel());
             ccTrafficBilled.setCalledName(callOlderVO.getCalledName());

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.setHouseId(ccKoalaLog.getHouseId());
         domain.setCalledName(ccKoalaLog.getCalledName());
         domain.setRelationTypeDesc(ccKoalaLog.getRelationTypeDesc());
         domain.setContactLevel(ccKoalaLog.getContactLevel());

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("房屋ID")
+    private String houseId;
+
     @ApiModelProperty("关系类别")
     private String relationTypeDesc;
 

src/main/resources/mybatis/CcCallResultMapper.xml

@@ -11,6 +11,7 @@
         t.org_id as orgId,
         t.station_id as stationId,
         t.older_id as olderId,
+        t.house_id as houseId,
         t.order_id as orderId,
         t.session_id as sessionId,
         t.call_status as callStatus,

src/main/resources/mybatis/KoalaOutCallMapper.xml

@@ -23,6 +23,9 @@
             <if test="stationId!=null and stationId!='' ">
                 station_id,
             </if>
+            <if test="houseId!=null and houseId!='' ">
+                house_id,
+            </if>
             <if test="olderId!=null and olderId!='' ">
                 older_id,
             </if>
@@ -90,6 +93,9 @@
             <if test="stationId!=null and stationId!='' ">
                 #{stationId},
             </if>
+            <if test="houseId!=null and houseId!='' ">
+                #{houseId},
+            </if>
             <if test="olderId!=null and olderId!='' ">
                 #{olderId},
             </if>
@@ -155,11 +161,12 @@
         id,
         org_id as orgId,
         station_id as stationId,
+        house_id as houseId,
         older_id as olderId,
-         order_id as orderId,
+        order_id as orderId,
         called_id as calledId,
         called_name as calledName,
-         relation_type_desc as relationTypeDesc,
+        relation_type_desc as relationTypeDesc,
         contact_level as contactLevel,
         called_type as calledType,
         phone as phone,
@@ -244,6 +251,9 @@
             <if test="stationId!=null and stationId!=''">
                 station_id,
             </if>
+            <if test="houseId!=null and houseId!=''">
+                house_id,
+            </if>
             <if test="calledId!=null and calledId!=''">
                 called_id,
             </if>
@@ -323,6 +333,9 @@
             <if test="stationId!=null">
                 #{stationId},
             </if>
+            <if test="houseId!=null">
+                #{houseId},
+            </if>
             <if test="calledId!=null">
                 #{calledId},
             </if>
@@ -401,6 +414,9 @@
             <if test="stationId!=null and stationId!='' ">
                 station_id=#{stationId},
             </if>
+            <if test="houseId!=null and houseId!='' ">
+                house_id=#{houseId},
+            </if>
             <if test="calledId!=null and calledId!='' ">
                 called_id=#{calledId},
             </if>
@@ -448,6 +464,7 @@
         distinct ckl.session_id as sessionId,
         ckl.org_id as orgId,
         ckl.station_id as stationId,
+        ckl.house_id as houseId,
         ckl.older_id as olderId,
         ckl.order_id as orderId,
         ckl.called_id as calledId,
@@ -468,6 +485,7 @@
         where
          ckl.org_id=#{orgId}
          and ckl.station_id=#{stationId}
+         and ckl.house_id=#{houseId}
          and ckl.older_id=#{olderId}
          and ckl.called_id=#{calledId}
          and ckl.called_type=#{calledType}