|
@@ -250,6 +250,7 @@ public class DailyImportSummaryLogic {
|
|
|
|
|
|
if (errorData.length() > 0) {
|
|
|
errorData.append("已存在,导入失败");
|
|
|
+ throw new RemoteServiceException(errorData.toString());
|
|
|
}
|
|
|
return errorData.toString();
|
|
|
}
|
|
@@ -289,8 +290,8 @@ public class DailyImportSummaryLogic {
|
|
|
List<SettleWebsitWorkerDirector> list = settleWebsitWorkerDirectorService.lambdaQuery().list();
|
|
|
List<String> notSettleIdcards = list.stream().map(SettleWebsitWorkerDirector::getIdcard).collect(Collectors.toList());
|
|
|
//结算数据导入明细
|
|
|
- List<SettleDailyImportSummaryItem> updateList = settleDailyImportSummaryItemService.lambdaQuery().
|
|
|
- eq(SettleDailyImportSummaryItem::getImportBatchNo, importBatchNo)
|
|
|
+ List<SettleDailyImportSummaryItem> updateList = settleDailyImportSummaryItemService.lambdaQuery()
|
|
|
+ .eq(SettleDailyImportSummaryItem::getImportBatchNo, importBatchNo)
|
|
|
.in(SettleDailyImportSummaryItem::getSummaryStatus, DailyConstant.SUMMARY_STATUS_CAN_DO)
|
|
|
.in(SettleDailyImportSummaryItem::getOrderStatus, DailyConstant.SUMMARY_STATUS_ARRAY)
|
|
|
.list();
|