From 7e911c6311d77f680937f84705afef4096bd78e4 Mon Sep 17 00:00:00 2001
From: wangwenchao <wenchaowangcard@163.com>
Date: Mon, 26 Jun 2023 17:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=88=E4=BE=8B=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E6=A8=A1=E5=9D=97=E4=BF=A1=E6=81=AF=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9C=AApost=E8=AF=B7=E6=B1=82=E5=B9=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8B=E8=BD=BD=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/boecase/api/CasesRecommendApi.java | 28 +++++++++----------
 .../module/boecase/vo/CasesRecommendVo.java   |  2 ++
 2 files changed, 16 insertions(+), 14 deletions(-)

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<CasesRecommendPushRecord> recordList = iCasesRecommendPushRecordService.findAllByRecommendId(casesRecommendId);
+            List<CasesRecommendPushRecord> recordList = iCasesRecommendPushRecordService.findAllByRecommendId(vo.getCasesRecommendId());
             List<CasesRecommendPushRecordExportVo> 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;