Commit 84947a7e2987e9b1b5b123a40f8189b4384db7d0
Merge branch 'jc-custom-indicator-2024-3-22' into 'main'
feature(*): 修改导入规则 修改导入规则 See merge request !608
Showing
1 changed file
with
5 additions
and
5 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorImportBizService.java
... | ... | @@ -200,11 +200,11 @@ public class EvalIndicatorImportBizService { |
200 | 200 | continue; |
201 | 201 | } |
202 | 202 | //只能导入近两月的指标数据 |
203 | - if (PublicUtil.isEmpty(importDetailScore.getDataDate()) || (! importValidMonthlies.contains(YearMonth.from(importDetailScore.getDataDate())))) { | |
204 | - importDetailScore.setErrorType(ImportErrorReasonEnum.TIME_ERROR); | |
205 | - errorNum += 1; | |
206 | - continue; | |
207 | - } | |
203 | +// if (PublicUtil.isEmpty(importDetailScore.getDataDate()) || (! importValidMonthlies.contains(YearMonth.from(importDetailScore.getDataDate())))) { | |
204 | +// importDetailScore.setErrorType(ImportErrorReasonEnum.TIME_ERROR); | |
205 | +// errorNum += 1; | |
206 | +// continue; | |
207 | +// } | |
208 | 208 | ShopDTO shopDTO = shopMap.get(shop.getShopName()); |
209 | 209 | shopIds.add(shopDTO.getId()); |
210 | 210 | importDetailScore.setShopId(shopDTO.getId()); | ... | ... |