|
@@ -20,10 +20,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
-import java.util.Collection;
|
|
|
|
|
-import java.util.Collections;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 补助设置Service业务层处理
|
|
* 补助设置Service业务层处理
|
|
@@ -107,9 +104,13 @@ public class PtSubsidyServiceImpl implements IPtSubsidyService {
|
|
|
});
|
|
});
|
|
|
Collection<PtSubsidyitem> list = MapstructUtils.convert(subsidyitemBoList, PtSubsidyitem.class);
|
|
Collection<PtSubsidyitem> list = MapstructUtils.convert(subsidyitemBoList, PtSubsidyitem.class);
|
|
|
subsidyitemMapper.insertBatch(list);
|
|
subsidyitemMapper.insertBatch(list);
|
|
|
-
|
|
|
|
|
- List<PtSubsidyitemBo> resList = MapstructUtils.convert(list.stream().toList(), PtSubsidyitemBo.class);
|
|
|
|
|
- bo.setPtSubsidyItemList(resList);
|
|
|
|
|
|
|
+ Map<Long,Long> itemIdMap = new HashMap<>();
|
|
|
|
|
+ list.stream().forEach(subsidyitem ->{
|
|
|
|
|
+ itemIdMap.put(subsidyitem.getUserId(), subsidyitem.getItemId());
|
|
|
|
|
+ });
|
|
|
|
|
+ subsidyitemBoList.stream().forEach(subsidyitemBo ->{
|
|
|
|
|
+ subsidyitemBo.setItemId(itemIdMap.get(subsidyitemBo.getUserId()));
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
return flag;
|
|
return flag;
|
|
|
}
|
|
}
|