Merge branch 'v20.9_settlement_20240805' into dev

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -183,6 +183,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     UNLOAD_TIME_BEFORE_ARRIVE_RECEIVE_TIME(2106, "交货时间不可早于到达目的地时间"),
     UNLOAD_TIME_AFTER_NOW(2107, "交货时间不可晚于当前时间"),
     UNLOAD_TIME_AFTER_FIRST_UNLOAD_TIME(2108, "交货时间不可晚于首次提交时间"),
+
+    SETTLEMENT_NO_NULL_ERROR(2109, "请选择需要下载的数据"),
     ;
     private final int code;
     private final String msg;

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerDetailController.java

 package com.clx.performance.controller.pc.carrier;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.param.pc.carrier.ExportBatchOwnerSettlementDetailParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
@@ -11,6 +13,7 @@ import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetail
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -83,6 +86,9 @@ public class CarrierSettlementOwnerDetailController {
     @ApiOperation(value = "批量下载结算运单明细",notes = "<br>By:liruixin")
     @PostMapping("/exportBatchSettlementOwnerDetail")
     public void exportBatchSettlementOwnerDetail(@RequestBody @Validated ExportBatchOwnerSettlementDetailParam param, HttpServletResponse response) throws Exception {
+        if(CollectionUtil.isEmpty(param.getSettlementNos())){
+            throw new ServiceSystemException(PerformanceResultEnum.SETTLEMENT_NO_NULL_ERROR);
+        }
         SXSSFWorkbook workbook = settlementOwnerDetailService.exportBatchSettlementOwnerDetail(param);
         response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
         workbook.write(response.getOutputStream());