From 0738edf675cc56e9142f0a01614eda3cbe2e7d82 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 3 Mar 2022 19:07:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--ocr=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E8=B0=83=E5=8F=96=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 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 9afd0c74a..b5289050b 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
@@ -1125,10 +1125,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 + " from oss_file of join buss_document_library bdl" + join.toString();
 
         //查询条件
-        StringBuilder conditionSb = new StringBuilder("where 1 = 1");
+        StringBuilder conditionSb = new StringBuilder("where 1 = 1 and of.file_name like '%.pdf%'");
 
         //编码
-        String serialNumber = (String) parameter.get("serialNumber");
+        String serialNumber = (String) parameter.get("serial_number");
 
         //标题
         String title = (String) parameter.get("title");

From 0a9c80c8c89bb3437a74be89272f9d1ce5688289 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 3 Mar 2022 19:10:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--ocr=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E8=B0=83=E5=8F=96=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E5=86=85=E5=AE=B9=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 b5289050b..6e1ed5deb 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
@@ -1170,7 +1170,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             .collect(Collectors.toList());
                     List<SysDictItem> state = stateList.stream().filter(e -> e.getItemValue().equals(entry.getValue())).collect(Collectors.toList());
                     if (state.size() != 0) {
-                        entry.setValue(state.get(0).getItemText());
+                        if(CutEnum.CN.getValue().equals((String) parameter.get("cut"))){
+                            entry.setValue(state.get(0).getItemText());
+                        }else{
+                            entry.setValue(state.get(0).getEnName());
+                        }
                     }
                 }
                 //添加文本信息

From 5e00619fb71276d404a83b93db18ccb3d1c1310b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 3 Mar 2022 20:18:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 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 6e1ed5deb..7b6a7e9b2 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
@@ -669,14 +669,23 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BussDocumentLibraryEO::getId, id);
         List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper);
+
+        Map<String,Object> mapTemp = new HashMap<>();
+        mapCopy(map, mapTemp);
+
+        List<Map<String,Object>> dataListTemp = new ArrayList<>();
+        for (Map<String, Object> stringObjectMap : dataList) {
+            Map<String,Object> mapT = new HashMap<>();
+            mapCopy(stringObjectMap, mapT);
+            dataListTemp.add(mapT);
+        }
+
         //更新log
         updateLog(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList,cut);
         //判断该条数据是否订阅
 
-
         //处理修改代替标准,发送通知
-        sendMessageUpdate(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList,cut);
-
+        sendMessageUpdate(mapTemp, dataListTemp, fieldList, fieldDateList, fieldFileList, fieldPullList,cut);
 
         //字段
         StringBuilder fieldsBuilder = new StringBuilder();
@@ -851,7 +860,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 }
                             } else {
                                 if (ObjectUtils.isNotEmpty(valueTemp)) {
-                                    sb.append(dbFieldTxt + "改为" + valueTemp + ",");
+                                    sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
                                 }
                             }
 
@@ -880,7 +889,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 }
                             } else {
                                 if (fileNameListTemp.size() != 0) {
-                                    sb.append(dbFieldTxt + "改为" + StringUtils.join(fileNameListTemp, ",") + ",");
+                                    sb.append(dbFieldTxt + "由空改为" + StringUtils.join(fileNameListTemp, ",") + ",");
                                 }
                             }
                         } else {
@@ -901,7 +910,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 }
                             } else {
                                 if (ObjectUtils.isNotEmpty(valueTemp)) {
-                                    sb.append(dbFieldTxt + "改为" + valueTemp + ",");
+                                    sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
                                 }
                             }
                         }