From 4b0de19a0c0573d85b5e1ebfe4dd5bc76bf682fc Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 25 Jun 2024 15:34:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0-=E9=80=82=E7=94=A8=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsConformityAssessmentLibrary.java            | 2 ++
 .../impl/LawsConformityAssessmentLibraryServiceImpl.java   | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
index 9beb7bbe..cf72a167 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -80,6 +81,7 @@ public class LawsConformityAssessmentLibrary implements Serializable {
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "适用市场")
+    @Dict(dicCode = "market_state")
     private String applicableMarket;
 
     @TableField(exist = false)
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
index 9d4d57f4..997f5565 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+import java.util.Arrays;
+
 import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NAME;
 import static com.jero.modules.laws.common.constant.FieldCommon.STANDARD_NUMBER;
 
@@ -38,8 +40,9 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
                 "d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
         queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()),
                 "d.standard_name", lawsConformityAssessmentLibrary.getStandardName());
-        queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket()),
-                "d.applicable_market", lawsConformityAssessmentLibrary.getApplicableMarket());
+        if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())) {
+            queryWrapper.in("d.applicable_market", Arrays.asList(lawsConformityAssessmentLibrary.getApplicableMarket().split(",")));
+        }
         queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
                 "valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
         queryWrapper.orderByDesc("cs.create_time");