From f0d8fd0e59d409346cd228e3c4b6605f6af1f9f6 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 28 Sep 2022 17:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=A0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarFileCompareItemCommentController.java      | 5 +++--
 .../compare/service/ISarFileCompareItemCommentService.java   | 2 +-
 .../service/impl/SarFileCompareItemCommentServiceImpl.java   | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
index eea6df830..f1cebbb13 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
@@ -179,8 +179,9 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
                                   @RequestParam(name = "selectIds", required = true) String selectIds,
                                   @RequestParam(name = "includeComments", required = true) boolean includeComments,
                                   @RequestParam(name = "cut", required = true) String cut,
-                                  HttpServletResponse response,HttpServletRequest request) {
-        sarFileCompareItemCommentService.exportResXls(request,response, infoId, selectIds, includeComments, cut);
+                                  HttpServletResponse response,HttpServletRequest request,
+                                  @RequestParam(name = "comment", required = false) String comment) {
+        sarFileCompareItemCommentService.exportResXls(request,response, infoId, selectIds, includeComments, cut,comment);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java
index bdbb7e97a..796264eb9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java
@@ -67,7 +67,7 @@ public interface ISarFileCompareItemCommentService extends IService<SarFileCompa
 
 	SarFileCompareResultVO queryCompareResult(String infoId,String comment);
 
-	void exportResXls(HttpServletRequest request,HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut);
+	void exportResXls(HttpServletRequest request,HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut,String comment);
 
 	void consensusAssessment(SarFileCompareItemComment sarFileCompareItemComment);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index 4872fd1ba..d22db7247 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -187,7 +187,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     }
 
     @Override
-    public void exportResXls(HttpServletRequest request,HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut) {
+    public void exportResXls(HttpServletRequest request,HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut,String comment) {
         List<SarFileCompareItemComment> list = null;
         if (includeComments && StringUtils.isEmpty(selectIds)) {
             //只导出全文评论的情况
@@ -198,6 +198,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
             if (!StringUtils.isEmpty(selectIds)) {
                 queryWrapper.in(SarFileCompareItemComment::getId, Arrays.asList(selectIds.split(",")));
             }
+            if (ObjectUtils.isNotEmpty(comment)) {
+                queryWrapper.eq(SarFileCompareItemComment::getComment, comment);
+            }
             queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime);
             list = this.list(queryWrapper);
         }