push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalarySplitServiceImpl.java

@@ -296,11 +296,13 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         // 查询数据
         // 查询数据
         List<ApiSalarySplitSummaryPageDto> dataList = iSalarySplitService.summaryList(request);
         List<ApiSalarySplitSummaryPageDto> dataList = iSalarySplitService.summaryList(request);
         log.info("导出-薪资拆分应发信息汇总列表:dataList,{}", JSON.toJSONString(dataList));
         log.info("导出-薪资拆分应发信息汇总列表:dataList,{}", JSON.toJSONString(dataList));
+        Map<String, String> map = getBillOrgDict();
         List<ApiSalarySplitSummaryExcelDto> excelDtoList = new ArrayList<>();
         List<ApiSalarySplitSummaryExcelDto> excelDtoList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(dataList)) {
         if (CollectionUtils.isNotEmpty(dataList)) {
             excelDtoList = dataList.stream().map(dto -> {
             excelDtoList = dataList.stream().map(dto -> {
                 ApiSalarySplitSummaryExcelDto excelDto = new ApiSalarySplitSummaryExcelDto();
                 ApiSalarySplitSummaryExcelDto excelDto = new ApiSalarySplitSummaryExcelDto();
                 BeanUtils.copyProperties(dto,excelDto);
                 BeanUtils.copyProperties(dto,excelDto);
+                excelDto.setBillOrg(map != null ? map.get(dto.getBillOrg()) : "");
                 return excelDto;
                 return excelDto;
             }).collect(Collectors.toList());
             }).collect(Collectors.toList());
         }
         }
@@ -309,7 +311,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         ExportParam exportParam = new ExportParam();
         ExportParam exportParam = new ExportParam();
         // 指定需要导出的字段（字段名必须与 DTO 中的属性名一致）
         // 指定需要导出的字段（字段名必须与 DTO 中的属性名一致）
         exportParam.setFieldNames(Arrays.asList(
         exportParam.setFieldNames(Arrays.asList(
-                "salarySplitNo","businessNo","brokerName","team","fromAmount",
+                "salarySplitNo","businessNo","brokerName","internalNumber","team","fromAmount",
                 "currency","exchangeRate","toAmount","toCurrency",
                 "currency","exchangeRate","toAmount","toCurrency",
                 "fortuneAccountMonth","billOrg","amount"
                 "fortuneAccountMonth","billOrg","amount"
         ));
         ));

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/excel/ApiSalarySplitSummaryExcelDto.java

@@ -10,40 +10,40 @@ public class ApiSalarySplitSummaryExcelDto {
     @Excel(name = "发放编号", orderNum = "1")
     @Excel(name = "发放编号", orderNum = "1")
     private String salarySplitNo;
     private String salarySplitNo;
 
 
-    @Excel(name = "业务编号", orderNum = "1")
+    @Excel(name = "业务编号", orderNum = "2")
     private String businessNo;
     private String businessNo;
 
 
-    @Excel(name = "转介人", orderNum = "2")
+    @Excel(name = "转介人", orderNum = "3")
     private String brokerName;
     private String brokerName;
 
 
-    @Excel(name = "内部编号", orderNum = "3")
+    @Excel(name = "内部编号", orderNum = "4")
     private String internalNumber;
     private String internalNumber;
 
 
-    @Excel(name = "所属团队", orderNum = "4")
+    @Excel(name = "所属团队", orderNum = "5")
     private String team;
     private String team;
 
 
-    @Excel(name = "原币种金额", orderNum = "5")
+    @Excel(name = "原币种金额", orderNum = "6")
     private BigDecimal fromAmount;
     private BigDecimal fromAmount;
 
 
-    @Excel(name = "原币种", orderNum = "6")
+    @Excel(name = "原币种", orderNum = "7")
     private String currency;
     private String currency;
 
 
-    @Excel(name = "汇率（原币种->目标币种）", orderNum = "7")
+    @Excel(name = "汇率（原币种->目标币种）", orderNum = "8")
     private BigDecimal exchangeRate;
     private BigDecimal exchangeRate;
 
 
-    @Excel(name = "目标金额", orderNum = "8")
+    @Excel(name = "目标金额", orderNum = "9")
     private BigDecimal toAmount;
     private BigDecimal toAmount;
 
 
-    @Excel(name = "目标币种", orderNum = "9")
+    @Excel(name = "目标币种", orderNum = "10")
     private String toCurrency;
     private String toCurrency;
 
 
-    @Excel(name = "出账月（实）", orderNum = "10")
+    @Excel(name = "出账月（实）", orderNum = "11")
     private String fortuneAccountMonth;
     private String fortuneAccountMonth;
 
 
-    @Excel(name = "出账机构", orderNum = "11")
+    @Excel(name = "出账机构", orderNum = "12")
     private String billOrg;
     private String billOrg;
 
 
-    @Excel(name = "本期总出账金额（原币种）", orderNum = "12")
+    @Excel(name = "本期总出账金额（原币种）", orderNum = "13")
     private BigDecimal amount;
     private BigDecimal amount;
 
 
 }
 }