报表优化

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/ExcelUtil.java

@@ -59,6 +59,8 @@ public class ExcelUtil {
                     //设置导出excel的单元格格式为文本
                     .registerWriteHandler(new RowWriteHandlerImpl())
                     // 自定义列宽、行高
+                    .registerWriteHandler(new CustomCellWeightWeightConfig())
+                    // 自定义背景
                     .registerWriteHandler(new ExcelCustomRowStyleHandler())
                     .sheet(excelContext.sheetName()).doWrite(data);
         } catch (Exception e) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderReportRespExcelVO.java

@@ -68,7 +68,7 @@ public class WaybillOrderReportRespExcelVO implements Serializable {
     /**
      * 皮重
      */
-    @ExcelProperty(value = "毛重（吨）")
+    @ExcelProperty(value = "皮重（吨）")
     private BigDecimal tareAmount;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -1987,10 +1987,10 @@ public class WaybillOrderService {
         // 查询运单数据
         List<WaybillOrderReportResp> orderRepoost = getWaybillOrderRepoost(param);
         // 过滤
-        filter(param, orderRepoost);
+        List<WaybillOrderReportResp> filterOrderRepoost = filter(param, orderRepoost);
 
         //汇总数据
-        List<WaybillOrderReportResp> orderGroupedReportList = buildGroupedReport(orderRepoost);
+        List<WaybillOrderReportResp> orderGroupedReportList = buildGroupedReport(filterOrderRepoost);
 
         return orderGroupedReportList;
     }
@@ -2044,6 +2044,9 @@ public class WaybillOrderService {
 
         // 6.运单
         List<KwtWaybillOrder> waybillOrderList = queryWaybillOrders(param, lOrderIds);
+        if (CollectionUtils.isEmpty(waybillOrderList)) {
+            return new ArrayList<>();
+        }
         List<Long> wOrderIds = waybillOrderList.stream().map(KwtWaybillOrder::getId).collect(Collectors.toList());
         log.info("运单，size:{}", wOrderIds.size());
 
@@ -2100,7 +2103,8 @@ public class WaybillOrderService {
 
         List<KwtWaybillOrder> waybillOrderList = waybillOrderRepository.list(queryWrapper);
         if (CollectionUtils.isEmpty(waybillOrderList)) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "物流运单不存在，lOrderIds:" + JSON.toJSONString(lOrderIds));
+            log.info("物流运单不存在！，lOrderIds:{}", JSON.toJSONString(lOrderIds));
+            return new ArrayList<>();
         }
         return waybillOrderList;
     }
@@ -2284,9 +2288,9 @@ public class WaybillOrderService {
         // 查询运单数据
         List<WaybillOrderReportResp> orderRepoost = getWaybillOrderRepoost(param);
         // 过滤
-        filter(param, orderRepoost);
+        List<WaybillOrderReportResp> filterOrderRepoost = filter(param, orderRepoost);
         //汇总数据
-        List<WaybillOrderReportResp> orderGroupedReportList = buildGroupedReport(orderRepoost);
+        List<WaybillOrderReportResp> orderGroupedReportList = buildGroupedReport(filterOrderRepoost);
         return BeanUtils.copyToList(orderGroupedReportList, WaybillOrderReportRespExcelVO.class);
     }