Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into release

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java

@@ -62,8 +62,6 @@ public class OwnerBreakContractSettlementOwnerController {
         param.setOwnerUserNo(loginUserInfo.getUserNo());
         SXSSFWorkbook workbook = breakContractSettlementOwnerService.exportCarrierBreakContractSettlementOwnerList(param);
         response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
-        String fileName = URLEncoder.encode("货主违约结算单", "UTF-8");
-        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName + "\"");
         workbook.write(response.getOutputStream());
         return null;
     }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -11,6 +11,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementPlatformAccount;
@@ -306,6 +307,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
             rowData.add(new ExcelData(String.valueOf(dto.getOwnerUserNo())));
+            rowData.add(new ExcelData(SettlementWayEnum.WayType.getMsgByCode(dto.getSettlementWay())));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getWeight()));
             rowData.add(new ExcelData(dto.getFreight().movePointLeft(2)));