From 49c1ea3648ae4b97657e1ae4bd4f65bc2c987d47 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Mon, 10 Oct 2022 15:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E5=BC=82=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compare/enums/AssessConsistencyEnum.java  | 21 +++++++++++++++++++
 .../SarFileCompareItemCommentServiceImpl.java | 13 ++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/AssessConsistencyEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/AssessConsistencyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/AssessConsistencyEnum.java
new file mode 100644
index 000000000..8e5eeeab6
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/AssessConsistencyEnum.java
@@ -0,0 +1,21 @@
+package com.jero.modules.compare.enums;
+
+public enum  AssessConsistencyEnum {
+
+    SAME("一致"),
+    DIFFERENT("差异");
+
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    AssessConsistencyEnum(String value) {
+        this.value = value;
+    }
+}
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 f0e09dab7..c833e10cd 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
@@ -7,6 +7,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.compare.entity.*;
+import com.jero.modules.compare.enums.AssessConsistencyEnum;
 import com.jero.modules.compare.mapper.SarFileCompareItemCommentMapper;
 import com.jero.modules.compare.service.ISarFileCompareInfoService;
 import com.jero.modules.compare.service.ISarFileCompareItemCommentService;
@@ -182,7 +183,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     public List<SarFileCompareItemComment> queryListByInfoId(String infoId,String comment) {
         LambdaQueryWrapper<SarFileCompareItemComment> queryWrapper = new LambdaQueryWrapper<>();
         if (ObjectUtils.isNotEmpty(comment)) {
-            queryWrapper.eq(SarFileCompareItemComment::getComment, comment);
+            if (AssessConsistencyEnum.SAME.getValue().equals(comment)) {
+                queryWrapper.eq(SarFileCompareItemComment::getComment, comment);
+            } else if (AssessConsistencyEnum.DIFFERENT.getValue().equals(comment)) {
+                queryWrapper.ne(SarFileCompareItemComment::getComment, AssessConsistencyEnum.SAME.getValue());
+            }
         }
         queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId);
         queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime);
@@ -203,7 +208,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                 queryWrapper.in(SarFileCompareItemComment::getId, Arrays.asList(selectIds.split(",")));
             }
             if (ObjectUtils.isNotEmpty(comment)) {
-                queryWrapper.eq(SarFileCompareItemComment::getComment, comment);
+                if (AssessConsistencyEnum.SAME.getValue().equals(comment)) {
+                    queryWrapper.eq(SarFileCompareItemComment::getComment, comment);
+                } else if (AssessConsistencyEnum.DIFFERENT.getValue().equals(comment)) {
+                    queryWrapper.ne(SarFileCompareItemComment::getComment, AssessConsistencyEnum.SAME.getValue());
+                }
             }
             queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime);
             list = this.list(queryWrapper);