Commit 15b88f86 by wangli

mp2jpa

1 parent 412a090f
...@@ -43,7 +43,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService { ...@@ -43,7 +43,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
@Autowired @Autowired
private OrgBranchMPDao orgBranchMPDao; private OrgBranchMPDao orgBranchMPDao;
@Autowired @Autowired
private SkillInfoMPDao skillInfoMPDao; private SkillInfoDao skillInfoDao;
@Autowired @Autowired
private ISaaSRemoteService saasRemoteService; private ISaaSRemoteService saasRemoteService;
@Autowired @Autowired
...@@ -72,8 +72,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService { ...@@ -72,8 +72,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
List<String> branchIds = new ArrayList<>(groups.stream().map(OrgGroupEntity::getBranchId).collect(Collectors.toSet())); List<String> branchIds = new ArrayList<>(groups.stream().map(OrgGroupEntity::getBranchId).collect(Collectors.toSet()));
// 获取skillCode与skillName映射信息 // 获取skillCode与skillName映射信息
List<SkillInfo> skills = skillInfoMPDao.selectList(null); List<SkillInfoEntity> skills = skillInfoDao.findAll();
Map<String, String> skillMapping = skills.stream().collect(Collectors.toMap(SkillInfo::getSkillCode, SkillInfo::getSkillCode)); Map<String, String> skillMapping = skills.stream().collect(Collectors.toMap(
SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkillCode));
Page<MapLayerCustomize> pg = new Page(page, size); Page<MapLayerCustomize> pg = new Page(page, size);
LambdaQueryWrapper<MapLayerCustomize> mapWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MapLayerCustomize> mapWrapper = new LambdaQueryWrapper<>();
...@@ -271,8 +272,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService { ...@@ -271,8 +272,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
private List<String> queryLayerSkill(String layerId) { private List<String> queryLayerSkill(String layerId) {
List<String> items = new ArrayList<>(); List<String> items = new ArrayList<>();
List<SkillInfo> skills = skillInfoMPDao.selectList(null); List<SkillInfoEntity> skills = skillInfoDao.findAll();
Map<String, String> skillMap = skills.stream().collect(Collectors.toMap(SkillInfo::getSkillCode, SkillInfo::getSkill)); Map<String, String> skillMap = skills.stream().collect(Collectors.toMap(
SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkill));
List<MapLayerCustomizeSkill> laySkills = mapLayerCustomizeSkillMPDao.selectByLayerId(layerId); List<MapLayerCustomizeSkill> laySkills = mapLayerCustomizeSkillMPDao.selectByLayerId(layerId);
for (MapLayerCustomizeSkill s : laySkills) { for (MapLayerCustomizeSkill s : laySkills) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!