Merge branch 'master' of http://124.70.58.209:3000/care/care-server into master

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

@@ -736,20 +736,15 @@ public class BmsEventOrderService {
         queryWrapper.lambda().eq(CareEventOrderContactStatus::getOrderId,orderId).eq(CareEventOrderContactStatus::getContactPhone,contactPhone);
         CareEventOrderContactStatus contact = this.careEventOrderContactStatusService.getOne(queryWrapper);
 
-        CareEventOrderHandleHis his = new CareEventOrderHandleHis();
-        his.setOrgId(contact.getOrgId());
-        his.setStationId(contact.getStationId());
-        his.setOrderId(contact.getOrderId());
-        his.setLogType(LogTypeEnum.OUT_CALL.getValue());
-        his.setLogObjectId(contact.getContactId());
-        his.setLogObjectName(contact.getContactName());
-        his.setLogResult(ContactorStatusEnum.getCodeToName(status));
-        his.setOpUserRole(UserRoleEnum.SEAT.getValue());
-//        his.setOpUserId(loginUser.getId());
-//        his.setOpUserName(loginUser.getName());
-        his.setCreateTime(DateUtil.date());
-        his.setRelationTypeDesc(contact.getRelationTypeDesc());
-        this.careEventOrderHandleHisService.save(his);
+
+        UpdateWrapper<CareEventOrderHandleHis> updateWrapper2 = new UpdateWrapper<>();
+        updateWrapper2.lambda().eq(CareEventOrderHandleHis::getOrderId, orderId)
+                .eq(CareEventOrderHandleHis::getLogType,LogTypeEnum.VOTICE.getValue())
+                .eq(CareEventOrderHandleHis::getLogObjectId,contact.getContactId())
+                .eq(CareEventOrderHandleHis::getLogResult,"语音通知")
+                .set(CareEventOrderHandleHis::getLogResult, String.valueOf(status));
+        this.careEventOrderHandleHisService.update(updateWrapper2);
+
         return this.careEventOrderContactStatusService.update(updateWrapper);
     }
 

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

@@ -21,9 +21,9 @@ public enum LogTypeEnum {
     KEY(4,"钥匙"),
     CHAMB(5,"管家"),
     SMS(6,"短信"),
-    VOTICE(6,"语音"),
-    WX(6,"微信"),
-    CLOSE(6,"完成工单");
+    VOTICE(7,"语音"),
+    WX(8,"微信"),
+    CLOSE(9,"完成工单");
     private Integer value;
     private String name;
     LogTypeEnum(Integer value, String name) {

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -313,7 +313,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                             his2.setOrgId(item.getOrgId());
                             his2.setStationId(item.getStationId());
                             his2.setOrderId(item.getOrderId());
-                            his2.setLogType(LogTypeEnum.SMS.getValue());
+                            his2.setLogType(LogTypeEnum.VOTICE.getValue());
                             his2.setLogObjectId(item.getContactId());
                             his2.setLogObjectName(item.getContactName());
                             his2.setLogResult("语音通知");
@@ -345,7 +345,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                             his2.setOrgId(item.getOrgId());
                             his2.setStationId(item.getStationId());
                             his2.setOrderId(item.getOrderId());
-                            his2.setLogType(LogTypeEnum.SMS.getValue());
+                            his2.setLogType(LogTypeEnum.VOTICE.getValue());
                             his2.setLogObjectId(item.getChambId());
                             his2.setLogObjectName(item.getChambName());
                             his2.setLogResult("语音通知");
@@ -640,7 +640,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                             his2.setOrgId(item.getOrgId());
                             his2.setStationId(item.getStationId());
                             his2.setOrderId(item.getOrderId());
-                            his2.setLogType(LogTypeEnum.SMS.getValue());
+                            his2.setLogType(LogTypeEnum.VOTICE.getValue());
                             his2.setLogObjectId(item.getContactId());
                             his2.setLogObjectName(item.getContactName());
                             his2.setLogResult("事件取消语音通知");
@@ -668,7 +668,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                             his2.setOrgId(item.getOrgId());
                             his2.setStationId(item.getStationId());
                             his2.setOrderId(item.getOrderId());
-                            his2.setLogType(LogTypeEnum.SMS.getValue());
+                            his2.setLogType(LogTypeEnum.VOTICE.getValue());
                             his2.setLogObjectId(item.getChambId());
                             his2.setLogObjectName(item.getChambName());
                             his2.setLogResult("事件取消语音通知");