Commit 935354ca authored by zp's avatar zp

Merge branch 'v2.0.0' of 47.100.44.39:zhoupeng/tamp_fund into v2.0.0

parents f5ba92b5 c4867d39
package com.tanpu.fund.service.impl;
import com.tanpu.common.model.product.resp.Net;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
......@@ -9,7 +7,6 @@ import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import com.github.pagehelper.page.PageMethod;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.tanpu.common.auth.UserInfoThreadLocalHolder;
import com.tanpu.common.enums.BizEnums;
import com.tanpu.common.enums.Constant;
......@@ -54,9 +51,7 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import static com.tanpu.common.utils.BigDecimalUtil.multiply100;
import static com.tanpu.common.utils.BigDecimalUtil.subtract;
import static com.tanpu.common.utils.BigDecimalUtil.subtractAbs;
import static com.tanpu.common.utils.BigDecimalUtil.*;
import static com.tanpu.fund.enums.FilterTypeEnum.SINCE_ESTABLISHED;
import static com.tanpu.fund.utils.LongUtil.timeLong;
......@@ -1920,11 +1915,12 @@ public class ProductServiceImpl implements ProductService, Constant {
List<List<Object>> read) {
List<FundNavMessage> newResultMessage = handlerNetImportCheck(ifaNavMap, resultMessage, errorStatus, read);
if (errorStatus.get()) {
this.ifaImportedFundNavMapper.batchInsert(resultMessage.stream().map(ls -> {
IfaImportedFundNav nav = new IfaImportedFundNav();
BeanUtils.copyProperties(ls, nav);
return nav;
}).collect(Collectors.toList()));
//只做校验不入库
// this.ifaImportedFundNavMapper.batchInsert(resultMessage.stream().map(ls -> {
// IfaImportedFundNav nav = new IfaImportedFundNav();
// BeanUtils.copyProperties(ls, nav);
// return nav;
// }).collect(Collectors.toList()));
return CommonResp.success();
}
......
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