Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 43ea24d7 31678152
Showing 2 changed files with 3 additions and 3 deletions
fw-shirasawa-dao/src/main/resources/mapper/SecretReportHistoryMapper.xml
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/SecretReportHistoryVO.java
@@ -15,8 +15,7 @@
         t1.staff_id staff_id,
         t1.staff_name staff_name,
         t1.customer_id customer_id,
-        t1.customer_id customer_id,
-        t1.customer_name customer_name,
+        ifnull(t1.customer_name, t2.customer_name) customer_name,
         t1.call_type dial_type,
         t1.call_time call_time,
         t1.call_duration call_duration,
@@ -3,6 +3,7 @@ package cn.fw.shirasawa.domain.vo;
 import cn.fw.shirasawa.domain.enums.CallTypeEnum;
 import lombok.Data;
  
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Objects;
  
@@ -58,7 +59,7 @@ public class SecretReportHistoryVO {
     /**
      * 呼叫时间
      */
-    private Date callTime;
+    private LocalDateTime callTime;
     /**
      * 通话时长
      */