From bc5f9e61dcda86cddcacd1b8113be13d53775289 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Sun, 24 Apr 2022 14:38:21 +0800
Subject: [PATCH] =?UTF-8?q?bug51153=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/BussDocumentLibraryEOMapper.java   |  2 +
 .../xml/BussDocumentLibraryEOMapper.xml       |  5 ++
 .../IBussDocumentLibraryEOService.java        |  2 +
 .../BussDocumentLibraryEOServiceImpl.java     |  5 ++
 .../impl/FileSplitItemsEOServiceImpl.java     | 50 +++++++++++++++++++
 5 files changed, 64 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java
index 30086c92c..686a085e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java
@@ -80,6 +80,8 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibr
 
     List<Map<String,Object>> getListBySerialNumber(@Param("serialNumbers") String serialNumbers);
 
+    List<String> getListBySerialNumberFuzzy(@Param("serialNumber") String serialNumber);
+
 
     List<Map<String,Object>> selectMapsAll(@Param("ids") String ids);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
index 409eca2c1..60f5ed897 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
@@ -61,6 +61,11 @@
         </if>
     </select>
 
+    <select id="getListBySerialNumberFuzzy" resultType="java.lang.String">
+        select id from buss_document_library
+        where serial_number like concat(concat('%',#{serialNumber}),'%')
+    </select>
+
     <!--分页-->
     <select id="selectMapsAll" resultType="java.util.LinkedHashMap">
         select * from buss_document_library
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java
index 6498f9acc..ce853f4da 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java
@@ -196,4 +196,6 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
     List<Map<String,Object>> queryListByIds(String ids);
 
     List<Map<String, Object>> getListBySerialNumber(String serialNumbers);
+
+    List<String> getListBySerialNumberFuzzy(String serialNumber);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 31a7513b6..256707f2c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -4346,6 +4346,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         return bussDocumentLibraryEOMapper.getListBySerialNumber(serialNumbers);
     }
 
+    @Override
+    public List<String> getListBySerialNumberFuzzy(String serialNumber) {
+        return bussDocumentLibraryEOMapper.getListBySerialNumberFuzzy(serialNumber);
+    }
+
     /**
      * 验证字符串是不是id
      *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index b6cd31635..a5db41d09 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -715,6 +715,56 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             } else if (FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldType)) {
                                 Double value = Double.valueOf(entry.getValue().toString());
                                 conditionSb.append(" and sar_file_split_items." + key + " =" + value);
+                            } else if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) {
+                                String value = (String) entry.getValue();
+                                if(value.contains("%")){
+                                    value = value.replace("%", "/%");
+                                }
+                                LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+                                queryWrapper.like(SysUser::getUsername, value);
+                                queryWrapper.eq(SysUser::getDelFlag, 0);
+                                List<SysUser> sysUserList = sysUserService.list(queryWrapper);
+                                if (CollectionUtil.isNotEmpty(sysUserList)) {
+                                    List<String> userIdList = sysUserList.stream().map(SysUser::getId).collect(Collectors.toList());
+                                    StringBuilder valueSb = new StringBuilder();
+                                    StringBuilder condition = new StringBuilder();
+                                    for (String valueTemp : userIdList) {
+                                        valueSb.append("'" + valueTemp + "',");
+                                        condition.append(" or sar_file_split_items." + key + " like concat(concat('%','" + valueTemp + "'),'%')");
+                                    }
+                                    condition.append(")");
+                                    String substring = valueSb.substring(0, valueSb.length() - 1);
+                                    conditionSb.append(" and (sar_file_split_items." + key + " in(" + substring + ")" + condition.toString());
+                                } else {
+                                    conditionSb.append(" and sar_file_split_items." + key + " like concat(concat('%','" + value + "'),'%')");
+                                }
+
+                            } else if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) {
+                                String value = (String) entry.getValue();
+                                if(value.contains("%")){
+                                    value = value.replace("%", "/%");
+                                }
+                                List<String> idList = documentLibraryEOService.getListBySerialNumberFuzzy(value);
+                                if (CollectionUtil.isNotEmpty(idList)) {
+                                    StringBuilder valueSb = new StringBuilder();
+                                    StringBuilder condition = new StringBuilder();
+                                    for (String valueTemp : idList) {
+                                        valueSb.append("'" + valueTemp + "',");
+                                        condition.append(" or sar_file_split_items." + key + " like concat(concat('%','" + valueTemp + "'),'%')");
+                                    }
+                                    condition.append(")");
+                                    String substring = valueSb.substring(0, valueSb.length() - 1);
+                                    conditionSb.append(" and (sar_file_split_items." + key + " in(" + substring + ")" + condition.toString());
+                                } else {
+                                    conditionSb.append(" and sar_file_split_items." + key + " like concat(concat('%','" + value + "'),'%')");
+                                }
+                            } else {
+                                // 文本框，多日期
+                                String value = (String) entry.getValue();
+                                if(value.contains("%")){
+                                    value = value.replace("%", "/%");
+                                }
+                                conditionSb.append(" and sar_file_split_items." + key + " like concat(concat('%','" + value + "'),'%')");
                             }
                         }
                     }