Commit 5706bb32 by 丁伟峰

技术员日历、技术员甘特图剥离到独立的service实现中

1 parent e718deb7
...@@ -242,7 +242,7 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -242,7 +242,7 @@ public class EngineerServiceImpl implements EngineerService {
LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
lqw.in(groupIds != null && !groupIds.isEmpty(), EngineerInfo::getGroupId, groupIds); lqw.in(groupIds != null && !groupIds.isEmpty(), EngineerInfo::getGroupId, groupIds);
if (StringUtils.isNotEmpty(kind)) { if(StringUtils.isNotEmpty(kind)) {
lqw.eq(EngineerInfo::getKind, (kind.equals("fullJob")) ? 1 : 2); lqw.eq(EngineerInfo::getKind, (kind.equals("fullJob")) ? 1 : 2);
} }
if (StringUtils.isNotEmpty(key)) { if (StringUtils.isNotEmpty(key)) {
...@@ -290,7 +290,7 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -290,7 +290,7 @@ public class EngineerServiceImpl implements EngineerService {
lqw.in(EngineerSkillGroup::getEngineerCode, engineerCodes); lqw.in(EngineerSkillGroup::getEngineerCode, engineerCodes);
lqw.in(EngineerSkillGroup::getStatus, statuses); lqw.in(EngineerSkillGroup::getStatus, statuses);
List<EngineerSkillGroup> records = engineerSkillGroupMPDao.selectList(lqw); List<EngineerSkillGroup> records = engineerSkillGroupMPDao.selectList(lqw);
if (records == null || records.isEmpty()) { if(records == null || records.isEmpty()) {
return map; return map;
} }
...@@ -554,10 +554,4 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -554,10 +554,4 @@ public class EngineerServiceImpl implements EngineerService {
tips.add(new LabelValueDTO().setLabel("标签").setValue(order.getTags())); tips.add(new LabelValueDTO().setLabel("标签").setValue(order.getTags()));
return tips; return tips;
} }
private String Timestamp2Datetime(Timestamp t, String pattern) {
DateTimeFormatter df = DateTimeFormatter.ofPattern(pattern);
return df.format(t.toLocalDateTime());
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!