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> 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 if (!StringUtils.isEmpty(cid)){ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(SarPublicIdeaAll.CID,cid); + wrapper.orderByAsc("part_code"); data=sarPublicIdeaAllDao.selectList(wrapper); } List standExcel=new ArrayList<>();