小组统计返回字段添加代码提交

ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueDto.java

@@ -1,5 +1,7 @@
 package com.baiye.model.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -16,6 +18,7 @@ import java.util.List;
 @NoArgsConstructor
 public class ClueDto implements Serializable {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty(value = "姓名")
@@ -60,6 +63,7 @@ public class ClueDto implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long taskId;
 
     @ApiModelProperty(value = "组员跟进状态  0：无状态 1：进行中 2：已完成")

manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/dto/UploadTaskDTO.java

@@ -44,13 +44,13 @@ public class UploadTaskDTO implements Serializable {
     /**
      * 外呼总时长
      */
-    @ExcelProperty(value = "外呼总时长", index = 5)
+    @ExcelProperty(value = "外呼总时长(秒)", index = 5)
     private Integer breatheTotalDuration;
 
     /**
      * 平均时长
      */
-    @ExcelProperty(value = "平均通话时长", index = 6)
+    @ExcelProperty(value = "平均通话时长(秒)", index = 6)
     private Double breatheAverageDuration;
 
     @ExcelProperty(value = "标签", index = 7)

manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/vo/MemberInfoVO.java

@@ -61,13 +61,13 @@ public class MemberInfoVO {
     /**
      * 外呼总时长
      */
-    @ExcelProperty(value = "外呼总时长", index = 6)
+    @ExcelProperty(value = "外呼总时长(秒)", index = 6)
     private Integer breatheTotalDuration;
 
     /**
      * 平均时长
      */
-    @ExcelProperty(value = "平均通话时长", index = 7)
+    @ExcelProperty(value = "平均通话时长(秒)", index = 7)
     private Double breatheAverageDuration;
 
     /**

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -71,7 +71,9 @@ public class OrganizeServiceImpl implements OrganizeService {
             organize.setCreateBy(SecurityUtils.getCurrentUserId());
             Organize saveOrganize = organizeRepository.save(organize);
             //添加分机号
-            extensionNumberService.assignExtensionNum(saveOrganize.getId(), organize.getUserId());
+            if (organize.getCallMode() == 1){
+                extensionNumberService.assignExtensionNum(saveOrganize.getId(), organize.getUserId());
+            }
             // 添加小组成员信息
             OrganizeUser organizeUser = new OrganizeUser();
             organizeUser.setOrganizeId(saveOrganize.getId());
@@ -257,6 +259,7 @@ public class OrganizeServiceImpl implements OrganizeService {
         task.setBaseLabel(labelName);
         task.setIsDistribution(1);
         task.setUpdateTime(new Date());
+        task.setTaskName(organizeSaveDTO.getOrganizeTaskName());
         taskRepository.save(task);
         // 分配任务引擎
         DistributeDTO distributeDTO = new DistributeDTO();

manage/ad-platform-management/src/main/java/com/baiye/util/ExportExcelUtil.java

@@ -108,9 +108,9 @@ public class ExportExcelUtil {
         List<String> head3 = new ArrayList<>();
         head3.add("外呼接通率");
         List<String> head4 = new ArrayList<>();
-        head4.add("外呼总时长");
+        head4.add("外呼总时长(秒)");
         List<String> head5 = new ArrayList<>();
-        head5.add("平均通话时长");
+        head5.add("平均通话时长(秒)");
         headList.add(head0);
         headList.add(head1);
         headList.add(head2);