From 6cd7d38c7fa1820e9860ea2a64790c7e74e36ab4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 26 Feb 2022 14:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?excel(=E4=B8=8D=E5=B8=A6=E6=96=87=E4=BB=B6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOController.java      |  21 +-
 .../mapper/BussDocumentLibraryEOMapper.java   |  26 +-
 .../xml/BussDocumentLibraryEOMapper.xml       |   7 +-
 .../IBussDocumentLibraryEOService.java        |  11 +-
 .../BussDocumentLibraryEOServiceImpl.java     | 777 +++++++++++-------
 5 files changed, 504 insertions(+), 338 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
index b5f7c321d..86db13d3e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
@@ -377,25 +377,8 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
      @GetMapping(value = "/exportExcel")
      public void exportExcel(@RequestParam Map<String,Object> map,
                                           HttpServletResponse response,
-                                          HttpServletRequest request) throws Exception {
-         OutputStream os = null;
-         Workbook workbook = null;
-         try {
-             String fileName = "11111";
-             response.setHeader("Content-Disposition",
-                     "attachment; filename=" + fileName);
-             response.setContentType("application/force-download");
-             // 导出所有数据
-             List<Map<String,Object>> datas = new ArrayList<>();
-             workbook = bussDocumentLibraryEOService.exportDatas(datas);
-             os = response.getOutputStream();
-             workbook.write(os);
-             os.flush();
-         } catch (IOException e) {
-             throw new JeroBootException("下载文件失败，请重试");
-         } finally {
-             IOUtils.closeQuietly(os);
-         }
+                                          HttpServletRequest request){
+         bussDocumentLibraryEOService.exportExcel(map,response,request);
      }
 
      @ApiOperation(value = "带文件导出")
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 ded38717c..155104613 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
@@ -2,14 +2,16 @@ package com.jero.modules.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 文档库信息表
  * @Author: jero-boot
- * @Date:   2022-01-21
+ * @Date: 2022-01-21
  * @Version: V1.0
  */
 public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibraryEO> {
@@ -19,6 +21,7 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibr
 
     /**
      * 分页查询
+     *
      * @param page
      * @param field
      * @param condition
@@ -26,18 +29,31 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibr
      */
     IPage getInfoPage(@Param("page") IPage page,
                       @Param("field") String field,
-                    @Param("condition") String condition);
+                      @Param("condition") String condition);
+
+
+    /**
+     * 列表查询
+     *
+     * @param
+     * @param field
+     * @param condition
+     * @return
+     */
+    List<Map<String, Object>> getInfoList(@Param("field") String field,
+                                          @Param("condition") String condition);
 
     /**
      * 代替标准分页
+     *
      * @param page
      * @param field
      * @param condition
      * @return
      */
     IPage replacePageInfo(@Param("page") IPage page,
-                      @Param("field") String field,
-                    @Param("condition") String condition);
+                          @Param("field") String field,
+                          @Param("condition") String condition);
 
 
 }
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 d5e3f050b..b58ce7379 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
@@ -32,7 +32,6 @@
         <result column="exposure_draft" property="exposureDraft" />
         <result column="datum" property="datum" />
         <result column="warn_flag" property="warnFlag" />
-        <result column="read_flag" property="readFlag" />
     </resultMap>
 
     <insert id="insertInfo">
@@ -40,10 +39,16 @@
         values (${insertValue})
     </insert>
 
+    <!--分页-->
     <select id="getInfoPage" resultType="java.util.LinkedHashMap">
         select ${field} from buss_document_library
         ${condition}
     </select>
+    <!--列表-->
+    <select id="getInfoList" resultType="java.util.LinkedHashMap">
+        select ${field} from buss_document_library
+        ${condition}
+    </select>
     <!--代替标准分页-->
     <select id="replacePageInfo" resultType="java.util.LinkedHashMap">
         select ${field} 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 f90b87d8b..4c34ccf07 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
@@ -134,7 +134,16 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
 	 */
 	void cancelSubscribe(String id);
 
-	Workbook exportDatas(List<Map<String,Object>> datas);
+
+	/**
+	 * 导出excel
+	 * @param map
+	 * @param response
+	 * @param request
+	 */
+	void exportExcel(Map<String,Object> map,
+					 HttpServletResponse response,
+					 HttpServletRequest request);
 
 	void exportZip(Map<String,Object> map,
 					   HttpServletResponse response,
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 be5f23925..8b7196c04 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
@@ -1,6 +1,5 @@
 package com.jero.modules.document.service.impl;
 
-import cn.hutool.core.util.ZipUtil;
 import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,16 +32,19 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -50,8 +52,6 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.ParseException;
@@ -67,8 +67,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import static cn.hutool.core.io.FileUtil.copyFile;
-
 /**
  * @Description: 文档库信息表
  * @Author: jero-boot
@@ -168,7 +166,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     @Override
-    public List<Map<String, Object>> queryCondition(String flag,String cut) {
+    public List<Map<String, Object>> queryCondition(String flag, String cut) {
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
         if (fieldList.size() != 0) {
             //过滤出搜索条件()
@@ -180,9 +178,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等)
             map.put("dict_field", onlCgformField.getDictField());
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
-            if(CutEnum.CN.getValue().equals(cut)){
+            if (CutEnum.CN.getValue().equals(cut)) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
-            }else{
+            } else {
                 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
             }
             list.add(map);
@@ -196,7 +194,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     @Override
-    public List<Map<String, Object>> getHeader(String flag,String cut) {
+    public List<Map<String, Object>> getHeader(String flag, String cut) {
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
         if (fieldList.size() != 0) {
             //过滤列表字段(is_show_list-->列表是否显示0否 1是)
@@ -207,9 +205,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             Map<String, Object> map = new HashMap<>();
             //字段
             String dbFieldName = onlCgformField.getDbFieldName();
-            if("serial_number".equals(dbFieldName) || "title".equals(dbFieldName)){
+            if ("serial_number".equals(dbFieldName) || "title".equals(dbFieldName)) {
                 //跳转详情的标识
-                map.put("click","true");
+                map.put("click", "true");
             }
             //单独处理发布日期和标准实施日期
             if ("issue_time".equals(onlCgformField.getDbFieldName())
@@ -217,9 +215,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 map.put("sort", "true");//列表排序标识
             }
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
-            if(CutEnum.CN.getValue().equals(cut)){
+            if (CutEnum.CN.getValue().equals(cut)) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
-            }else{
+            } else {
                 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
             }
             list.add(map);
@@ -233,7 +231,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     @Override
-    public List<Map<String, Object>> getAddForm(String flag,String cut) {
+    public List<Map<String, Object>> getAddForm(String flag, String cut) {
         OnlCgformArea onlCgformArea = new OnlCgformArea();
         onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //区域管理
@@ -250,7 +248,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
             for (OnlCgformField onlCgformField : fieldListTemp) {
                 Map<String, Object> map = new HashMap<>();
-                mapPut(cut,map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
+                mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
                 map.put("field_must_input", onlCgformField.getFieldMustInput());//区域
                 result.add(map);
             }
@@ -265,7 +263,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     @Override
-    public List<Map<String, Object>> getDocumentInfoById(String id,String cut) {
+    public List<Map<String, Object>> getDocumentInfoById(String id, String cut) {
         LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BussDocumentLibraryEO::getId, id);
         //通过id查询数据
@@ -280,7 +278,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     @Override
-    public List<Map<String, Object>> getInfoById(String id,String cut) {
+    public List<Map<String, Object>> getInfoById(String id, String cut) {
         //区域管理
         List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea());
         //字段属性
@@ -303,8 +301,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
 
         //下拉单选和下拉多选数据字典处理
-        dataList.get(0).entrySet().forEach(entry->{
-            if(fieldPullList.contains(entry.getKey())){
+        dataList.get(0).entrySet().forEach(entry -> {
+            if (fieldPullList.contains(entry.getKey())) {
                 //下拉选处理数据字典
                 dictItem(sysDictItems, entry, onlCgformFieldList);
             }
@@ -344,14 +342,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 for (OSSFile fileInfo : fileInfos) {
                                     Map<String, Object> mapNew = new HashMap<>();
                                     mapNew.put("value", fileInfo);
-                                    mapPut(cut,mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
+                                    mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
                                     resultTemp.add(mapNew);
                                 }
                             }
-                        } else if(fileInfos.size() == 1){
+                        } else if (fileInfos.size() == 1) {
                             //单个文件处理
                             map.put("value", fileInfos.get(0));
-                            mapPut(cut,map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
+                            mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
                             resultTemp.add(map);
                         }
                     }
@@ -364,7 +362,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             }
                         });
                     }
-                    mapPut(cut,map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
+                    mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
                 }
                 if (map.size() != 0) {
                     resultTemp.add(map);
@@ -376,17 +374,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         return result;
     }
 
-    private void mapPut(String cut,Map<String, Object> map, String field_show_type, String fieldShowType2, String dict_field, String dictField, String db_field_name, String dbFieldName2, String db_field_txt, String dbFieldTxt, String db_field_en_name, String dbFieldEnName, String area, String showArea) {
+    private void mapPut(String cut, Map<String, Object> map, String field_show_type, String fieldShowType2, String dict_field, String dictField, String db_field_name, String dbFieldName2, String db_field_txt, String dbFieldTxt, String db_field_en_name, String dbFieldEnName, String area, String showArea) {
         map.put(field_show_type, fieldShowType2);//类型(判断是下拉还是输入框,等等)
         map.put(dict_field, dictField);
         map.put(db_field_name, dbFieldName2);//字段
-        if(StringUtils.isNotBlank(cut)){
-            if(CutEnum.CN.getValue().equals(cut)){
+        if (StringUtils.isNotBlank(cut)) {
+            if (CutEnum.CN.getValue().equals(cut)) {
                 map.put(db_field_txt, dbFieldTxt);//字段中文名
-            }else{
+            } else {
                 map.put(db_field_txt, dbFieldEnName);//字段中文名
             }
-        }else{
+        } else {
             map.put(db_field_txt, dbFieldTxt);//字段中文名
         }
         map.put(area, showArea);//区域
@@ -467,113 +465,114 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     public void updateInfo(Map<String, Object> map) {
 
-            map.remove("cut");
-            //字段属性
-            List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
-            //时间类型字段
-            List<OnlCgformField> fieldDateList = fieldList.stream()
-                    .filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
-            //文件类型字段
-            List<OnlCgformField> fieldFileList = fieldList.stream()
-                    .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
-            //下拉单选或下拉多选
-            List<OnlCgformField> fieldPullList = fieldList.stream()
-                    .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())
-                    || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        map.remove("cut");
+        //字段属性
+        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+        //时间类型字段
+        List<OnlCgformField> fieldDateList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        //文件类型字段
+        List<OnlCgformField> fieldFileList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        //下拉单选或下拉多选
+        List<OnlCgformField> fieldPullList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())
+                        || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
 
-            String id = (String) map.get("id");
-            //通过id查询数据
-            LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(BussDocumentLibraryEO::getId, id);
-            List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper);
-            //更新log
-            updateLog(map,dataList,fieldList,fieldDateList,fieldFileList,fieldPullList);
-            //判断该条数据是否订阅
+        String id = (String) map.get("id");
+        //通过id查询数据
+        LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BussDocumentLibraryEO::getId, id);
+        List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper);
+        //更新log
+        updateLog(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList);
+        //判断该条数据是否订阅
 
 
-            //处理修改代替标准,发送通知
-            sendMessage(map,dataList);
+        //处理修改代替标准,发送通知
+        sendMessage(map, dataList);
 
 
-            //字段
-            StringBuilder fieldsBuilder = new StringBuilder();
-            //数据值
-            StringBuilder valuesBuilder = new StringBuilder();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            for (Map.Entry<String, Object> entry : map.entrySet()) {
-                String key = entry.getKey();
-                Object value = entry.getValue();
-                if (ObjectUtils.isNotEmpty(value)) {
-                    //处理修改人和修改时间
-                    if ("update_by".equals(key)) {
-                        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-                        value = sysUser.getUsername();
+        //字段
+        StringBuilder fieldsBuilder = new StringBuilder();
+        //数据值
+        StringBuilder valuesBuilder = new StringBuilder();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            if (ObjectUtils.isNotEmpty(value)) {
+                //处理修改人和修改时间
+                if ("update_by".equals(key)) {
+                    LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                    value = sysUser.getUsername();
+                }
+                List<OnlCgformField> fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList());
+                //处理时间类型
+                if (fieldDate.size() != 0) {
+                    if (ObjectUtils.isNotEmpty(value)) {
+                        value = "str_to_date('" + value + "','%Y-%m-%d %H:%i:%s')";
                     }
-                    List<OnlCgformField> fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList());
-                    //处理时间类型
-                    if (fieldDate.size() != 0) {
-                        if (ObjectUtils.isNotEmpty(value)) {
-                            value = "str_to_date('" + value + "','%Y-%m-%d %H:%i:%s')";
-                        }
-                        valuesBuilder.append(value + ",");
-                    } else {
-                        //处理文件类型
-                        List<OnlCgformField> fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList());
-                        if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) {
+                    valuesBuilder.append(value + ",");
+                } else {
+                    //处理文件类型
+                    List<OnlCgformField> fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList());
+                    if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) {
 
-                            //判断文件是否修改
-                            if(!dataList.get(0).get(key).equals(value)){
-                                String valueTemp = UUID.randomUUID().toString().replace("-", "");
-                                //修改文件表关联信息connect_id
-                                List<OSSFile> oSSFileList = new ArrayList<>();
-                                for (String fileId : value.toString().split(",")) {
-                                    OSSFile ossFile = new OSSFile();
-                                    ossFile.setId(fileId);
-                                    ossFile.setConnectId(valueTemp);
-                                    oSSFileList.add(ossFile);
-                                }
-                                iOSSFileService.updateFileInfo(oSSFileList);
-                                valuesBuilder.append("'" + valueTemp + "'" + ",");
-                            }else{
-                                valuesBuilder.append("'" + value + "'" + ",");
+                        //判断文件是否修改
+                        if (!dataList.get(0).get(key).equals(value)) {
+                            String valueTemp = UUID.randomUUID().toString().replace("-", "");
+                            //修改文件表关联信息connect_id
+                            List<OSSFile> oSSFileList = new ArrayList<>();
+                            for (String fileId : value.toString().split(",")) {
+                                OSSFile ossFile = new OSSFile();
+                                ossFile.setId(fileId);
+                                ossFile.setConnectId(valueTemp);
+                                oSSFileList.add(ossFile);
                             }
-
+                            iOSSFileService.updateFileInfo(oSSFileList);
+                            valuesBuilder.append("'" + valueTemp + "'" + ",");
                         } else {
                             valuesBuilder.append("'" + value + "'" + ",");
                         }
+
+                    } else {
+                        valuesBuilder.append("'" + value + "'" + ",");
                     }
-                    fieldsBuilder.append(key + ",");
                 }
+                fieldsBuilder.append(key + ",");
             }
-            String insertField = fieldsBuilder.substring(0, fieldsBuilder.length() - 1);
-            String insertValue = valuesBuilder.substring(0, valuesBuilder.length() - 1);
+        }
+        String insertField = fieldsBuilder.substring(0, fieldsBuilder.length() - 1);
+        String insertValue = valuesBuilder.substring(0, valuesBuilder.length() - 1);
 
-            //编辑数据采用先删除在新增的方法
-            //删除文件
-            LambdaQueryWrapper<BussDocumentLibraryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(BussDocumentLibraryEO::getId, (String) map.get("id"));
-            List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMaps(lambdaQueryWrapper);
+        //编辑数据采用先删除在新增的方法
+        //删除文件
+        LambdaQueryWrapper<BussDocumentLibraryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(BussDocumentLibraryEO::getId, (String) map.get("id"));
+        List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMaps(lambdaQueryWrapper);
 
-            List<String> connectIdList = new ArrayList<>();
-            for (OnlCgformField onlCgformField : fieldFileList) {
-                String connectId = (String) mapList.get(0).get(onlCgformField.getDbFieldName());
-                //如果文件没有修改则不用删除
-                if (StringUtils.isNotBlank(connectId) && !connectId.equals(map.get(onlCgformField.getDbFieldName()))) {
-                    connectIdList.add(connectId);
-                }
+        List<String> connectIdList = new ArrayList<>();
+        for (OnlCgformField onlCgformField : fieldFileList) {
+            String connectId = (String) mapList.get(0).get(onlCgformField.getDbFieldName());
+            //如果文件没有修改则不用删除
+            if (StringUtils.isNotBlank(connectId) && !connectId.equals(map.get(onlCgformField.getDbFieldName()))) {
+                connectIdList.add(connectId);
             }
+        }
 
-            //删除文件
-            iOSSFileService.deleteByConnectIdList(connectIdList);
-            //删除文档库数据
-            bussDocumentLibraryEOMapper.deleteById((String) map.get("id"));
-            bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
+        //删除文件
+        iOSSFileService.deleteByConnectIdList(connectIdList);
+        //删除文档库数据
+        bussDocumentLibraryEOMapper.deleteById((String) map.get("id"));
+        bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
 
 
     }
 
     /**
      * 更新log
+     *
      * @param map
      */
     private void updateLog(Map<String, Object> map,
@@ -581,9 +580,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                            List<OnlCgformField> fieldList,
                            List<OnlCgformField> fieldDateList,
                            List<OnlCgformField> fieldFileList,
-                           List<OnlCgformField> fieldPullList){
-        Map<String,Object> mapTemp = new HashMap<>();
-        mapCopy(map,mapTemp);
+                           List<OnlCgformField> fieldPullList) {
+        Map<String, Object> mapTemp = new HashMap<>();
+        mapCopy(map, mapTemp);
         //时间类型的字段
         List<String> fieldDate = fieldDateList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         //文件类型的字段
@@ -610,86 +609,86 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         }
 
         StringBuilder sb = new StringBuilder();
-        dataList.get(0).entrySet().forEach(entry ->{
+        dataList.get(0).entrySet().forEach(entry -> {
             String key = entry.getKey();
             Object value = entry.getValue();
             //字段中文名
             List<OnlCgformField> fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(key)).collect(Collectors.toList());
             String dbFieldTxt = fields.get(0).getDbFieldTxt();
-            if(value == null){
+            if (value == null) {
                 value = "";
             }
             for (Map.Entry<String, Object> entryTemp : mapTemp.entrySet()) {
                 String keyTemp = entryTemp.getKey();
                 Object valueTemp = entryTemp.getValue();
-                if(valueTemp == null){
+                if (valueTemp == null) {
                     valueTemp = "";
                 }
-                if(!"create_time".equals(key) && !"update_time".equals(key)){
-                    if(key.equals(keyTemp)){
-                        if(fieldDate.contains(key)){
+                if (!"create_time".equals(key) && !"update_time".equals(key)) {
+                    if (key.equals(keyTemp)) {
+                        if (fieldDate.contains(key)) {
                             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                            if(ObjectUtils.isNotEmpty(value)){
+                            if (ObjectUtils.isNotEmpty(value)) {
                                 value = sdf.format(value);
                             }
-                            if(ObjectUtils.isNotEmpty(valueTemp)){
+                            if (ObjectUtils.isNotEmpty(valueTemp)) {
                                 try {
                                     valueTemp = sdf.format(sdf.parse((String) valueTemp));
                                 } catch (ParseException e) {
                                 }
                             }
                             //处理时间类型字段
-                            if(ObjectUtils.isNotEmpty(value)){
-                                if(ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)){
-                                    sb.append(dbFieldTxt+"由"+value+"改为"+valueTemp+",");
-                                }else if(ObjectUtils.isEmpty(valueTemp)){
-                                    sb.append(dbFieldTxt+"由"+value+"改为空"+",");
+                            if (ObjectUtils.isNotEmpty(value)) {
+                                if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
+                                    sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
+                                } else if (ObjectUtils.isEmpty(valueTemp)) {
+                                    sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
                                 }
-                            }else{
-                                if(ObjectUtils.isNotEmpty(valueTemp)){
-                                    sb.append(dbFieldTxt+"改为"+valueTemp+",");
+                            } else {
+                                if (ObjectUtils.isNotEmpty(valueTemp)) {
+                                    sb.append(dbFieldTxt + "改为" + valueTemp + ",");
                                 }
                             }
 
-                        }else if(fieldFile.contains(key)){
+                        } else if (fieldFile.contains(key)) {
                             //处理文件类型字段
                             List<String> fileNameList = new ArrayList<>();
                             List<String> fileNameListTemp = new ArrayList<>();
                             //之前的文件
-                            if(ObjectUtils.isNotEmpty(value)){
+                            if (ObjectUtils.isNotEmpty(value)) {
                                 List<OSSFile> fileInfos = iOSSFileService.getFileInfosByConnectId((String) value);
                                 fileNameList = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.toList());
                             }
                             //修改的文件
-                            if(ObjectUtils.isNotEmpty(valueTemp)){
+                            if (ObjectUtils.isNotEmpty(valueTemp)) {
                                 List<OSSFile> fileInfosTemp = iOSSFileService.getFileInfosByConnectId((String) valueTemp);
                                 fileNameListTemp = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
                             }
 
-                            if(ObjectUtils.isNotEmpty(value)){
+                            if (ObjectUtils.isNotEmpty(value)) {
                                 boolean checkDiffrent = checkDiffrent(fileNameList, fileNameListTemp);
 
-                                if(fileNameListTemp.size() != 0 && !checkDiffrent){
-                                    sb.append(dbFieldTxt+"由"+StringUtils.join(fileNameList, ",")+"改为"+StringUtils.join(fileNameListTemp, ",")+",");
-                                }else if(fileNameListTemp.size() == 0){
-                                    sb.append(dbFieldTxt+"由"+StringUtils.join(fileNameList, ",")+"改为空"+",");
+                                if (fileNameListTemp.size() != 0 && !checkDiffrent) {
+                                    sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为" + StringUtils.join(fileNameListTemp, ",") + ",");
+                                } else if (fileNameListTemp.size() == 0) {
+                                    sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为空" + ",");
                                 }
-                            }else{
-                                if(fileNameListTemp.size() != 0){
-                                    sb.append(dbFieldTxt+"改为"+StringUtils.join(fileNameListTemp, ",")+",");
+                            } else {
+                                if (fileNameListTemp.size() != 0) {
+                                    sb.append(dbFieldTxt + "改为" + StringUtils.join(fileNameListTemp, ",") + ",");
                                 }
                             }
-                        }else{
+                        } else {
                             //其他类型
-                            if(ObjectUtils.isNotEmpty(value)){
-                                if(ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)){
-                                    sb.append(dbFieldTxt+"由"+value+"改为"+valueTemp+",");
-                                }else if(ObjectUtils.isEmpty(valueTemp)){
-                                    sb.append(dbFieldTxt+"由"+value+"改为空"+",");
+                            if (ObjectUtils.isNotEmpty(value)) {
+                                if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
+                                    sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
+                                } else if (ObjectUtils.isEmpty(valueTemp)) {
+                                    sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
                                 }
-                            }else{
-                                if(ObjectUtils.isNotEmpty(valueTemp)){
-                                    sb.append(dbFieldTxt+"改为"+valueTemp+",");
+                            } else {
+                                if (ObjectUtils.isNotEmpty(valueTemp)) {
+                                    sb.append(dbFieldTxt + "改为" + valueTemp + ",");
                                 }
                             }
                         }
@@ -697,11 +696,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
             }
         });
-        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        if(StringUtils.isNotBlank(sb)){
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (StringUtils.isNotBlank(sb)) {
             String content = sb.substring(0, sb.length() - 1);
             BussLogEO bussLogEO = new BussLogEO();
-            bussLogEO.setDocumentId((String)map.get("id"));
+            bussLogEO.setDocumentId((String) map.get("id"));
             bussLogEO.setContent(content);
             bussLogEO.setCreateBy(sysUser.getRealname());
             iBussLogEOService.add(bussLogEO);
@@ -710,24 +709,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
     /**
      * 处理修改代替标准,发送通知
+     *
      * @param map
      */
-    private void sendMessage(Map<String, Object> map,List<Map<String, Object>> dataList) {
+    private void sendMessage(Map<String, Object> map, List<Map<String, Object>> dataList) {
         //处理修改代替标准,发送通知
         //修改时前端传参
         String replaceStandard = (String) map.get("replace_standard");
-        if(dataList.size() != 0){
+        if (dataList.size() != 0) {
             //代替标准(根据id查询出来的)
             String replaceStandardTemp = (String) dataList.get(0).get("replace_standard");
 
-            if(StringUtils.isNotBlank(replaceStandardTemp) && !replaceStandard.equals(replaceStandardTemp)){
+            if (StringUtils.isNotBlank(replaceStandardTemp) && !replaceStandard.equals(replaceStandardTemp)) {
                 //需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态
                 List<String> list = Arrays.asList(replaceStandard.split(","));
                 List<String> listTemp = Arrays.asList(replaceStandardTemp.split(","));
                 List<String> listNew = list.stream().filter(e -> !listTemp.contains(e)).collect(Collectors.toList());
                 //向listNew对应的工程师发飞书通知
 
-            }else{
+            } else {
                 //向replaceStandard对应的工程师发飞书通知
 
             }
@@ -745,6 +745,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
     /**
      * 代替标准分页
+     *
      * @param parameter
      * @return
      */
@@ -760,10 +761,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         //标题
         String title = (String) parameter.get("title");
-        if(StringUtils.isNotBlank(serialNumber)){
+        if (StringUtils.isNotBlank(serialNumber)) {
             conditionSb.append(" and " + "serial_number" + " like concat(concat('%','" + serialNumber + "'),'%')");
         }
-        if(StringUtils.isNotBlank(title)){
+        if (StringUtils.isNotBlank(title)) {
             conditionSb.append(" and " + "title" + " like concat(concat('%','" + title + "'),'%')");
         }
 
@@ -781,13 +782,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         for (Object record : records) {
             Map<String, Object> record1 = (Map) record;
             for (Map.Entry<String, Object> entry : record1.entrySet()) {
-                if("state".equals(entry.getKey())){
+                if ("state".equals(entry.getKey())) {
                     //状态数据字典
                     List<SysDictItem> stateList = sysDictItems.stream()
                             .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals("state"))
                             .collect(Collectors.toList());
                     List<SysDictItem> state = stateList.stream().filter(e -> e.getItemValue().equals(entry.getValue())).collect(Collectors.toList());
-                    if(state.size() != 0){
+                    if (state.size() != 0) {
                         entry.setValue(state.get(0).getItemText());
                     }
                 }
@@ -806,7 +807,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<String> fieldListTemp = fieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         List<String> fieldListNew = new ArrayList<>();
         fieldListNew.add("id");
-        //转时间格式  case when region is null then "" else region end region
+        //转时间格式
         for (String field : fieldListTemp) {
             String fieldTemp = null;
             if ("issue_time".equals(field) || "implement_time".equals(field)) {
@@ -818,11 +819,43 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 fieldListNew.add(fieldTemp);
             }
         }
+        //封装查询条件
+        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.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition);
+
+        //数据字典
+        List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+        //下拉选处理数据字典
+        List<Map> records = infoPage.getRecords();
+        List<String> idList = new ArrayList<>();
+        for (Map record : records) {
+            Map<String, Object> record1 = (Map) record;
+            idList.add((String) record1.get("id"));
+            for (Map.Entry<String, Object> entry : record1.entrySet()) {
+                List<OnlCgformField> collect = fieldList.stream()
+                        .filter(e -> entry.getKey().equals(e.getDictField()))
+                        .collect(Collectors.toList());
+                //下拉选处理数据字典
+                dictItem(sysDictItems, entry, collect);
+            }
+        }
+        //收藏和订阅
+        collectAndSubscribe(records, idList);
+        return infoPage;
+    }
+
+
+    @NotNull
+    private String getConditionStr(Map<String, Object> parameter) {
         //查询条件
         StringBuilder conditionSb = new StringBuilder("where 1 = 1");
 
         //过滤查询条件字段类型使用
-        List<Map<String, Object>> mapList = queryCondition("1",null);
+        List<Map<String, Object>> mapList = queryCondition("1", null);
 
         //查询条件处理
         for (Map.Entry<String, Object> entry : parameter.entrySet()) {
@@ -834,7 +867,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     if (key.equals(fieldName)) {
                         //字段类型(判断是输入框还是下拉,等等)
                         String fieldType = (String) map.get("field_show_type");//字段类型
-                        if (FieldTypeEnum.TEXT.getValue().equals(fieldType)) {
+                        if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType)) {
                             //输入框
                             conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
                         } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
@@ -871,48 +904,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         } else {
             conditionSb.append(" order by create_time desc");
         }
-        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.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), conditionSb.toString());
-
-        //数据字典
-        List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
-        //下拉选处理数据字典
-        List<Map> records = infoPage.getRecords();
-        List<String> idList = new ArrayList<>();
-        for (Map record : records) {
-            Map<String, Object> record1 = (Map) record;
-            idList.add((String) record1.get("id"));
-            for (Map.Entry<String, Object> entry : record1.entrySet()) {
-                List<OnlCgformField> collect = fieldList.stream()
-                        .filter(e -> entry.getKey().equals(e.getDictField()))
-                        .collect(Collectors.toList());
-                //下拉选处理数据字典
-                dictItem(sysDictItems, entry, collect);
-            }
-        }
-        //收藏和订阅
-        collectAndSubscribe(records, idList);
-        return infoPage;
+        String condition = conditionSb.toString();
+        return condition;
     }
 
 
     /**
      * 收藏和订阅
+     *
      * @param records
      * @param idList
      */
     private void collectAndSubscribe(List<Map> records, List<String> idList) {
         //收藏
         LambdaQueryWrapper<OnlCgformCollection> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(OnlCgformCollection::getDocumentId,idList);
+        wrapper.in(OnlCgformCollection::getDocumentId, idList);
         List<OnlCgformCollection> collectList = iOnlCgformCollectionService.list(wrapper);
         List<String> collectIdList = collectList.stream().map(OnlCgformCollection::getDocumentId).collect(Collectors.toList());
         //订阅
         LambdaQueryWrapper<OnlCgformSubscribe> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId,idList);
+        lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, idList);
         List<OnlCgformSubscribe> subscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper);
         List<String> subscribeIdList = subscribeList.stream().map(OnlCgformSubscribe::getDocumentId).collect(Collectors.toList());
 
@@ -920,16 +931,16 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             Map<String, Object> record1 = (Map) record;
             String id = (String) record1.get("id");
             //收藏标识(0-->未收藏  1-->已收藏)
-            if(collectIdList.contains(id)){
-                record1.put("collectFlag","1");
-            }else{
-                record1.put("collectFlag","0");
+            if (collectIdList.contains(id)) {
+                record1.put("collectFlag", "1");
+            } else {
+                record1.put("collectFlag", "0");
             }
             //订阅标识
-            if(subscribeIdList.contains(id)){
-                record1.put("subscribeFlag","1");
-            }else{
-                record1.put("subscribeFlag","0");
+            if (subscribeIdList.contains(id)) {
+                record1.put("subscribeFlag", "1");
+            } else {
+                record1.put("subscribeFlag", "0");
             }
         }
     }
@@ -942,13 +953,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @param collect
      */
     private void dictItem(List<SysDictItem> sysDictItems, Map.Entry<String, Object> entry, List<OnlCgformField> collect) {
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         //通过dictField判断字段是否为下拉选(不为空则为下拉选)
         if (collect.size() != 0 && StringUtils.isNotBlank(collect.get(0).getDictField())) {
             String value = (String) entry.getValue();
             //数据字典中文
             List<String> dictItemsCh = new ArrayList<>();
-            if(StringUtils.isNotBlank(value)){
+            if (StringUtils.isNotBlank(value)) {
                 for (String itemValue : value.split(",")) {
                     //字段的数据字典
                     List<SysDictItem> dictItemList = sysDictItems.stream()
@@ -970,7 +981,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     }
 
 
-
     @Override
     public void addCollect(String id) {
         //收藏表中添加数据
@@ -987,11 +997,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     public void cancelCollect(String id) {
         //收藏表中删除数据
         LambdaQueryWrapper<OnlCgformCollection> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(OnlCgformCollection::getDocumentId,id);
+        lambdaQueryWrapper.in(OnlCgformCollection::getDocumentId, id);
         iOnlCgformCollectionService.remove(lambdaQueryWrapper);
         //订阅表中删除数据
         LambdaQueryWrapper<OnlCgformSubscribe> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(OnlCgformSubscribe::getDocumentId,id);
+        wrapper.in(OnlCgformSubscribe::getDocumentId, id);
         iOnlCgformSubscribeService.remove(wrapper);
 
     }
@@ -1008,14 +1018,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     public void cancelSubscribe(String id) {
         //订阅表中删除数据
         LambdaQueryWrapper<OnlCgformSubscribe> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId,id);
+        lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, id);
         iOnlCgformSubscribeService.remove(lambdaQueryWrapper);
     }
 
 
-
     /**
      * 判断两个集合元素是否完全一致
+     *
      * @param list
      * @param list1
      * @return
@@ -1023,7 +1033,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     private static boolean checkDiffrent(List<String> list, List<String> list1) {
         if (list.size() != list1.size()) {
             return false;
-        }else{
+        } else {
             for (String str : list) {
                 if (!list1.contains(str)) {
                     return false;
@@ -1033,138 +1043,280 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         return true;
     }
 
-    private static void mapCopy(Map map,Map mapResult){
-        if(map == null){
+    private static void mapCopy(Map map, Map mapResult) {
+        if (map == null) {
             return;
         }
         Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator();
-        while (iterator.hasNext()){
+        while (iterator.hasNext()) {
             Map.Entry entry = iterator.next();
             Object key = entry.getKey();
-            mapResult.put(key,map.get(key) != null ?map.get(key):"");
+            mapResult.put(key, map.get(key) != null ? map.get(key) : "");
         }
     }
 
     /**
      * 导出excel
-     * @param datas
+     *
+     * @param map
+     * @param response
+     * @param request
      */
     @Override
-    public Workbook exportDatas(List<Map<String, Object>> datas) {
+    public void exportExcel(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
+        OutputStream os = null;
         Workbook workbook = new XSSFWorkbook();
-        return workbook;
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String fileName = "文件库 " + sdf.format(new Date()) + ".xlsx";
+            response.setHeader("Content-Disposition",
+                    "attachment; filename=" + fileName);
+            response.setContentType("application/force-download");
+            //需要查询的字段
+            List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
+            //表头
+            List<String> headerFieldList = new ArrayList<>();
+            List<OnlCgformField> fieldListTemp = new ArrayList<>();
+            if (fieldList.size() != 0) {
+                //过滤掉系统默认的字段
+                fieldListTemp = fieldList.stream().filter(e -> !"id".equals(e.getDbFieldName())
+                        && !"create_by".equals(e.getDbFieldName())
+                        && !"create_time".equals(e.getDbFieldName())
+                        && !"update_by".equals(e.getDbFieldName())
+                        && !"update_time".equals(e.getDbFieldName())
+                        && !"sys_org_code".equals(e.getDbFieldName())
+                        && !"warn_flag".equals(e.getDbFieldName())).collect(Collectors.toList());
+                //只导出数据时,过滤掉文件类型
+                fieldListTemp = fieldListTemp.stream().filter(e -> !FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+                headerFieldList = fieldListTemp.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
+
+            }
+            //查询字段
+            List<String> conditionFieldList = fieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+            //查询条件
+            String condition = getConditionStr(map);
+            //导出数据(全部导出的数据)
+            List<Map<String, Object>> datas = bussDocumentLibraryEOMapper.getInfoList(" " + StringUtils.join(conditionFieldList, ","), condition);
+            //部分导出
+            String partId = (String) map.get("id");
+            if (StringUtils.isNotBlank(partId)) {
+                //部门导出的数据
+                datas = datas.stream().filter(entry -> partId.contains((String) entry.get("id"))).collect(Collectors.toList());
+            }
+            //创建工作表对象
+            Sheet sheet = workbook.createSheet();
+            // 创建头部
+            String header = StringUtils.join(headerFieldList, ",");
+            createHeader(workbook, sheet, header);
+            // 创建数据
+            createDatas(workbook, sheet, datas, header, fieldListTemp);
+
+            os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+        } catch (IOException e) {
+            throw new JeroBootException("下载文件失败，请重试");
+        } finally {
+            IOUtils.closeQuietly(os);
+        }
+
+    }
+
+    public void createDatas(Workbook workbook, Sheet sheet, List<Map<String, Object>> datas, String header, List<OnlCgformField> fieldList) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        //数据字典
+        List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+        //过滤出下拉单选和下拉多选的字段
+        List<OnlCgformField> onlCgformFieldList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())
+                        || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+
+        int i = 0;
+        for (Map<String, Object> data : datas) {
+
+            for (Map.Entry<String, Object> entry : data.entrySet()) {
+                List<OnlCgformField> collect = fieldList.stream()
+                        .filter(e -> entry.getKey().equals(e.getDictField()))
+                        .collect(Collectors.toList());
+                //下拉选处理数据字典
+                dictItem(sysDictItems, entry, collect);
+            }
+            Row row = sheet.createRow(i + 1);
+            i++;
+            int sheetNum = 0;
+            String value = "";
+            for (OnlCgformField onlCgformField : fieldList) {
+                //时间类型
+                if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
+                    if (ObjectUtils.isNotEmpty(data.get(onlCgformField.getDbFieldName()))) {
+                        value = sdf.format(data.get(onlCgformField.getDbFieldName()));
+                    }
+                } else {
+                    value = (String) data.get(onlCgformField.getDbFieldName());
+                }
+                row.createCell(sheetNum).setCellValue(value);
+                sheetNum++;
+            }
+        }
+        int a = 0;
+    }
+
+    /**
+     * 创建表头
+     *
+     * @param workbook
+     * @param sheet
+     * @param header
+     */
+    public static void createHeader(Workbook workbook, Sheet sheet, String header) {
+        CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        Row rowHeader = sheet.createRow(0);//开始创建标题行
+        if (StringUtils.isNotBlank(header)) {
+            String[] headerArr = header.split(",");
+            for (int i = 0; i < headerArr.length; i++) {
+                rowHeader.createCell(i).setCellValue(headerArr[i]);
+            }
+        }
+    }
+
+    /**
+     * 获取导出的数据
+     *
+     * @param map
+     * @return
+     */
+    public List<Map<String, Object>> getExportDatas(Map<String, Object> map) {
+        //需要查询的字段
+        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
+        if (fieldList.size() != 0) {
+            //过滤列表字段(is_show_list-->列表是否显示0否 1是)
+            fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
+        }
+        List<String> fieldListTemp = fieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+        List<String> fieldListNew = new ArrayList<>();
+        fieldListNew.add("id");
+        fieldListNew.addAll(fieldListTemp);
+        //查询条件
+        String condition = getConditionStr(map);
+        List<Map<String, Object>> infoList = bussDocumentLibraryEOMapper.getInfoList(" " + StringUtils.join(fieldListNew, ","), condition);
+        return infoList;
 
     }
 
     /**
      * 带文件导出
+     *
      * @param datas
      * @return
      */
     @Override
-    public void exportZip(Map<String,Object> map,
-                              HttpServletResponse response,
-                              HttpServletRequest request) {
-        try {
-            String fileName = "带文件导出.zip";
-            response.setHeader("Content-Disposition",
-                    "attachment; filename=" + fileName);
-            response.setContentType("application/force-download");
-            // 导出所有数据
-            List<Map<String,Object> > datas = new ArrayList<>();
+    public void exportZip(Map<String, Object> map,
+                          HttpServletResponse response,
+                          HttpServletRequest request) {
+//        try {
+//            String fileName = "带文件导出.zip";
+//            response.setHeader("Content-Disposition",
+//                    "attachment; filename=" + fileName);
+//            response.setContentType("application/force-download");
+//            // 导出所有数据
+//            List<Map<String,Object> > datas = new ArrayList<>();
+//
+//            List<String> pdfFileIdList = new ArrayList<>();
+//            //从查询的数据中,过滤出文件(根据字段类型)
+//
+//            //文件信息
+//            List<OSSFile> oSSFileList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(pdfFileIdList,","));
+//
+//            //创建临时文件夹
+//            String uuid = "";
+//            String fileNowPath = "path" + "带文件导出";
+//            File nowFile = new File(fileNowPath);
+//            if (nowFile.exists()){
+//                nowFile.delete();
+//            }
+//            nowFile.mkdirs();
 
-            List<String> pdfFileIdList = new ArrayList<>();
-            //从查询的数据中,过滤出文件(根据字段类型)
-
-            //文件信息
-            List<OSSFile> oSSFileList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(pdfFileIdList,","));
-
-            //创建临时文件夹
-            String uuid = "";
-            String fileNowPath = "path" + "带文件导出";
-            File nowFile = new File(fileNowPath);
-            if (nowFile.exists()){
-                nowFile.delete();
-            }
-            nowFile.mkdirs();
-
-            try(Workbook workbook = exportDatas(datas);
-                OutputStream excelOS = new FileOutputStream(fileNowPath + File.separator + "军品数据.xls");
-                OutputStream os = response.getOutputStream();
-            ) {
-                for (OSSFile oSSFile : oSSFileList) {
-                    //文件路径
-                    String path = oSSFile.getUrl();
-                    copyFile(path,fileNowPath+File.separator);
-                }
-
-                workbook.write(excelOS);
-                excelOS.flush();
-
-                ZipUtil.zip(fileNowPath,fileNowPath+".zip");
-                FileInputStream fis = new FileInputStream(fileNowPath+".zip");
-                int len = 0;
-                while ((len = fis.read()) != -1) {
-                    os.write(len);
-                }
-                os.flush();
-                fis.close();
-            } catch (IOException e) {
-                throw new JeroBootException("下载文件失败，请重试");
-            }finally {
-//                File file = new File(uploadFilePath + "/tempZip/" + uuid);
-//                FileUnZip.deleteDir(file);
-
-            }
-        } catch (Exception e) {
-            throw new JeroBootException("下载文件失败，请重试");
-        }
+//            try(Workbook workbook = exportDatas(datas);
+//                OutputStream excelOS = new FileOutputStream(fileNowPath + File.separator + "军品数据.xls");
+//                OutputStream os = response.getOutputStream();
+//            ) {
+//                for (OSSFile oSSFile : oSSFileList) {
+//                    //文件路径
+//                    String path = oSSFile.getUrl();
+//                    copyFile(path,fileNowPath+File.separator);
+//                }
+//
+//                workbook.write(excelOS);
+//                excelOS.flush();
+//
+//                ZipUtil.zip(fileNowPath,fileNowPath+".zip");
+//                FileInputStream fis = new FileInputStream(fileNowPath+".zip");
+//                int len = 0;
+//                while ((len = fis.read()) != -1) {
+//                    os.write(len);
+//                }
+//                os.flush();
+//                fis.close();
+//            } catch (IOException e) {
+//                throw new JeroBootException("下载文件失败，请重试");
+//            }finally {
+////                File file = new File(uploadFilePath + "/tempZip/" + uuid);
+////                FileUnZip.deleteDir(file);
+//
+//            }
+//        } catch (Exception e) {
+//            throw new JeroBootException("下载文件失败，请重试");
+//        }
     }
 
 
     /**
      * 模板下载
+     *
      * @param response
      * @param request
      */
     @Override
-    public void exportTemplate(Map<String,Object> map,HttpServletResponse response, HttpServletRequest request) {
+    public void exportTemplate(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
         OutputStream os = null;
         HSSFWorkbook workbook = new HSSFWorkbook();
         String fileOriName = "导入模板";
         String filePath = uploadpath + "/" + fileOriName;
-        try{
+        try {
             List<String> list = getWorkbookTitle((String) map.get("cut"));
             //创建临时文件夹
             File nowFile = new File(filePath);
-            if (nowFile.exists()){
+            if (nowFile.exists()) {
                 nowFile.delete();
             }
             nowFile.mkdirs();
             String fileName = "导入模板.xls";
             HSSFSheet sheet = workbook.createSheet("文档库导入模板");
             sheet.setDefaultColumnWidth(16);//列宽
-            HSSFCellStyle cellStyle =workbook.createCellStyle();
+            HSSFCellStyle cellStyle = workbook.createCellStyle();
             cellStyle.setWrapText(true);//自动换行
             cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
 
             //合并单元格
             CellRangeAddress region1 =
-                    new CellRangeAddress(1, 1, 0, Arrays.asList(list.get(0).split(",")).size()-1); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+                    new CellRangeAddress(1, 1, 0, Arrays.asList(list.get(0).split(",")).size() - 1); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
             sheet.addMergedRegion(region1);
 
             for (int i = 0; i < 2; i++) {
                 //表头
                 Row row = sheet.createRow(i);//开始创建标题行
                 String exportFieldName = list.get(i);
-                if(i==0){
+                if (i == 0) {
                     if (StringUtils.isNotBlank(exportFieldName)) {
                         String[] headerArr = exportFieldName.split(",");
                         for (int j = 0; j < headerArr.length; j++) {
                             row.createCell(j).setCellValue(headerArr[j]);
                         }
                     }
-                }else{
+                } else {
                     //说明
                     short height = (short) (Integer.parseInt(list.get(2)) * 252);
                     row.setHeight((short) height);
@@ -1175,7 +1327,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
             }
             response.setHeader("Content-Disposition",
-                    "attachment; filename=\""+ fileOriName+".xlsx");
+                    "attachment; filename=\"" + fileOriName + ".xlsx");
             response.setContentType("application/force-download");
             response.flushBuffer();
             os = response.getOutputStream();
@@ -1190,9 +1342,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
     /**
      * 获取模板下载的表头
+     *
      * @return
      */
-    private List<String> getWorkbookTitle(String cut){
+    private List<String> getWorkbookTitle(String cut) {
         List<Map<String, Object>> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut);
         StringBuilder sb = new StringBuilder();
         List<String> pullMoreList = new LinkedList<>();//多选字段
@@ -1204,34 +1357,34 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<String> dateMoreList = new LinkedList<>();//多选日期字段
         List<String> standardList = new LinkedList<>();//标准选择字段
         for (Map<String, Object> map : addForm) {
-            if("0".equals(map.get("field_must_input"))){
-                sb.append("*" + map.get("db_field_txt")+",");
-            }else{
-                sb.append(map.get("db_field_txt")+",");
+            if ("0".equals(map.get("field_must_input"))) {
+                sb.append("*" + map.get("db_field_txt") + ",");
+            } else {
+                sb.append(map.get("db_field_txt") + ",");
             }
             String fieldShowType = "field_show_type";
             //多选字段
-            if(FieldTypeEnum.PULL_MORE.getValue().equals(map.get(fieldShowType))){
+            if (FieldTypeEnum.PULL_MORE.getValue().equals(map.get(fieldShowType))) {
                 pullMoreList.add((String) map.get("db_field_txt"));
-            }else if(FieldTypeEnum.PULL_SINGLE.getValue().equals(map.get(fieldShowType))){
+            } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(map.get(fieldShowType))) {
                 //单选字段
                 pullSingleList.add((String) map.get("db_field_txt"));
-            }else if(FieldTypeEnum.FILE.getValue().equals(map.get(fieldShowType))){
+            } else if (FieldTypeEnum.FILE.getValue().equals(map.get(fieldShowType))) {
                 //文件字段
                 fileList.add((String) map.get("db_field_txt"));
-            }else if(FieldTypeEnum.TEXT_NUMBER.getValue().equals(map.get(fieldShowType))){
+            } else if (FieldTypeEnum.TEXT_NUMBER.getValue().equals(map.get(fieldShowType))) {
                 //数字输入框字段
                 textNumberList.add((String) map.get("db_field_txt"));
-            }else if(FieldTypeEnum.TEXT_STRING.getValue().equals(map.get(fieldShowType))){
+            } else if (FieldTypeEnum.TEXT_STRING.getValue().equals(map.get(fieldShowType))) {
                 //字符串输入框字段
                 textStringList.add((String) map.get("db_field_txt"));
-            }else if(FieldTypeEnum.DATE_SINGLE.getValue().equals(map.get(fieldShowType))){
+            } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(map.get(fieldShowType))) {
                 //单选日期字段
                 dateSingleList.add((String) map.get("db_field_txt"));
-            }else if(FieldTypeEnum.DATE_MORE.getValue().equals(map.get(fieldShowType))){
+            } else if (FieldTypeEnum.DATE_MORE.getValue().equals(map.get(fieldShowType))) {
                 //多选日期字段
                 dateMoreList.add((String) map.get("db_field_txt"));
-            }else if(FieldTypeEnum.STANDARD.getValue().equals(map.get(fieldShowType))){
+            } else if (FieldTypeEnum.STANDARD.getValue().equals(map.get(fieldShowType))) {
                 //标准选择字段
                 standardList.add((String) map.get("db_field_txt"));
             }
@@ -1240,43 +1393,43 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         //第二行
         StringBuilder sbTwo = new StringBuilder();
-        sbTwo.append("填写说明\n"+"1.所有带*号的字段必须填写\n");
+        sbTwo.append("填写说明\n" + "1.所有带*号的字段必须填写\n");
         int count = 2;
-        if(pullSingleList.size() != 0){
+        if (pullSingleList.size() != 0) {
             //单选
-            String pullSingle = StringUtils.join(pullSingleList,",")+"字段是单选属性,必须和系统中的对应字段选项相匹配\n";
-            sbTwo.append(count ++ +"."+pullSingle);
+            String pullSingle = StringUtils.join(pullSingleList, ",") + "字段是单选属性,必须和系统中的对应字段选项相匹配\n";
+            sbTwo.append(count++ + "." + pullSingle);
         }
 
-        if(pullMoreList.size() != 0){
+        if (pullMoreList.size() != 0) {
             //多选
-            String pullMore = StringUtils.join(pullMoreList,",")+"字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n";
-            sbTwo.append(count ++ +"."+pullMore);
+            String pullMore = StringUtils.join(pullMoreList, ",") + "字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n";
+            sbTwo.append(count++ + "." + pullMore);
         }
-        if(dateSingleList.size() != 0){
+        if (dateSingleList.size() != 0) {
             //单选日期
-            String dateSingle = StringUtils.join(dateSingleList,",")+"字段为日期,必须精确到日\n";
-            sbTwo.append(count ++ +"."+dateSingle);
+            String dateSingle = StringUtils.join(dateSingleList, ",") + "字段为日期,必须精确到日\n";
+            sbTwo.append(count++ + "." + dateSingle);
         }
-        if(textStringList.size() != 0){
+        if (textStringList.size() != 0) {
             //输入框
-            String textString = StringUtils.join(textStringList,",")+"字段为文本,填写文本内容\n";
-            sbTwo.append(count ++ +"."+textString);
+            String textString = StringUtils.join(textStringList, ",") + "字段为文本,填写文本内容\n";
+            sbTwo.append(count++ + "." + textString);
         }
-        if(standardList.size() != 0){
+        if (standardList.size() != 0) {
             //标准选择
-            String standard = StringUtils.join(standardList,",")+"字段为标准号,填写多个时采用英文或中文逗号分割\n";
-            sbTwo.append(count ++ +"."+standard);
+            String standard = StringUtils.join(standardList, ",") + "字段为标准号,填写多个时采用英文或中文逗号分割\n";
+            sbTwo.append(count++ + "." + standard);
         }
-        if(fileList.size() != 0){
+        if (fileList.size() != 0) {
             //文件
-            String file = StringUtils.join(fileList,",")+"字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
-            sbTwo.append(count ++ +"."+file);
+            String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
+            sbTwo.append(count++ + "." + file);
         }
         List<String> list = new LinkedList<>();
         list.add(title);
         list.add(sbTwo.toString());
-        list.add(count+"");
+        list.add(count + "");
         return list;
 
     }