Explorar el Código

产量导出时,增加按设备排序

wukai hace 3 meses
padre
commit
202f0313b1

+ 2 - 4
jjt-biz/src/main/java/com/jjt/biz/controller/ApiProdExportController.java

@@ -23,10 +23,7 @@ import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.ZoneOffset;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -63,6 +60,7 @@ public class ApiProdExportController extends BaseController {
                 Sheet sheet = wb.cloneSheet(0);
                 wb.setSheetName(wb.getSheetIndex(sheet), DateUtils.parseDateToStr("yyyy-MM-dd", entry.getKey()));
                 List<TwinCalcDay> days = entry.getValue();
+                days.sort(Comparator.comparing(TwinCalcDay::getDeviceId));
                 AtomicInteger rowNum = new AtomicInteger(2);
                 days.forEach(day -> {
                     Row row = sheet.createRow(rowNum.get());