企业货主

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

@@ -516,8 +516,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "序号", "index", 2000));
-        fieldList.add(new ExcelField(1, "货主编码", "ownerUserNo", 5000));
-        fieldList.add(new ExcelField(2, "货主名称", "ownerName", 5000));
+        fieldList.add(new ExcelField(1, "公司编码", "ownerUserNo", 5000));
+        fieldList.add(new ExcelField(2, "公司名称", "ownerName", 15000));
         fieldList.add(new ExcelField(3, "联系电话", "mobile", 5000));
         fieldList.add(new ExcelField(4, "账户类型", "accountType", 15000));
         fieldList.add(new ExcelField(5, "流水类型", "runningWaterType", 5000));
@@ -1304,8 +1304,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();
-        fieldList.add(new ExcelField(0, "货主编码", "index", 5000));
-        fieldList.add(new ExcelField(1, "货主名称", "ownerUserNo", 5000));
+        fieldList.add(new ExcelField(0, "公司编码", "index", 5000));
+        fieldList.add(new ExcelField(1, "公司名称", "ownerUserNo", 5000));
         fieldList.add(new ExcelField(2, "联系电话", "ownerName", 5000));
         fieldList.add(new ExcelField(3, "账户类型", "mobile", 5000));
         fieldList.add(new ExcelField(4, "账户余额", "accountType", 5000));
@@ -1331,7 +1331,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             rowData.add(new ExcelData(dto.getCreateTime()));
             dataList.add(rowData);
         }
-        ExcelSheet excelSheet = new ExcelSheet("预付运费账户列表", "预付运费账户列表", fieldList, dataList);
+        String title = "预付运费账户列表";
+        if(Objects.equals(param.getAccountType(),1)){
+            title = "保证金账户列表";
+        }
+        ExcelSheet excelSheet = new ExcelSheet(title, title, fieldList, dataList);
+
 
         //创建excel
         return ExcelUtil.create(excelSheet);

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerDetailServiceImpl.java

@@ -54,8 +54,8 @@ public class BreakContractSettlementOwnerDetailServiceImpl  implements BreakCont
         fieldList.add(new ExcelField(0, "序号", "index", 2000));
         fieldList.add(new ExcelField(1, "违约单号", "breakNo", 5000));
         fieldList.add(new ExcelField(2, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(3, "货主编号", "ownUserNo", 5000));
-        fieldList.add(new ExcelField(4, "货主名称", "ownerName", 5000));
+        fieldList.add(new ExcelField(3, "公司编号", "ownUserNo", 5000));
+        fieldList.add(new ExcelField(4, "公司名称", "ownerName", 5000));
 
         fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));

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

@@ -442,8 +442,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
-        fieldList.add(new ExcelField(1, "货主编码", "ownerUserNo", 5000));
-        fieldList.add(new ExcelField(2, "货主名称", "ownerName", 5000));
+        fieldList.add(new ExcelField(1, "公司编码", "ownerUserNo", 5000));
+        fieldList.add(new ExcelField(2, "公司名称", "ownerName", 5000));
         fieldList.add(new ExcelField(3, "结算方式", "settlementWay", 5000));
         fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
         fieldList.add(new ExcelField(5, "实际净重（吨）", "weight", 5000));
@@ -520,8 +520,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
-        fieldList.add(new ExcelField(1, "货主编码", "ownerUserNo", 5000));
-        fieldList.add(new ExcelField(2, "货主名称", "ownerName", 5000));
+        fieldList.add(new ExcelField(1, "公司编码", "ownerUserNo", 5000));
+        fieldList.add(new ExcelField(2, "公司名称", "ownerName", 5000));
         fieldList.add(new ExcelField(3, "结算方式", "settlementWay", 5000));
         fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
         fieldList.add(new ExcelField(5, "实际净重（吨）", "weight", 5000));