From 6e08cd43fe2555a05736e01821666a012027b5cc Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 28 Sep 2022 16:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileCompareItemCommentController.java           |  5 +++--
 .../service/ISarFileCompareItemCommentService.java     |  2 +-
 .../impl/SarFileCompareItemCommentServiceImpl.java     | 10 +++++++---
 3 files changed, 11 insertions(+), 6 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 1db0758fb..eea6df830 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
@@ -166,8 +166,9 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
     @AutoLog(value = "文档对比信息条款评论表-查询对比结果")
     @ApiOperation(value = "文档对比信息条款评论表-查询对比结果", notes = "文档对比信息条款评论表-查询对比结果")
     @GetMapping(value = "/queryCompareResult")
-    public Result<SarFileCompareResultVO> queryCompareResult(@RequestParam(name = "infoId", required = true) String infoId) {
-        SarFileCompareResultVO res = sarFileCompareItemCommentService.queryCompareResult(infoId);
+    public Result<SarFileCompareResultVO> queryCompareResult(@RequestParam(name = "infoId", required = true) String infoId,
+                                                             @RequestParam(name = "comment", required = false) String comment) {
+        SarFileCompareResultVO res = sarFileCompareItemCommentService.queryCompareResult(infoId,comment);
         return Result.OK(res);
     }
 
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 b9f86323e..bdbb7e97a 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
@@ -65,7 +65,7 @@ public interface ISarFileCompareItemCommentService extends IService<SarFileCompa
 	 */
     List<SarFileCompareItemComment> queryList();
 
-	SarFileCompareResultVO queryCompareResult(String infoId);
+	SarFileCompareResultVO queryCompareResult(String infoId,String comment);
 
 	void exportResXls(HttpServletRequest request,HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut);
 
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 f695abd12..4872fd1ba 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
@@ -11,6 +11,7 @@ import com.jero.modules.compare.service.ISarFileCompareInfoService;
 import com.jero.modules.compare.service.ISarFileCompareItemCommentService;
 import com.jero.modules.compare.service.ISarFileCompareItemService;
 import com.jero.modules.system.util.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
 import org.apache.poi.hssf.usermodel.HSSFPatriarch;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -134,7 +135,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     }
 
     @Override
-    public SarFileCompareResultVO queryCompareResult(String infoId) {
+    public SarFileCompareResultVO queryCompareResult(String infoId,String comment) {
         SarFileCompareResultVO resultVO = new SarFileCompareResultVO();
         SarFileCompareInfo sfcInfo = sarFileCompareInfoServiceImpl.queryById(infoId);
         resultVO.setInfoId(infoId);
@@ -144,7 +145,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
         resultVO.setFileNameRight(sfcInfo.getFileNameRight());
         resultVO.setComments(sfcInfo.getComments());
 
-        List<SarFileCompareItemComment> list = queryListByInfoId(infoId);
+        List<SarFileCompareItemComment> list = queryListByInfoId(infoId,comment);
         Map<String, SarFileCompareItem> sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId);
         for (SarFileCompareItemComment sfcItemCom : list) {
             SarFileCompareItemComVO itemComVO = new SarFileCompareItemComVO();
@@ -174,8 +175,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
 
     }
 
-    public List<SarFileCompareItemComment> queryListByInfoId(String infoId) {
+    public List<SarFileCompareItemComment> queryListByInfoId(String infoId,String comment) {
         LambdaQueryWrapper<SarFileCompareItemComment> queryWrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtils.isNotEmpty(comment)) {
+            queryWrapper.eq(SarFileCompareItemComment::getComment, comment);
+        }
         queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId);
         queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime);
         List<SarFileCompareItemComment> list = this.list(queryWrapper);