diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java index 6b63b23f..3f15911e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java @@ -180,9 +180,9 @@ public class CasesRecommendApi extends ApiBaseController { * @return * @throws Exception */ - @GetMapping("/info_download") - public void infoDownload(String casesRecommendId, HttpServletResponse response) { - if (StringUtils.isEmpty(casesRecommendId)) { + @PostMapping("/info_download") + public void infoDownload(@RequestBody CasesRecommendVo vo, HttpServletResponse response) { + if (StringUtils.isEmpty(vo.getCasesRecommendId())) { throw new RuntimeException("缺少必要参数"); } @@ -198,24 +198,24 @@ public class CasesRecommendApi extends ApiBaseController { map.put("首次查看时间","readStartTime"); map.put("总查看时间","totalReadTime"); - CasesRecommend casesRecommend = iCasesRecommendService.findById(casesRecommendId); + CasesRecommend casesRecommend = iCasesRecommendService.findById(vo.getCasesRecommendId()); // 拿取表格里需要的数据 - List recordList = iCasesRecommendPushRecordService.findAllByRecommendId(casesRecommendId); + List recordList = iCasesRecommendPushRecordService.findAllByRecommendId(vo.getCasesRecommendId()); List exportVos = new ArrayList<>(); if (CollectionUtil.isNotEmpty(recordList)) { exportVos = recordList.stream().map(record -> { - CasesRecommendPushRecordExportVo vo = new CasesRecommendPushRecordExportVo(); - vo.setCaseTitle(record.getCaseTitle()); - vo.setPushUserName(record.getPushUserName()); - vo.setRecommendOrgName(casesRecommend.getRecommendOrgName()); - vo.setPushTime(DateUtil.formatDateTime(record.getPushTime())); - vo.setReadFlag(record.getReadFlag() == 1 ? "是" : "否"); - vo.setReadStartTime(DateUtil.formatDateTime(record.getReadStartTime())); + CasesRecommendPushRecordExportVo exportVo = new CasesRecommendPushRecordExportVo(); + exportVo.setCaseTitle(record.getCaseTitle()); + exportVo.setPushUserName(record.getPushUserName()); + exportVo.setRecommendOrgName(casesRecommend.getRecommendOrgName()); + exportVo.setPushTime(DateUtil.formatDateTime(record.getPushTime())); + exportVo.setReadFlag(record.getReadFlag() == 1 ? "是" : "否"); + exportVo.setReadStartTime(DateUtil.formatDateTime(record.getReadStartTime())); if (ObjectUtil.isNotEmpty(record.getReadStartTime()) && ObjectUtil.isNotEmpty(record.getReadEndTime())){ - vo.setTotalReadTime(DateUtil.formatBetween(record.getReadStartTime(), record.getReadEndTime())); + exportVo.setTotalReadTime(DateUtil.formatBetween(record.getReadStartTime(), record.getReadEndTime())); } - return vo; + return exportVo; }).collect(Collectors.toList()); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java index 1d0ba10e..5b8d3103 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java @@ -9,6 +9,8 @@ import java.util.List; @Data public class CasesRecommendVo extends Pagination { + private String casesRecommendId; + /** 推荐人姓名 */ private String recommendName;