Commit 0b8e12ae by zhangxingmin

push

parent 54f5b603
......@@ -33,16 +33,16 @@ 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.request.sysdict.GetDictTypeListRequest;
import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
import com.yd.user.feign.response.sysdict.GetDictTypeListResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
......@@ -79,6 +79,33 @@ 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;
// }
/**
* 分页查询-薪资拆分应发信息列表
* @param request
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment