From b064503b3cb9431b1ed2d766eadc25869a93a034 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Sun, 26 Sep 2021 17:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=92=E5=BA=8F=EF=BC=88?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=AB=A0=E8=8A=82=E5=8F=B7=E4=BB=8E=E5=B0=8F?=
 =?UTF-8?q?=E5=88=B0=E5=A4=A7=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkFlowController.java        | 29 +++++++++++++++----
 .../SarPublicIdeaAllController.java           |  1 +
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index 523b81e8..12b8bbcb 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -35,10 +35,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/${restPath}/lawss/activiti")
@@ -68,8 +66,29 @@ public class WorkFlowController {
         if(exportExcelEO.getFileName()==null||exportExcelEO.getFileName().trim().length()==0){
             exportExcelEO.setFileName(UUID.fastUUID().toString(true));
         }
+        List<Map<String, Object>> dataList = exportExcelEO.getDataList().stream()
+                .sorted((a,b) ->{
+                    String[] firstArray = a.get("chapterNumber").toString().split("\\.");
+                    String[] secondArray = b.get("chapterNumber").toString().split("\\.");
+                    int length=0;
+                    int length1 = firstArray.length;
+                    int length2 = secondArray.length;
 
-        Workbook excel = TableToExcel.createExcel(exportExcelEO.getColumnName(), exportExcelEO.getDataList(), null, exportExcelEO.getFileName());
+                    length=(length1<length2) ? length1: length2;
+                    for (int i = 0; i < length; i++) {
+
+                            if (firstArray[i]==secondArray[i]){
+                                continue;
+                            }else{
+                               return firstArray[i].compareTo(secondArray[i]);
+                            }
+                    }
+                    return 0;
+
+                })
+                .collect(Collectors.toList());
+
+        Workbook excel = TableToExcel.createExcel(exportExcelEO.getColumnName(), dataList, null, exportExcelEO.getFileName());
 
         response.reset();
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
index e5fd8b62..7077606a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
@@ -104,6 +104,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             if (!StringUtils.isEmpty(cid)){
                 QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
                 wrapper.eq(SarPublicIdeaAll.CID,cid);
+                wrapper.orderByAsc("part_code");
                 data=sarPublicIdeaAllDao.selectList(wrapper);
             }
             List<GetExcelDto> standExcel=new ArrayList<>();