his表 增加了 当前日志 所处 步骤

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -522,7 +522,7 @@ public class BmsEventOrderService {
         List<OrderHandleHisVO> result = Lists.newArrayList();
         QueryWrapper<CareEventOrderHandleHis> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("distinct org_id,station_id,house_id,order_id,log_type,order_type,log_object_id,log_object_name,log_result," +
-                "op_user_role,op_user_id,op_user_name,create_time,relation_type_desc,call_result_id,voice_call_status,voice_failure_reason").lambda().eq(CareEventOrderHandleHis::getOrderId, orderId)
+                "op_user_role,op_user_id,op_user_name,create_time,relation_type_desc,call_result_id,voice_call_status,voice_failure_reason,log_step").lambda().eq(CareEventOrderHandleHis::getOrderId, orderId)
                 .orderByDesc(CareEventOrderHandleHis::getCreateTime);
         List<CareEventOrderHandleHis> datas = this.careEventOrderHandleHisService.list(queryWrapper);
         if (CollUtil.isNotEmpty(datas)) {

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

@@ -120,13 +120,9 @@ public class CareEventOrderHandleHis implements Serializable {
     @TableField("CALL_RESULT_ID")
     private Long callResultId;
 
-    @ApiModelProperty("管家离开时，上报的文字说明")
-    @TableField("chamb_remark")
-    private String chambRemark;
-
-    @ApiModelProperty("离开时的现场照片")
-    @TableField("scene_pic")
-    private String scenePic;
+    @ApiModelProperty("日志步骤： 20：管家离开")
+    @TableField("log_step")
+    private String logStep;
 
 
 }

src/main/java/com/care/common/enums/LogStepEnum.java

@@ -0,0 +1,39 @@
+package com.care.common.enums;
+
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * @Author:java
+ * @Date: 2021/05/27
+ */
+public enum LogStepEnum {
+
+    /**
+     *
+     */
+    CHAMB_DAODA("19","管家到达"),
+    CHAMB_LIKAI("20","管家离开");
+    private String value;
+    private String name;
+    LogStepEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+    public String getValue() {
+        return value;
+    }
+
+    public static String getCodeToName(String code){
+        if (StrUtil.isEmpty(code)){
+            return null;
+        }
+        if (CHAMB_DAODA.getValue().equals(code)){
+            return  CHAMB_DAODA.name;
+        }else if (CHAMB_LIKAI.getValue().equals(code)){
+            return CHAMB_LIKAI.name;
+        }
+
+        return null;
+    }
+}

src/main/java/com/care/keeper/service/KeeperOrderApiService.java

@@ -352,6 +352,7 @@ public class KeeperOrderApiService {
             his.setOpUserId(orderChamb.getChambId());
             his.setOpUserName(orderChamb.getChambName());
             his.setCreateTime(date);
+            his.setLogStep(LogStepEnum.CHAMB_DAODA.getValue());
             his.setRelationTypeDesc(RelationTypeEnum.CHANMB.getName());
             this.careEventOrderHandleHisService.save(his);
         }
@@ -403,9 +404,8 @@ public class KeeperOrderApiService {
             his.setOpUserId(orderChamb.getChambId());
             his.setOpUserName(orderChamb.getChambName());
             his.setCreateTime(date);
-            his.setChambRemark(remark);
-            his.setScenePic(scenePic);
             his.setRelationTypeDesc(RelationTypeEnum.CHANMB.getName());
+            his.setLogStep(LogStepEnum.CHAMB_LIKAI.getValue());
             this.careEventOrderHandleHisService.save(his);
             try{
                 this.bmsEventOrderService.sendSmsToMemberAndLianxiren(orderChamb.getOrderId(),"工单完成");