|
|
@@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.simuwang.base.common.conts.ApplicationRuleFileConst;
|
|
|
import com.simuwang.base.common.conts.EmailDataDirectionConst;
|
|
|
import com.simuwang.base.common.conts.EmailFieldConst;
|
|
|
+import com.simuwang.base.common.util.DateUtils;
|
|
|
import com.simuwang.base.common.util.ExcelUtil;
|
|
|
import com.simuwang.base.common.util.NavDataUtil;
|
|
|
import com.simuwang.base.mapper.EmailTemplateApplicationRuleMapper;
|
|
|
@@ -458,6 +459,7 @@ public class EmailTemplateService {
|
|
|
? excelFieldValueMap.get(EmailFieldConst.FUND_NAME) : MapUtil.isNotEmpty(textFieldValueMap) ? textFieldValueMap.get(EmailFieldConst.FUND_NAME) : null;
|
|
|
String priceDate = MapUtil.isNotEmpty(excelFieldValueMap) && StrUtil.isNotBlank(excelFieldValueMap.get(EmailFieldConst.PRICE_DATE))
|
|
|
? excelFieldValueMap.get(EmailFieldConst.PRICE_DATE) : MapUtil.isNotEmpty(textFieldValueMap) ? textFieldValueMap.get(EmailFieldConst.PRICE_DATE) : null;
|
|
|
+ priceDate = DateUtils.stringToDate(priceDate);
|
|
|
String nav = MapUtil.isNotEmpty(excelFieldValueMap) && StrUtil.isNotBlank(excelFieldValueMap.get(EmailFieldConst.NAV))
|
|
|
? excelFieldValueMap.get(EmailFieldConst.NAV) : MapUtil.isNotEmpty(textFieldValueMap) ? textFieldValueMap.get(EmailFieldConst.NAV) : null;
|
|
|
String cumulativeNavWithdrawal = MapUtil.isNotEmpty(excelFieldValueMap) && StrUtil.isNotBlank(excelFieldValueMap.get(EmailFieldConst.CUMULATIVE_NAV_WITHDRAWAL))
|
