From eea8b0a2781a5a85ddb3b49869c4e16abcc8c333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 4 Jul 2024 20:30:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=BA=93=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsMarketStandardDetail.java      |  1 +
 .../impl/LawsMarketStandardServiceImpl.java   | 38 ++++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
index dc092ee1..99e06ae6 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
@@ -127,6 +127,7 @@ public class LawsMarketStandardDetail implements Serializable {
      */
     @Excel(name = "国家/地区", width = 15,dicCode = "market_state")
     @ApiModelProperty(value = "国家")
+    @Dict(dicCode = "market_state")
     private String country;
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index ba2df6e5..36165368 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -27,6 +27,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -77,8 +78,14 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
 
     @Override
     public IPage<LawsMarketStandard> queryPage(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) {
-        QueryWrapper<LawsMarketStandard> queryWrapper = new QueryWrapper<>();
         Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
+        return marketStandardMapper.queryByPage(page, queryWrapper);
+    }
+
+    @NotNull
+    private QueryWrapper<LawsMarketStandard> getLawsMarketStandardQueryWrapper(LawsMarketStandard marketStandard) {
+        QueryWrapper<LawsMarketStandard> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestNo()),
                 "ms.manifest_no", marketStandard.getManifestNo());
         queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestName()),
@@ -94,12 +101,21 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
                 }
             });
         }
-        queryWrapper.eq(StringUtils.isNotBlank(marketStandard.getDrivePosition()),
-                "ms.drive_position", marketStandard.getDrivePosition());
+        if (StringUtils.isNotBlank(marketStandard.getDrivePosition())) {
+            String[] str = marketStandard.getDrivePosition().split(",");
+            queryWrapper.and(i->{
+                for (int i1 = 0; i1 < str.length; i1++) {
+                    i.like("ms.drive_position", str[i1]);
+                    if(i1 != str.length - 1){
+                        i.or();
+                    }
+                }
+            });
+        }
         queryWrapper.like(StringUtils.isNotBlank(marketStandard.getAuthor()),
                 "CONCAT(u.realname, '(', u.username, ')')", marketStandard.getAuthor());
         queryWrapper.orderByDesc("ms.create_time");
-        return marketStandardMapper.queryByPage(page, queryWrapper);
+        return queryWrapper;
     }
 
     @Override
@@ -182,19 +198,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
 
     @Override
     public ModelAndView export(HttpServletResponse response, LawsMarketStandard marketStandard, String fileName, String sheetName, HttpServletRequest req) {
-        QueryWrapper<LawsMarketStandard> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestNo()),
-                "ms.manifest_no", marketStandard.getManifestNo());
-        queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestName()),
-                "ms.manifest_name", marketStandard.getManifestName());
-        if (StringUtils.isNotBlank(marketStandard.getCountry())) {
-            queryWrapper.in("ms.country", Arrays.asList(marketStandard.getCountry().split(",")));
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(marketStandard.getDrivePosition()),
-                "ms.drive_position", marketStandard.getDrivePosition());
-        queryWrapper.like(StringUtils.isNotBlank(marketStandard.getAuthor()),
-                "CONCAT(u.realname, '(', u.username, ')')", marketStandard.getAuthor());
-        queryWrapper.orderByDesc("ms.create_time");
+        QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
         List<LawsMarketStandard> listLawsMarketStandard = marketStandardMapper.queryByPage(queryWrapper);
         if(!CollectionUtils.isEmpty(listLawsMarketStandard)){
             for (LawsMarketStandard lawsMarketStandard : listLawsMarketStandard) {