|
@@ -123,29 +123,32 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
|
|
|
// 专家ID列表
|
|
|
List<Long> expertList = pmDemandExpertRefList.stream().map(PmDemandExpertRef::getExpertId).collect(Collectors.toList());
|
|
|
// 获取抽取时间(列表中取其中一个时间)
|
|
|
- Date accessTime = pmDemandExpertRefList.get(0).getAccessTime();
|
|
|
- Map<String, String> map = baseExpertMapper.getExpertNameList(expertList);
|
|
|
- if (!ObjectUtils.isEmpty(map)) {
|
|
|
- // 专家名称
|
|
|
- String expertNameStr = map.get("expertName");
|
|
|
- // 采购品种
|
|
|
- String varietyPurchaseStr = map.get("varietyPurchase");
|
|
|
- List<String> list = Arrays.stream(varietyPurchaseStr.split(",")).map(s -> String.valueOf(s.trim())).collect(Collectors.toList());
|
|
|
- List<String> newList = method(list);
|
|
|
- // 查询采购品种 中文
|
|
|
- String varietyPurchaseName = "";
|
|
|
- for (String i : newList) {
|
|
|
- String name = PurchaseType.getCodeToInfo(i);
|
|
|
- if ("".equals(varietyPurchaseName)) {
|
|
|
- varietyPurchaseName = name;
|
|
|
- } else {
|
|
|
- varietyPurchaseName = "," + name;
|
|
|
+
|
|
|
+ if (!ObjectUtils.isEmpty(expertList)) {
|
|
|
+ Date accessTime = pmDemandExpertRefList.get(0).getAccessTime();
|
|
|
+ Map<String, String> map = baseExpertMapper.getExpertNameList(expertList);
|
|
|
+ if (!ObjectUtils.isEmpty(map)) {
|
|
|
+ // 专家名称
|
|
|
+ String expertNameStr = map.get("expertName");
|
|
|
+ // 采购品种
|
|
|
+ String varietyPurchaseStr = map.get("varietyPurchase");
|
|
|
+ List<String> list = Arrays.stream(varietyPurchaseStr.split(",")).map(s -> String.valueOf(s.trim())).collect(Collectors.toList());
|
|
|
+ List<String> newList = method(list);
|
|
|
+ // 查询采购品种 中文
|
|
|
+ String varietyPurchaseName = "";
|
|
|
+ for (String i : newList) {
|
|
|
+ String name = PurchaseType.getCodeToInfo(i);
|
|
|
+ if ("".equals(varietyPurchaseName)) {
|
|
|
+ varietyPurchaseName = name;
|
|
|
+ } else {
|
|
|
+ varietyPurchaseName = "," + name;
|
|
|
+ }
|
|
|
}
|
|
|
+ pmDemandResVo.setExpertNameStr(expertNameStr);
|
|
|
+ pmDemandResVo.setVarietyPurchaseStr(varietyPurchaseName);
|
|
|
}
|
|
|
- pmDemandResVo.setExpertNameStr(expertNameStr);
|
|
|
- pmDemandResVo.setVarietyPurchaseStr(varietyPurchaseName);
|
|
|
+ pmDemandResVo.setAccessTime(accessTime);
|
|
|
}
|
|
|
- pmDemandResVo.setAccessTime(accessTime);
|
|
|
}
|
|
|
}
|
|
|
Page pages = PageUtils.getPages(baseExpertVo.getPageNum().intValue(), baseExpertVo.getPageSize().intValue(), pmDemandResponseVoList);
|