Skip to content

yangxiujun / paidan_demo

Go to a project
Commit a662680b by 丁伟峰
Options

Merge branch 'feature-dingwf-0715' into develop

2 parents 45ffe9bd 428a041d
Inline Side-by-side
Showing with 4 additions and 2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
...@@ -477,14 +477,13 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -477,14 +477,13 @@ public class EngineerServiceImpl implements EngineerService {
} }
List<EngineersGanttRespDTO.GanttChart> engineers = new ArrayList<>(); List<EngineersGanttRespDTO.GanttChart> engineers = new ArrayList<>();
for (String engineerCode : mapEngineers.keySet()) { for (String engineerCode : reqDTO.getEngineerCodes()) {
EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(engineerCode); EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(engineerCode);
EngineersGanttRespDTO.GanttChart engineer = new EngineersGanttRespDTO.GanttChart(); EngineersGanttRespDTO.GanttChart engineer = new EngineersGanttRespDTO.GanttChart();
engineer.setEngineerCode(engineerCode) engineer.setEngineerCode(engineerCode)
.setStartTime(String.format("%s 08:00", reqDTO.getDate())) .setStartTime(String.format("%s 08:00", reqDTO.getDate()))
.setEndTime(String.format("%s 18:00", reqDTO.getDate())) .setEndTime(String.format("%s 18:00", reqDTO.getDate()))
.setHoliday(false) // todo .setHoliday(false) // todo
.setOrders(mapEngineers.get(engineerCode))
.setEngineerName(engineerInfo.getName()) .setEngineerName(engineerInfo.getName())
.setGrade(engineerInfo.getGrade()); .setGrade(engineerInfo.getGrade());
...@@ -494,6 +493,9 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -494,6 +493,9 @@ public class EngineerServiceImpl implements EngineerService {
} else { } else {
engineer.setCapTotal(capacityEngineerStat.getCapTotal().toString()).setCapUsed(capacityEngineerStat.getCapUsed().toString()); engineer.setCapTotal(capacityEngineerStat.getCapTotal().toString()).setCapUsed(capacityEngineerStat.getCapUsed().toString());
} }
if (mapEngineers.containsKey(engineerCode)){
engineer.setOrders(mapEngineers.get(engineerCode));
}
// engineer.setErrorTip(); todo // engineer.setErrorTip(); todo
engineers.add(engineer); engineers.add(engineer);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!