Commit d28fc44a by Ren Ping

fix:排班结果工程师详情修改

1 parent c3266f4a
......@@ -128,6 +128,10 @@ public class ScheduleServiceImpl implements ScheduleService {
List<ScheduleOverviewResp.Item> children = new ArrayList<>();
Integer teamDistance = 0;
Integer minOrderSum=null;
Integer maxOrderSum=null;
Integer minDistance=null;
Integer maxDistance=null;
for (Map.Entry<String, List<EngineerInfoEntity>> entry : engineers.entrySet()) {
ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();
......@@ -148,12 +152,45 @@ public class ScheduleServiceImpl implements ScheduleService {
child.setDistanceDesc(distanceSum + "");
children.add(child);
if(null==minOrderSum||null==maxOrderSum){
minOrderSum=child.getOrder().getTotal();
maxOrderSum=child.getOrder().getTotal();
}else {
if(child.getOrder().getTotal()<minOrderSum){
minOrderSum=child.getOrder().getTotal();
}
if(child.getOrder().getTotal()>maxOrderSum){
maxOrderSum=child.getOrder().getTotal();
}
}
if(null==minDistance||null==maxDistance){
minDistance=distanceSum;
maxDistance=distanceSum;
}else {
if(distanceSum<minDistance){
minDistance=distanceSum;
}
if(distanceSum>maxDistance){
maxDistance=distanceSum;
}
}
}
team.setChildren(children);
team.setOrderDesc(String.format("人均:%d", teamEngineers.size() > 0 ? (orders.size() / teamEngineers.size()) : 0));
team.setDistanceDesc(teamDistance + "");
team.setOrderDesc(String.format("人数:%d,人均:%d,%s-%s",
teamEngineers.size(),
teamEngineers.size() > 0 ? (orders.size() / teamEngineers.size()) : 0,
minOrderSum,
maxOrderSum));
team.setDistanceDesc(String.format("人均:%s,%s-%s",
teamEngineers.size() > 0 ? new BigDecimal(teamDistance)
.divide(new BigDecimal(teamEngineers.size()), 2, RoundingMode.HALF_UP)
.stripTrailingZeros() : 0,
minDistance,
maxDistance));
teams.add(team);
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!