push

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

@@ -33,6 +33,7 @@ import com.yd.oss.feign.client.ApiExcelFeignClient;
 import com.yd.oss.feign.dto.ExportParam;
 import com.yd.oss.feign.dto.ExportResult;
 import com.yd.oss.feign.request.ApiExportRequest;
+import com.yd.user.feign.client.sysdict.ApiSysDictFeignClient;
 import com.yd.user.feign.request.sysdict.GetDictTypeListRequest;
 import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
 import com.yd.user.feign.response.sysdict.GetDictTypeListResponse;
@@ -61,6 +62,9 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
     @Autowired
     private ApiExcelFeignClient apiExcelFeignClient;
 
+    @Autowired
+    private ApiSysDictFeignClient apiSysDictFeignClient;
+
     /**
      * 分页查询-薪资拆分应发信息汇总列表
      * @param request
@@ -72,6 +76,13 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         // 查询分页信息
         Page<ApiSalarySplitSummaryPageDto> page = new Page<>(request.getPageNo(), request.getPageSize());
         IPage<ApiSalarySplitSummaryPageDto> iPage = iSalarySplitService.summaryPage(page, request);
+        if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
+            Map<String, String> map = getBillOrgDict();
+            iPage.getRecords().stream().map(dto -> {
+                dto.setBillOrg(map != null ? map.get(dto.getBillOrg()) : "");
+                return dto;
+            }).collect(Collectors.toList());
+        }
         response.setPage(iPage);
         //查询薪资拆分业务ID列表
         List<String> salarySplitBizIdList = iSalarySplitService.queryList(request);
@@ -79,32 +90,32 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         return Result.success(response);
     }
 
-//    /**
-//     * 获取缴费方式字典数据
-//     */
-//    private Map<String, String> getPaymentMethodDict() {
-//        Map<String, String> dictMap = new HashMap<>();
-//        try {
-//            GetDictTypeListRequest dictRequest = new GetDictTypeListRequest();
-//            dictRequest.setTypeList(Collections.singletonList("csf_ap_first_issue"));
-//            List<GetDictTypeListResponse> dictTypeResponses = apiSysDictFeignClient.getByDictTypeList(dictRequest).getData();
-//
-//            if (dictTypeResponses != null && !dictTypeResponses.isEmpty()) {
-//                for (GetDictTypeListResponse dictTypeResponse : dictTypeResponses) {
-//                    if ("csf_ap_first_issue".equals(dictTypeResponse.getDictType())
-//                            && dictTypeResponse.getDictItemList() != null) {
-//                        for (GetDictItemListByDictTypeResponse dictItem : dictTypeResponse.getDictItemList()) {
-//                            dictMap.put(dictItem.getItemValue(), dictItem.getItemLabel());
-//                        }
-//                        break;
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            log.error("获取缴费方式字典数据失败", e);
-//        }
-//        return dictMap;
-//    }
+    /**
+     * 获取出账机构字典数据
+     */
+    private Map<String, String> getBillOrgDict() {
+        Map<String, String> dictMap = new HashMap<>();
+        try {
+            GetDictTypeListRequest dictRequest = new GetDictTypeListRequest();
+            dictRequest.setTypeList(Collections.singletonList("csf_bill_org"));
+            List<GetDictTypeListResponse> dictTypeResponses = apiSysDictFeignClient.getByDictTypeList(dictRequest).getData();
+
+            if (dictTypeResponses != null && !dictTypeResponses.isEmpty()) {
+                for (GetDictTypeListResponse dictTypeResponse : dictTypeResponses) {
+                    if ("csf_bill_org".equals(dictTypeResponse.getDictType())
+                            && dictTypeResponse.getDictItemList() != null) {
+                        for (GetDictItemListByDictTypeResponse dictItem : dictTypeResponse.getDictItemList()) {
+                            dictMap.put(dictItem.getItemValue(), dictItem.getItemLabel());
+                        }
+                        break;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("获取出账机构字典数据失败", e);
+        }
+        return dictMap;
+    }
 
     /**
      * 分页查询-薪资拆分应发信息列表