Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java

@@ -477,14 +477,13 @@ public class EngineerServiceImpl implements EngineerService {
         }
 
         List<EngineersGanttRespDTO.GanttChart> engineers = new ArrayList<>();
-        for (String engineerCode : mapEngineers.keySet()) {
+        for (String engineerCode : reqDTO.getEngineerCodes()) {
             EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(engineerCode);
             EngineersGanttRespDTO.GanttChart engineer = new EngineersGanttRespDTO.GanttChart();
             engineer.setEngineerCode(engineerCode)
                     .setStartTime(String.format("%s 08:00", reqDTO.getDate()))
                     .setEndTime(String.format("%s 18:00", reqDTO.getDate()))
                     .setHoliday(false) // todo
-                    .setOrders(mapEngineers.get(engineerCode))
                     .setEngineerName(engineerInfo.getName())
                     .setGrade(engineerInfo.getGrade());
 
@@ -494,6 +493,9 @@ public class EngineerServiceImpl implements EngineerService {
             } else {
                 engineer.setCapTotal(capacityEngineerStat.getCapTotal().toString()).setCapUsed(capacityEngineerStat.getCapUsed().toString());
             }
+            if (mapEngineers.containsKey(engineerCode)){
+                engineer.setOrders(mapEngineers.get(engineerCode));
+            }
             // engineer.setErrorTip(); todo
             engineers.add(engineer);
         }