diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/phonedialrecord/PhoneDialRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/phonedialrecord/PhoneDialRecordController.java index 2929c708..2b83608b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/phonedialrecord/PhoneDialRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/phonedialrecord/PhoneDialRecordController.java @@ -9,8 +9,7 @@ import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.phonedialrecord.PhoneDialRecord; import com.xinelu.manage.service.phonedialrecord.IPhoneDialRecordService; import com.xinelu.manage.vo.phonedialrecord.BillPhoneDialVo; -import com.xinelu.manage.vo.shortmessagesendrecord.RecordSummary; -import com.xinelu.manage.vo.shortmessagesendrecord.ShortMessageSendRecordVo; +import com.xinelu.manage.vo.phonedialrecord.PhoneRecordSummary; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -107,8 +106,8 @@ public class PhoneDialRecordController extends BaseController { @Log(title = "短信发送结果汇总", businessType = BusinessType.EXPORT) @PostMapping("/phoneSummaryExport") public void summaryExport(HttpServletResponse response, BillPhoneDialVo phoneDialRecord) { - List list = phoneDialRecordService.selectPhoneRecordSummary(phoneDialRecord); - ExcelUtil util = new ExcelUtil<>(RecordSummary.class); + List list = phoneDialRecordService.selectPhoneRecordSummary(phoneDialRecord); + ExcelUtil util = new ExcelUtil<>(PhoneRecordSummary.class); util.exportExcel(response, list, "电话拨打记录汇总"); } } \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/phonedialrecord/PhoneDialRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/phonedialrecord/PhoneDialRecordMapper.java index 16a11d9a..4f141ca5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/phonedialrecord/PhoneDialRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/phonedialrecord/PhoneDialRecordMapper.java @@ -6,7 +6,7 @@ import com.xinelu.manage.dto.phonedialrecord.PhoneDialRecordDto; import com.xinelu.manage.dto.statistics.FollowUpRateDto; import com.xinelu.manage.vo.phonedialrecord.BillPhoneDialVo; import com.xinelu.manage.vo.phonedialrecord.PhoneDialRecordVo; -import com.xinelu.manage.vo.shortmessagesendrecord.RecordSummary; +import com.xinelu.manage.vo.phonedialrecord.PhoneRecordSummary; import com.xinelu.manage.vo.statistics.PushCount; import org.apache.ibatis.annotations.Param; @@ -139,5 +139,5 @@ public interface PhoneDialRecordMapper { * @param billPhoneDialVo 时间 * @return RecordSummary */ - RecordSummary selectPhoneRecordSummary(BillPhoneDialVo billPhoneDialVo); + PhoneRecordSummary selectPhoneRecordSummary(BillPhoneDialVo billPhoneDialVo); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/IPhoneDialRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/IPhoneDialRecordService.java index 09fc1c2f..61cf5cdc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/IPhoneDialRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/IPhoneDialRecordService.java @@ -3,7 +3,7 @@ package com.xinelu.manage.service.phonedialrecord; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.phonedialrecord.PhoneDialRecord; import com.xinelu.manage.vo.phonedialrecord.BillPhoneDialVo; -import com.xinelu.manage.vo.shortmessagesendrecord.RecordSummary; +import com.xinelu.manage.vo.phonedialrecord.PhoneRecordSummary; import java.util.List; @@ -73,5 +73,5 @@ public interface IPhoneDialRecordService { * @param billPhoneDialVo 时间 * @return RecordSummary */ - List selectPhoneRecordSummary(BillPhoneDialVo billPhoneDialVo); + List selectPhoneRecordSummary(BillPhoneDialVo billPhoneDialVo); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java index 57e5c060..91a982c5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java @@ -5,7 +5,7 @@ import com.xinelu.manage.domain.phonedialrecord.PhoneDialRecord; import com.xinelu.manage.mapper.phonedialrecord.PhoneDialRecordMapper; import com.xinelu.manage.service.phonedialrecord.IPhoneDialRecordService; import com.xinelu.manage.vo.phonedialrecord.BillPhoneDialVo; -import com.xinelu.manage.vo.shortmessagesendrecord.RecordSummary; +import com.xinelu.manage.vo.phonedialrecord.PhoneRecordSummary; import com.xinelu.manage.vo.statistics.PushCount; import org.springframework.stereotype.Service; @@ -121,10 +121,10 @@ public class PhoneDialRecordServiceImpl implements IPhoneDialRecordService { * @return RecordSummary */ @Override - public List selectPhoneRecordSummary(BillPhoneDialVo billPhoneDialVo) { - RecordSummary recordSummary = phoneDialRecordMapper.selectPhoneRecordSummary(billPhoneDialVo); + public List selectPhoneRecordSummary(BillPhoneDialVo billPhoneDialVo) { + PhoneRecordSummary recordSummary = phoneDialRecordMapper.selectPhoneRecordSummary(billPhoneDialVo); recordSummary.setDateRange(billPhoneDialVo.getDialTimeStart() + "——————" + billPhoneDialVo.getDialTimeEnd()); - List recordSummaries = new ArrayList<>(); + List recordSummaries = new ArrayList<>(); recordSummaries.add(recordSummary); return recordSummaries; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/phonedialrecord/PhoneRecordSummary.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/phonedialrecord/PhoneRecordSummary.java new file mode 100644 index 00000000..6d83d7e0 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/phonedialrecord/PhoneRecordSummary.java @@ -0,0 +1,43 @@ +package com.xinelu.manage.vo.phonedialrecord; + +import com.xinelu.common.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 电话短信推送记录汇总 + */ +@Data +public class PhoneRecordSummary { + + /** + * 时间范围 + */ + @Excel(name = "时间范围") + private String dateRange; + + /** + * 总数 + */ + @Excel(name = "总数") + private Integer totalCount; + + /** + * 成功数量 + */ + @Excel(name = "成功数量") + private Integer successCount; + + /** + * 失败数量 + */ + @Excel(name = "失败数量") + private Integer failCount; + + /** + * 通话总时长 + */ + @Excel(name = "通话总时长") + private BigDecimal successDuration; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/shortmessagesendrecord/RecordSummary.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/shortmessagesendrecord/RecordSummary.java index 6055de6e..792e2694 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/shortmessagesendrecord/RecordSummary.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/shortmessagesendrecord/RecordSummary.java @@ -1,5 +1,6 @@ package com.xinelu.manage.vo.shortmessagesendrecord; +import com.xinelu.common.annotation.Excel; import lombok.Data; /** @@ -11,20 +12,24 @@ public class RecordSummary { /** * 时间范围 */ + @Excel(name = "时间范围") private String dateRange; /** * 总数 */ + @Excel(name = "发送总数") private Integer totalCount; /** * 成功数量 */ + @Excel(name = "成功数量") private Integer successCount; /** * 失败数量 */ + @Excel(name = "失败数量") private Integer failCount; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml index ba227f34..2f2f4950 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml @@ -412,7 +412,7 @@