Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -116,6 +116,8 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="结算方式  1装车净重 2卸车净重 3卸车净重（减货损）",example = "1")
     private Integer settlementWay;
 
+    @ApiModelProperty(value="结算方式")
+    private String settlementWayMsg;
 
     @ApiModelProperty(value="开票公司id",example = "1")
     private Integer invoicingCompanyId;  //开票公司id

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

@@ -602,7 +602,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
         fieldList.add(new ExcelField(1, "货主名称", "ownerName", 5000));
-        fieldList.add(new ExcelField(2, "结算方式", "settlementWay", 5000));
+        fieldList.add(new ExcelField(2, "结算方式", "settlementWayMsg", 5000));
         fieldList.add(new ExcelField(3, "开票公司", "invoicingCompanyShorterName", 5000));
         fieldList.add(new ExcelField(4, "开票标识", "invoiceTypeMsg", 5000));
         fieldList.add(new ExcelField(5, "货物名称", "goodsName", 5000));
@@ -641,7 +641,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
             rowData.add(new ExcelData(vo.getChildNo()));
             rowData.add(new ExcelData(vo.getOwnerName()));
-            rowData.add(new ExcelData(SettlementWayEnum.WayType.getMsgByCode(vo.getSettlementWay())));
+            rowData.add(new ExcelData(vo.getSettlementWayMsg()));
             rowData.add(new ExcelData(vo.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(vo.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(vo.getGoodsName()));

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementOwnerDetailStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct.settle;
 
 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.SettlementOwnerDetail;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPagePendingSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
@@ -15,7 +16,7 @@ import org.mapstruct.Named;
 
 import java.util.List;
 
-@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {SettlementOwnerDetailEnum.class, SettlementOwnerEnum.class,DateUtils.class})
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {SettlementOwnerDetailEnum.class, SettlementOwnerEnum.class, SettlementWayEnum.class,DateUtils.class})
 public interface SettlementOwnerDetailStruct {
 
 
@@ -27,6 +28,7 @@ public interface SettlementOwnerDetailStruct {
     @Mapping(target = "invoiceTypeMsg", expression = "java(SettlementOwnerEnum.InvoiceType.getMsgByCode(settlementOwner.getInvoiceType()))")
     @Mapping(target = "finalPaymentStatusMsg", expression = "java(SettlementOwnerDetailEnum.FinalPaymentStatus.getMsgByCode(settlementOwner.getFinalPaymentStatus()))")
     @Mapping(target = "invoiceStatusMsg", expression = "java(SettlementOwnerDetailEnum.InvoiceStatus.getMsgByCode(settlementOwner.getInvoiceStatus()))")
+    @Mapping(target = "settlementWayMsg", expression = "java(SettlementWayEnum.WayType.getMsgByCode(settlementOwner.getSettlementWay()))")
     PageOwnerSettlementOwnerDetailVO convert(SettlementOwnerDetail settlementOwner);
 
     @IterableMapping(qualifiedByName = "toBaseVo")