From b941caff404ffe2e63a898f8200d03994bc5e465 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 28 Feb 2022 17:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=B8=A6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=87=BA(=E6=A0=87=E8=AF=86),=20=20=E4=BB=A3?=
 =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

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 7977fbf59..aabed676c 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
@@ -763,27 +763,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //查询内容
         String field = " id,serial_number,title,state";
 
-        //查询条件
-        StringBuilder conditionSb = new StringBuilder("where 1 = 1");
-
-        //编码
-        String serialNumber = (String) parameter.get("serialNumber");
-
-        //标题
-        String title = (String) parameter.get("title");
-        if (StringUtils.isNotBlank(serialNumber)) {
-            conditionSb.append(" and " + "serial_number" + " like concat(concat('%','" + serialNumber + "'),'%')");
-        }
-        if (StringUtils.isNotBlank(title)) {
-            conditionSb.append(" and " + "title" + " like concat(concat('%','" + title + "'),'%')");
-        }
-
-        conditionSb.append(" order by create_time desc");
+        //需求变更,搜索条件有原来的编码和标题改为和文档库一致
+//        //查询条件
+//        StringBuilder conditionSb = new StringBuilder("where 1 = 1");
+//
+//        //编码
+//        String serialNumber = (String) parameter.get("serialNumber");
+//
+//        //标题
+//        String title = (String) parameter.get("title");
+//        if (StringUtils.isNotBlank(serialNumber)) {
+//            conditionSb.append(" and " + "serial_number" + " like concat(concat('%','" + serialNumber + "'),'%')");
+//        }
+//        if (StringUtils.isNotBlank(title)) {
+//            conditionSb.append(" and " + "title" + " like concat(concat('%','" + title + "'),'%')");
+//        }
+//
+//        conditionSb.append(" order by create_time desc");
+        //封装查询条件
+        String condition = getConditionStr(parameter);
         int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
         int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
         IPage page = new Page(pageNo, pageSize);
 
-        IPage infoPage = bussDocumentLibraryEOMapper.replacePageInfo(page, field, conditionSb.toString());
+//        IPage infoPage = bussDocumentLibraryEOMapper.replacePageInfo(page, field, conditionSb.toString());
+        IPage infoPage = bussDocumentLibraryEOMapper.replacePageInfo(page, field, condition);
 
         //数据字典
         List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
@@ -1171,7 +1175,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public void exportExcel(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
-        String flag = "file";
+        //String flag = "file"为带文件导出标识
+        String flag = (String) map.get("flag");
+//        String flag = "file";
         OutputStream os = null;
         Workbook workbook = new XSSFWorkbook();
         try {