Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 4629090e by 王力
Options

Merge branch 'dev_mp2jpa0809' into 'develop' 

Dev mp2jpa0809

See merge request !326
2 parents 49edbc50 6a51be14
Inline Side-by-side
Showing with 166 additions and 137 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/EngineerController.java
......@@ -31,8 +31,8 @@ public class EngineerController {
@GetMapping("/engineer/info/list")
public Result<?> getEngineerInfoList(@RequestParam String levelType,
@RequestParam String levelValue,
@RequestParam long page,
@RequestParam long size,
@RequestParam int page,
@RequestParam int size,
@RequestParam(required = false) String kind,
@RequestParam(required = false) String key) {
// 获取工程师基础信息列表
......@@ -60,8 +60,8 @@ public class EngineerController {
@GetMapping("/engineer/skill/list")
public Result<?> getEngineerSkillList(@RequestParam String levelType,
@RequestParam String levelValue,
@RequestParam long page,
@RequestParam long size,
@RequestParam int page,
@RequestParam int size,
@RequestParam(required = false) String kind,
@RequestParam(required = false) String key) {
// 获取工程师技能信息列表
......@@ -100,8 +100,8 @@ public class EngineerController {
@GetMapping("/engineer/business/list")
public Result<?> getEngineerBusinessList(@RequestParam String levelType,
@RequestParam String levelValue,
@RequestParam long page,
@RequestParam long size,
@RequestParam int page,
@RequestParam int size,
@RequestParam(required = false) String kind,
@RequestParam(required = false) String key) {
// 技术员业务属性配置列表
......
project-order/src/main/java/com/dituhui/pea/order/dao/EngineerBusinessDao.java
......@@ -23,4 +23,6 @@ public interface EngineerBusinessDao extends CrudRepository<EngineerBusinessEnti
void updateEngineerCenter(String address, String x, String y, String engineerCode);
EngineerBusinessEntity getByEngineerCode(String engineerCode);
List<EngineerBusinessEntity> findByEngineerCodeIn(List<String> engineerCodes);
}
project-order/src/main/java/com/dituhui/pea/order/dao/EngineerSkillGroupDao.java
......@@ -10,6 +10,7 @@ public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupE
List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, boolean status);
List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, boolean status);
List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatusIn(List<String> engineerCodes, List<Boolean> status);
List<EngineerSkillGroupEntity> findBySkillGroupCode(String skillGroupCode);
List<EngineerSkillGroupEntity> findBySkillGroupCodeAndStatus(String skillGroupCode, boolean status);
}
project-order/src/main/java/com/dituhui/pea/order/service/EngineerService.java
......@@ -7,16 +7,16 @@ import java.util.List;
public interface EngineerService {
// 获取公司列表
Result<?> getEngineerInfoList(String levelType, String levelValue, long page, long size, String kind, String key);
Result<?> getEngineerInfoList(String levelType, String levelValue, int page, int size, String kind, String key);
Result<?> getEngineerInfoDetail(String engineerCode);
// 获取工程师技能列表
Result<?> getEngineerSkillList(String levelType, String levelValue, long page, long size, String kind, String key);
Result<?> getEngineerSkillList(String levelType, String levelValue, int page, int size, String kind, String key);
Result<?> getEngineerSkillDetail(String engineerCode);
Result<?> engineerSkillUpdate(String engineerCode, List<String> categoryIds);
// 工程师业务属性配置列表
Result<?> getEngineerBusinessList(String levelType, String levelValue, long page, long size, String kind, String key);
Result<?> getEngineerBusinessList(String levelType, String levelValue, int page, int size, String kind, String key);
Result<?> getEngineerBusinessDetail(String engineerCode);
// 技术员业务属性配置修改
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
package com.dituhui.pea.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.common.ListUtils;
import com.dituhui.pea.order.common.TimeUtils;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.*;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.dao.EngineerBusinessDao;
import com.dituhui.pea.order.dao.EngineerInfoDao;
import com.dituhui.pea.order.dao.EngineerSkillGroupDao;
import com.dituhui.pea.order.dao.OrgGroupDao;
import com.dituhui.pea.order.dto.EngineerBusinessListResp;
import com.dituhui.pea.order.dto.EngineerInfoListResp;
import com.dituhui.pea.order.dto.EngineerSkillListResp;
import com.dituhui.pea.order.entity.EngineerBusinessEntity;
import com.dituhui.pea.order.entity.EngineerInfoEntity;
import com.dituhui.pea.order.entity.EngineerSkillGroupEntity;
import com.dituhui.pea.order.entity.OrgGroupEntity;
import com.dituhui.pea.order.service.EngineerService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaUpdate;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.time.LocalDateTime;
......@@ -29,28 +43,30 @@ import java.util.stream.Collectors;
public class EngineerServiceImpl implements EngineerService {
@Autowired
private EngineerInfoMPDao engineerInfoMPDao;
private EngineerInfoDao engineerInfoDao;
@Autowired
private EngineerSkillGroupMPDao engineerSkillGroupMPDao;
private EngineerSkillGroupDao engineerSkillGroupDao;
@Autowired
private OrgGroupMPDao orgGroupMPDao;
private OrgGroupDao orgGroupDao;
@Autowired
private EngineerBusinessMPDao engineerBusinessDao;
private EngineerBusinessDao engineerBusinessDao;
@Autowired
private EntityManager entityManager;
@Transactional
@Override
public Result<?> getEngineerInfoList(String levelType, String levelValue, long page, long size, String kind, String key) {
public Result<?> getEngineerInfoList(String levelType, String levelValue, int page, int size, String kind, String key) {
// 查询工程师信息
IPage<EngineerInfo> pg = this.queryEngineerInfoIPage(levelType, levelValue, page, size, kind, key);
Page<EngineerInfoEntity> pg = this.queryEngineerInfoIPage(levelType, levelValue, page, size, kind, key);
List<EngineerInfo> records = pg.getRecords();
List<EngineerInfoEntity> records = pg.getContent();
// 获取groupIds
List<String> groupIds = records.stream().map(EngineerInfo::getGroupId).collect(Collectors.toList());
List<String> groupIds = records.stream().map(EngineerInfoEntity::getGroupId).collect(Collectors.toList());
// 获取Map<groupId, groupName>
HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
......@@ -58,9 +74,9 @@ public class EngineerServiceImpl implements EngineerService {
// 设置返回值
EngineerInfoListResp res = new EngineerInfoListResp();
res.setContent(this.packEngineerInfos(records, groupNames));
res.setTotal(pg.getTotal());
res.setPages(pg.getPages());
res.setPageCurrent(pg.getCurrent());
res.setTotal(pg.getTotalElements());
res.setPages(pg.getTotalPages());
res.setPageCurrent(pg.getNumber() + 1);
res.setPageSize(pg.getSize());
return Result.success(res);
......@@ -71,15 +87,15 @@ public class EngineerServiceImpl implements EngineerService {
// 获取技术员基础信息详情
// 获取技术员列表
List<EngineerInfo> records = engineerInfoMPDao.selectByEngineerCode(engineerCode);
if (records.isEmpty()) {
EngineerInfoEntity engineer = engineerInfoDao.getByEngineerCode(engineerCode);
if (engineer == null) {
throw new BusinessException("技术员不存在");
}
List<String> groupIds = records.stream().map(EngineerInfo::getGroupId).collect(Collectors.toList());
HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
String groupId = engineer.getGroupId();
HashMap<String, String> groupNames = this.queryGroupNames(List.of(groupId));
List<EngineerInfoListResp.EngineerInfo> items = this.packEngineerInfos(records, groupNames);
List<EngineerInfoListResp.EngineerInfo> items = this.packEngineerInfos(List.of(engineer), groupNames);
if (items.isEmpty()) {
throw new BusinessException("技术员不存在");
}
......@@ -88,15 +104,15 @@ public class EngineerServiceImpl implements EngineerService {
@Transactional
@Override
public Result<?> getEngineerSkillList(String levelType, String levelValue, long page, long size, String kind, String key) {
public Result<?> getEngineerSkillList(String levelType, String levelValue, int page, int size, String kind, String key) {
// 获取技术员技能列表
IPage<EngineerInfo> pg = this.queryEngineerInfoIPage(levelType, levelValue, page, size, kind, key);
List<EngineerInfo> engineers = pg.getRecords();
Page<EngineerInfoEntity> pg = this.queryEngineerInfoIPage(levelType, levelValue, page, size, kind, key);
List<EngineerInfoEntity> engineers = pg.getContent();
EngineerSkillListResp res = new EngineerSkillListResp();
res.setTotal(pg.getTotal());
res.setPages(pg.getPages());
res.setPageCurrent(pg.getCurrent());
res.setTotal(pg.getTotalElements());
res.setPages(pg.getTotalPages());
res.setPageCurrent(pg.getNumber() + 1);
res.setPageSize(pg.getSize());
res.setContent(this.packEngineerSkills(engineers));
return Result.success(res);
......@@ -105,11 +121,11 @@ public class EngineerServiceImpl implements EngineerService {
@Override
public Result<?> getEngineerSkillDetail(String engineerCode) throws BusinessException {
// 获取工程师技能详情
List<EngineerInfo> engineers = engineerInfoMPDao.selectByEngineerCode(engineerCode);
if (engineers.isEmpty()) {
EngineerInfoEntity engineer = engineerInfoDao.getByEngineerCode(engineerCode);
if (engineer == null) {
throw new BusinessException("技术员不存在");
}
List<EngineerSkillListResp.EngineerSkill> items = this.packEngineerSkills(engineers);
List<EngineerSkillListResp.EngineerSkill> items = this.packEngineerSkills(List.of(engineer));
if (items.isEmpty()) {
throw new BusinessException("技术员不存在");
}
......@@ -122,25 +138,34 @@ public class EngineerServiceImpl implements EngineerService {
// 更新技术员技能
// 先将所有技能更新为0-不可用状态
LambdaUpdateWrapper<EngineerSkillGroup> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EngineerSkillGroup::getEngineerCode, engineerCode).set(EngineerSkillGroup::getStatus, 0);
engineerSkillGroupMPDao.update(null, wrapper);
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaUpdate<EngineerSkillGroupEntity> update = cb.createCriteriaUpdate(EngineerSkillGroupEntity.class);
Root<EngineerSkillGroupEntity> root = update.from(EngineerSkillGroupEntity.class);
update.set(root.get("status"), 0);
update.where(cb.equal(root.get("engineerCode"), engineerCode));
entityManager.createQuery(update).executeUpdate();
if (skillGroupIds.isEmpty()) {
return null;
}
// 更新categoryIds状态为1
wrapper.eq(EngineerSkillGroup::getEngineerCode, engineerCode);
wrapper.in(EngineerSkillGroup::getSkillGroupCode, skillGroupIds);
wrapper.set(EngineerSkillGroup::getStatus, 1);
int n = engineerSkillGroupMPDao.update(null, wrapper);
CriteriaBuilder cb1 = entityManager.getCriteriaBuilder();
CriteriaUpdate<EngineerSkillGroupEntity> update1 = cb.createCriteriaUpdate(EngineerSkillGroupEntity.class);
Root<EngineerSkillGroupEntity> root1 = update1.from(EngineerSkillGroupEntity.class);
update1.set(root1.get("status"), 1);
update1.where(
cb1.equal(root1.get("engineerCode"), engineerCode),
root1.get("skillGroupCode").in(skillGroupIds)
);
int n = entityManager.createQuery(update1).executeUpdate();
if (skillGroupIds.size() == n) {
// 更新记录条数等于提交记录条数
return null;
}
// 可能存在engineerSkill表不存在的记录，需要补充录入
List<Integer> statuses = new ArrayList<Integer>(Arrays.asList(1, 0));
List<Boolean> statuses = new ArrayList<Boolean>(Arrays.asList(true, false));
List<String> engineerCodes = new ArrayList<>(Collections.singletonList(engineerCode));
HashMap<String, List<String>> engineerSkills = this.queryEngineerSkills(engineerCodes, statuses);
......@@ -148,30 +173,30 @@ public class EngineerServiceImpl implements EngineerService {
Set<String> sDB = new HashSet<>(engineerSkills.getOrDefault(engineerCode, new ArrayList<>()));
sInput.removeAll(sDB);
for (String skillGroupId : sInput) {
EngineerSkillGroup e = new EngineerSkillGroup();
EngineerSkillGroupEntity e = new EngineerSkillGroupEntity();
e.setEngineerCode(engineerCode);
e.setSkillGroupCode(skillGroupId);
e.setDescription("");
e.setStatus(1);
engineerSkillGroupMPDao.insert(e);
e.setStatus(true);
entityManager.persist(e);
}
return null;
}
@Transactional
@Override
public Result<?> getEngineerBusinessList(String levelType, String levelValue, long page, long size, String kind, String key) {
public Result<?> getEngineerBusinessList(String levelType, String levelValue, int page, int size, String kind, String key) {
// 技术员业务属性配置列表
// 查询技术员列表
IPage<EngineerInfo> pg = this.queryEngineerInfoIPage(levelType, levelValue, page, size, kind, key);
List<EngineerInfo> engineers = pg.getRecords();
Page<EngineerInfoEntity> pg = this.queryEngineerInfoIPage(levelType, levelValue, page, size, kind, key);
List<EngineerInfoEntity> engineers = pg.getContent();
// 查询技术员业务属性
EngineerBusinessListResp res = new EngineerBusinessListResp();
res.setTotal(pg.getTotal());
res.setPages(pg.getPages());
res.setPageCurrent(pg.getCurrent());
res.setTotal(pg.getTotalElements());
res.setPages(pg.getTotalPages());
res.setPageCurrent(pg.getNumber() + 1);
res.setPageSize(pg.getSize());
res.setContent(this.packEngineerBusinesses(engineers));
return Result.success(res);
......@@ -180,11 +205,11 @@ public class EngineerServiceImpl implements EngineerService {
@Override
public Result<?> getEngineerBusinessDetail(String engineerCode) {
// 获取技术员业务熟悉详情
List<EngineerInfo> engineers = engineerInfoMPDao.selectByEngineerCode(engineerCode);
if (engineers.isEmpty()) {
EngineerInfoEntity engineer = engineerInfoDao.getByEngineerCode(engineerCode);
if (engineer == null) {
throw new BusinessException("技术员不存在");
}
List<?> items = this.packEngineerBusinesses(engineers);
List<?> items = this.packEngineerBusinesses(List.of(engineer));
if (items.isEmpty()) {
throw new BusinessException("技术员不存在");
}
......@@ -200,52 +225,60 @@ public class EngineerServiceImpl implements EngineerService {
int minute = this.getMinuteDiff(TimeUtils.time2LocalTime(workOn), TimeUtils.time2LocalTime(workOff));
// 技术员业务属性配置修改
LambdaUpdateWrapper<EngineerBusiness> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EngineerBusiness::getEngineerCode, engineerCode);
wrapper.set(EngineerBusiness::getMaxNum, maxNum);
wrapper.set(EngineerBusiness::getDeparture, departure);
wrapper.set(EngineerBusiness::getPriority, priority);
wrapper.set(EngineerBusiness::getWorkOn, workOn);
wrapper.set(EngineerBusiness::getWorkOff, workOff);
wrapper.set(EngineerBusiness::getMaxMinute, minute);
wrapper.set(EngineerBusiness::getVehicle, transportMode);
// 更新字段
engineerBusinessDao.update(null, wrapper);
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaUpdate<EngineerBusinessEntity> update = cb.createCriteriaUpdate(EngineerBusinessEntity.class);
Root<EngineerBusinessEntity> root = update.from(EngineerBusinessEntity.class);
update.set(root.get("maxNum"), maxNum);
update.set(root.get("departure"), departure);
update.set(root.get("priority"), priority);
update.set(root.get("workOn"), workOn);
update.set(root.get("workOff"), workOff);
update.set(root.get("maxMinute"), minute);
update.set(root.get("vehicle"), transportMode);
update.where(cb.equal(root.get("engineerCode"), engineerCode));
entityManager.createQuery(update).executeUpdate();
return Result.success(null);
}
private IPage<EngineerInfo> queryEngineerInfoIPage(String levelType, String levelValue, long page, long size, String kind, String key) {
private Page<EngineerInfoEntity> queryEngineerInfoIPage(String levelType, String levelValue, int page, int size, String kind, String key) {
// 分页查询工程师基础信息
// 查询技术员所在的groupIds
LambdaQueryWrapper<OrgGroup> wrapper = new LambdaQueryWrapper<>();
wrapper.select(OrgGroup::getGroupId);
wrapper.eq(levelType.equals("cluster"), OrgGroup::getClusterId, levelValue);
wrapper.eq(levelType.equals("branch"), OrgGroup::getBranchId, levelValue);
wrapper.eq(levelType.equals("group"), OrgGroup::getGroupId, levelValue);
List<String> groupIds = orgGroupMPDao.selectList(wrapper).stream().map(OrgGroup::getGroupId).collect(Collectors.toList());
LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
lqw.in(groupIds != null && !groupIds.isEmpty(), EngineerInfo::getGroupId, groupIds);
if(StringUtils.isNotEmpty(kind)) {
lqw.eq(EngineerInfo::getKind, (kind.equals("fullJob")) ? 1 : 2);
}
if (StringUtils.isNotEmpty(key)) {
lqw.and(w ->
w.like(EngineerInfo::getPhone, key)
.or()
.like(EngineerInfo::getName, key)
.or()
.like(EngineerInfo::getEngineerCode, key)
);
List<OrgGroupEntity> groups = new ArrayList<>();
if (levelType.equals("cluster")) {
groups = orgGroupDao.findAllByClusterId(levelValue);
} else if (levelType.equals("branch")) {
groups = orgGroupDao.findAllByBranchId(levelValue);
} else if (levelType.equals("group")) {
groups = orgGroupDao.findAllByGroupId(levelValue);
}
List<String> groupIds = groups.stream().map(OrgGroupEntity::getGroupId).collect(Collectors.toList());
Pageable pageable = PageRequest.of(page, size);
Specification<EngineerInfoEntity> spec = (root, query, cb) -> {
List<Predicate> predicates = new ArrayList<>();
if (groupIds != null && !groupIds.isEmpty()) {
predicates.add(root.get("groupId").in(groupIds));
}
if (StringUtils.hasText(kind)) {
int kindValue = kind.equals("fullJob") ? 1 : 2;
predicates.add(cb.equal(root.get("kind"), kindValue));
}
lqw.orderByAsc(EngineerInfo::getGroupId);
lqw.orderByAsc(EngineerInfo::getEngineerCode);
IPage<EngineerInfo> pg = new Page(page, size);
engineerInfoMPDao.selectPage(pg, lqw);
return pg;
if (StringUtils.hasText(key)) {
String likeKey = "%" + key + "%";
predicates.add(cb.or(
cb.like(root.get("phone"), likeKey),
cb.like(root.get("name"), likeKey),
cb.like(root.get("engineerCode"), likeKey)
));
}
return cb.and(predicates.toArray(new Predicate[0]));
};
return engineerInfoDao.findAll(spec, pageable);
}
private HashMap<String, String> queryGroupNames(List<String> groupIds) {
......@@ -255,65 +288,56 @@ public class EngineerServiceImpl implements EngineerService {
if (groupIds.isEmpty()) {
return map;
}
LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>();
lqw.select(OrgGroup::getGroupId, OrgGroup::getGroupName);
lqw.in(OrgGroup::getGroupId, groupIds);
List<OrgGroup> groups = orgGroupMPDao.selectList(lqw);
for (OrgGroup g : groups) {
List<OrgGroupEntity> groups = orgGroupDao.findByGroupIdIn(groupIds);
for (OrgGroupEntity g : groups) {
map.put(g.getGroupId(), g.getGroupName());
}
return map;
}
private HashMap<String, List<String>> queryEngineerSkills(List<String> engineerCodes, List<Integer> statuses) {
private HashMap<String, List<String>> queryEngineerSkills(List<String> engineerCodes, List<Boolean> statuses) {
// 获取engineerCode对应的技能表, HashMap<engineerCode, List<skillId>>
HashMap<String, List<String>> map = new HashMap<>();
if (engineerCodes.isEmpty()) {
return map;
}
LambdaQueryWrapper<EngineerSkillGroup> lqw = new LambdaQueryWrapper<>();
lqw.in(EngineerSkillGroup::getEngineerCode, engineerCodes);
lqw.in(EngineerSkillGroup::getStatus, statuses);
List<EngineerSkillGroup> records = engineerSkillGroupMPDao.selectList(lqw);
if(records == null || records.isEmpty()) {
List<EngineerSkillGroupEntity> records = engineerSkillGroupDao.findByEngineerCodeInAndStatusIn(engineerCodes, statuses);
if (ListUtils.isEmpty(records)) {
return map;
}
Comparator<EngineerSkillGroup> ec = Comparator.comparing(EngineerSkillGroup::getEngineerCode, String.CASE_INSENSITIVE_ORDER);
List<EngineerSkillGroup> results = records.stream().sorted(ec).collect(Collectors.toList());
Comparator<EngineerSkillGroupEntity> ec = Comparator.comparing(EngineerSkillGroupEntity::getEngineerCode, String.CASE_INSENSITIVE_ORDER);
List<EngineerSkillGroupEntity> results = records.stream().sorted(ec).collect(Collectors.toList());
// 根据engineerCode分组
Map<String, List<EngineerSkillGroup>> g = results.stream().collect(Collectors.groupingBy(EngineerSkillGroup::getEngineerCode));
Map<String, List<EngineerSkillGroupEntity>> g = results.stream().collect(Collectors.groupingBy(EngineerSkillGroupEntity::getEngineerCode));
for (String engineerCode : g.keySet()) {
// 技术员技能ID列表
List<String> skillGroupIds = g.get(engineerCode).stream().map(EngineerSkillGroup::getSkillGroupCode).collect(Collectors.toList());
List<String> skillGroupIds = g.get(engineerCode).stream().map(EngineerSkillGroupEntity::getSkillGroupCode).collect(Collectors.toList());
map.put(engineerCode, skillGroupIds);
}
return map;
}
private HashMap<String, EngineerBusiness> queryEngineerBusiness(List<String> engineerCodes) {
HashMap<String, EngineerBusiness> map = new HashMap<>();
private HashMap<String, EngineerBusinessEntity> queryEngineerBusiness(List<String> engineerCodes) {
HashMap<String, EngineerBusinessEntity> map = new HashMap<>();
if (engineerCodes.isEmpty()) {
return map;
}
LambdaQueryWrapper<EngineerBusiness> lqw = new LambdaQueryWrapper<>();
lqw.in(EngineerBusiness::getEngineerCode, engineerCodes);
List<EngineerBusiness> records = engineerBusinessDao.selectList(lqw);
for (EngineerBusiness r : records) {
List<EngineerBusinessEntity> records = engineerBusinessDao.findByEngineerCodeIn(engineerCodes);
for (EngineerBusinessEntity r : records) {
map.put(r.getEngineerCode(), r);
}
return map;
}
private List<EngineerInfoListResp.EngineerInfo> packEngineerInfos(List<EngineerInfo> engineers, HashMap<String, String> groups) {
private List<EngineerInfoListResp.EngineerInfo> packEngineerInfos(List<EngineerInfoEntity> engineers, HashMap<String, String> groups) {
String groupName, age, kind;
List<EngineerInfoListResp.EngineerInfo> items = new ArrayList<>();
for (EngineerInfo e : engineers) {
for (EngineerInfoEntity e : engineers) {
EngineerInfoListResp.EngineerInfo item = new EngineerInfoListResp.EngineerInfo();
item.setEngineerCode(e.getEngineerCode());
item.setNumber(e.getEngineerCode());
......@@ -342,6 +366,7 @@ public class EngineerServiceImpl implements EngineerService {
}
// 标签
/*
List<String> tags = new ArrayList<>();
if (e.getTags() != null && !e.getTags().isEmpty()) {
for (Map.Entry<String, Object> entry : e.getTags().entrySet()) {
......@@ -349,32 +374,33 @@ public class EngineerServiceImpl implements EngineerService {
}
}
item.setTags(tags);
*/
items.add(item);
}
return items;
}
private List<EngineerSkillListResp.EngineerSkill> packEngineerSkills(List<EngineerInfo> engineers) {
private List<EngineerSkillListResp.EngineerSkill> packEngineerSkills(List<EngineerInfoEntity> engineers) {
// 获取groupId类表
List<String> groupIds = engineers.stream().map(EngineerInfo::getGroupId).collect(Collectors.toList());
List<String> groupIds = engineers.stream().map(EngineerInfoEntity::getGroupId).collect(Collectors.toList());
HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
// 获取技术员code列表
List<String> engineerCodes = engineers.stream().map(EngineerInfo::getEngineerCode).collect(Collectors.toList());
List<String> engineerCodes = engineers.stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList());
// 获取技术员的可用技能列表
List<Integer> statuses = Collections.singletonList(1);
List<Boolean> statuses = Collections.singletonList(true);
HashMap<String, List<String>> engineerSkillGroups = this.queryEngineerSkills(engineerCodes, statuses);
List<String> emptySkills = Collections.emptyList();
List<EngineerSkillListResp.EngineerSkill> items = new ArrayList<>();
for (EngineerInfo e : engineers) {
for (EngineerInfoEntity e : engineers) {
EngineerSkillListResp.EngineerSkill skill = new EngineerSkillListResp.EngineerSkill();
skill.setEngineerCode(e.getEngineerCode());
skill.setEngineerName(e.getName());
skill.setGroupName(groupNames.getOrDefault(e.getGroupId(), ""));
skill.setUpdateTime(TimeUtils.IsoTimestamp2DateTime(e.getUpdateTime()));
skill.setUpdateTime(TimeUtils.IsoLocalDateTime2String(e.getUpdateTime()));
// 获取一个工程师的技能列表
skill.setSkillGroupIds(engineerSkillGroups.getOrDefault(e.getEngineerCode(), emptySkills));
......@@ -384,20 +410,20 @@ public class EngineerServiceImpl implements EngineerService {
return items;
}
private List<EngineerBusinessListResp.EngineerBusiness> packEngineerBusinesses(List<EngineerInfo> engineers) {
private List<EngineerBusinessListResp.EngineerBusiness> packEngineerBusinesses(List<EngineerInfoEntity> engineers) {
// 获取技术员code列表
List<String> engineerCodes = engineers.stream().map(EngineerInfo::getEngineerCode).collect(Collectors.toList());
List<String> engineerCodes = engineers.stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toList());
List<String> groupIds = engineers.stream().map(EngineerInfo::getGroupId).collect(Collectors.toList());
List<String> groupIds = engineers.stream().map(EngineerInfoEntity::getGroupId).collect(Collectors.toList());
HashMap<String, String> groupNames = this.queryGroupNames(groupIds);
HashMap<String, EngineerBusiness> buss = this.queryEngineerBusiness(engineerCodes);
HashMap<String, EngineerBusinessEntity> buss = this.queryEngineerBusiness(engineerCodes);
List<EngineerBusinessListResp.EngineerBusiness> items = new ArrayList<>();
for (EngineerInfo e : engineers) {
for (EngineerInfoEntity e : engineers) {
EngineerBusinessListResp.EngineerBusiness item = new EngineerBusinessListResp.EngineerBusiness();
EngineerBusiness b = buss.getOrDefault(e.getEngineerCode(), null);
if(b == null){
EngineerBusinessEntity b = buss.getOrDefault(e.getEngineerCode(), null);
if (b == null) {
// 若没有配置，则不返回, 由同步程序初始化
continue;
}
......@@ -458,7 +484,7 @@ public class EngineerServiceImpl implements EngineerService {
}
LocalDateTime dtBegin = LocalDateTime.of(LocalDateTime.now().toLocalDate(), tBegin);
LocalDateTime dtEnd;
if(r < 0) {
if (r < 0) {
dtEnd = LocalDateTime.of(LocalDateTime.now().toLocalDate(), tEnd);
} else {
dtEnd = LocalDateTime.of(LocalDateTime.now().plusDays(1).toLocalDate(), tEnd);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!