潘钊 / bsth_control · Commits

Commit 5c2b5f6703ccac68a3207047e1673b6e6ce9dfa6

Authored by 娄高锋
1 parent b726d442
build: skipped

update

Inline Side-by-side
Showing 1 changed file with 11 additions and 8 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @5c2b5f6
@@ -801,6 +801,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -801,6 +801,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
801 String nbbm = map.get("nbbm").toString(); 801 String nbbm = map.get("nbbm").toString();
802 String type = map.get("type").toString(); 802 String type = map.get("type").toString();
803 803
  804 + String companyName = "";
  805 + String subCompanyName = "";
  806 + String lineName = "";
  807 +
804 if(startDate.length() == 0){ 808 if(startDate.length() == 0){
805 startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); 809 startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
806 } 810 }
@@ -934,8 +938,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -934,8 +938,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
934 tempList.add(m7); 938 tempList.add(m7);
935 } 939 }
936 940
937 - String companyName = "";  
938 - String subCompanyName = "";  
939 941
940 //按时间段分组 942 //按时间段分组
941 for(ScheduleRealInfo schedule : list){ 943 for(ScheduleRealInfo schedule : list){
@@ -947,6 +949,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -947,6 +949,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
947 &&schedule.getFgsName().trim().length()!=0){ 949 &&schedule.getFgsName().trim().length()!=0){
948 subCompanyName = schedule.getFgsName(); 950 subCompanyName = schedule.getFgsName();
949 } 951 }
  952 + if(lineName.length()==0&&schedule.getXlName()!=null
  953 + &&schedule.getXlName().trim().length()!=0){
  954 + lineName = schedule.getXlName();
  955 + }
950 956
951 if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){ 957 if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){
952 Long fcsjA = schedule.getFcsjActualTime(); 958 Long fcsjA = schedule.getFcsjActualTime();
@@ -1005,6 +1011,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1005,6 +1011,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1005 for(String key : keyMap.keySet()){ 1011 for(String key : keyMap.keySet()){
1006 Map<String, Object> m = null; 1012 Map<String, Object> m = null;
1007 for(Map<String, Object> map2 : tempList){ 1013 for(Map<String, Object> map2 : tempList){
  1014 + map2.put("line", lineName.trim());
  1015 + map2.put("company", companyName.trim());
  1016 + map2.put("subCompany", subCompanyName.trim());
1008 if(map2.get("time").toString().equals(key)){ 1017 if(map2.get("time").toString().equals(key)){
1009 m = map2; 1018 m = map2;
1010 } 1019 }
@@ -1020,18 +1029,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1020,18 +1029,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1020 dnbc++; 1029 dnbc++;
1021 dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime(); 1030 dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
1022 } 1031 }
1023 -  
1024 - if(schedule.getXlName() != null && schedule.getXlName().trim().length() != 0){  
1025 - m.put("line", schedule.getXlName());  
1026 - }  
1027 } 1032 }
1028 m.put("upbc", upbc); 1033 m.put("upbc", upbc);
1029 m.put("dnbc", dnbc); 1034 m.put("dnbc", dnbc);
1030 m.put("upys", upbc > 0 ? nf.format((float)upys / upbc) : "/"); 1035 m.put("upys", upbc > 0 ? nf.format((float)upys / upbc) : "/");
1031 m.put("dnys", dnbc > 0 ? nf.format((float)dnys / dnbc) : "/"); 1036 m.put("dnys", dnbc > 0 ? nf.format((float)dnys / dnbc) : "/");
1032 m.put("pjys", (upbc + dnbc) > 0 ? nf.format((float) (upys + dnys) / (upbc + dnbc)) : "/"); 1037 m.put("pjys", (upbc + dnbc) > 0 ? nf.format((float) (upys + dnys) / (upbc + dnbc)) : "/");
1033 - m.put("company", companyName.trim());  
1034 - m.put("subCompany", subCompanyName.trim());  
1035 } 1038 }
1036 1039
1037 if(flag){ 1040 if(flag){