From c8dec7bd82e6710eb02cf9ed864b61bd70dcb81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 29 Aug 2024 19:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0es=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/home/service/impl/LawsHomeSearchServiceImpl.java   | 4 ++--
 .../jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java   | 6 ++++++
 .../split/service/impl/FileSplitItemsEOServiceImpl.java     | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index 4103d4e3..42b61b72 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -237,8 +237,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                 ss.append("  ");
             }
             String str = ss.toString();
-            select.append(" LENGTH(standard_name) - LENGTH(REPLACE(standard_name, '").append(searchContent[i])
-                    .append("',").append(" '").append(str).append("')) ");
+            select.append(" ABS(LENGTH(standard_name) - LENGTH(REPLACE(standard_name, '").append(searchContent[i])
+                    .append("',").append(" '").append(str).append("'))) ");
             if(i != searchContent.length - 1){
                 regexp.append("|");
                 select.append("+");
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java
index bc6d4a59..56fed540 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java
@@ -112,4 +112,10 @@ public class LawsHomeNormalSearchVO implements Serializable {
      * 入库时间
      */
     private Date createTime;
+
+
+    /**
+     * 排序
+     */
+    private String sortIndex;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index e893673d..5ef92fc5 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -2634,12 +2634,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         continue;
                     }
                     String cellValue = null;
-                    String stringCellValue = cell.getStringCellValue();
                     if (!(CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell))) {
                         //设置单元格类型
                         if (y == 0){
                             // 条文号精度丢失问题
                             try {
+                                String stringCellValue = cell.getStringCellValue();
                                 if (StringUtils.isNotBlank(stringCellValue)){
                                     double numericCellValue = cell.getNumericCellValue();
                                     BigDecimal bigDecimal = BigDecimal.valueOf(numericCellValue);
@@ -2669,6 +2669,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
                             cellValue = df.format(d);
                         }else {
+                            String stringCellValue = cell.getStringCellValue();
                             cellValue = stringCellValue;
                         }
                     }