From 050d5d63096e06fe00ecc0a489e4ad3814ddcf44 Mon Sep 17 00:00:00 2001 From: yqy Date: Mon, 21 Feb 2022 15:21:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=BB=9F=E8=AE=A1=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/baiye/model/dto/ClueDto.java | 4 ++++ .../com/baiye/modules/report/entity/dto/UploadTaskDTO.java | 4 ++-- .../com/baiye/modules/report/entity/vo/MemberInfoVO.java | 4 ++-- .../modules/system/service/impl/OrganizeServiceImpl.java | 5 ++++- .../src/main/java/com/baiye/util/ExportExcelUtil.java | 4 ++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueDto.java b/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueDto.java index 4ef926fb..faa69292 100644 --- a/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueDto.java +++ b/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：已完成") diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/dto/UploadTaskDTO.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/dto/UploadTaskDTO.java index d15f1dd8..7784db7d 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/dto/UploadTaskDTO.java +++ b/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) diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/vo/MemberInfoVO.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/vo/MemberInfoVO.java index eb7f0517..cfb5700d 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/report/entity/vo/MemberInfoVO.java +++ b/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; /** diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java index 79b63388..a362dcc8 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java +++ b/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(); diff --git a/manage/ad-platform-management/src/main/java/com/baiye/util/ExportExcelUtil.java b/manage/ad-platform-management/src/main/java/com/baiye/util/ExportExcelUtil.java index 1b3848a3..e851e968 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/util/ExportExcelUtil.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/util/ExportExcelUtil.java @@ -108,9 +108,9 @@ public class ExportExcelUtil { List head3 = new ArrayList<>(); head3.add("外呼接通率"); List head4 = new ArrayList<>(); - head4.add("外呼总时长"); + head4.add("外呼总时长(秒)"); List head5 = new ArrayList<>(); - head5.add("平均通话时长"); + head5.add("平均通话时长(秒)"); headList.add(head0); headList.add(head1); headList.add(head2);