Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents bfea90a6 5c2b5f67
Showing 3 changed files with 13 additions and 10 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/dts2/employeeGroup/saEmployeegroup.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
@@ -801,6 +801,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String nbbm = map.get("nbbm").toString();
 		String type = map.get("type").toString();
+		String companyName = "";
+		String subCompanyName = "";
+		String lineName = "";
+		
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		}
@@ -934,8 +938,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempList.add(m7);
 		}
-		String companyName = "";
-		String subCompanyName = "";
 		//按时间段分组
 		for(ScheduleRealInfo schedule : list){
@@ -947,6 +949,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					&&schedule.getFgsName().trim().length()!=0){
 				subCompanyName = schedule.getFgsName();
 			}
+			if(lineName.length()==0&&schedule.getXlName()!=null
+					&&schedule.getXlName().trim().length()!=0){
+				lineName = schedule.getXlName();
+			}
 			if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){
 				Long fcsjA = schedule.getFcsjActualTime();
@@ -1005,6 +1011,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		for(String key : keyMap.keySet()){
 			Map<String, Object> m = null;
 			for(Map<String, Object> map2 : tempList){
+				map2.put("line", lineName.trim());
+				map2.put("company", companyName.trim());
+				map2.put("subCompany", subCompanyName.trim());
 				if(map2.get("time").toString().equals(key)){
 					m = map2;
 				}
@@ -1020,18 +1029,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					dnbc++;
 					dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 				}
-				
-				if(schedule.getXlName() != null && schedule.getXlName().trim().length() != 0){
-					m.put("line", schedule.getXlName());
-				}
 			}
 			m.put("upbc", upbc);
 			m.put("dnbc", dnbc);
 			m.put("upys", upbc > 0 ? nf.format((float)upys / upbc) : "/");
 			m.put("dnys", dnbc > 0 ? nf.format((float)dnys / dnbc) : "/");
 			m.put("pjys", (upbc + dnbc) > 0 ? nf.format((float) (upys + dnys) / (upbc + dnbc)) : "/");
-			m.put("company", companyName.trim());
-			m.put("subCompany", subCompanyName.trim());
 		}
 		if(flag){
@@ -646,7 +646,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
                                 console.log("xlidvalue=" + value);
                                 employeeConfigService_g.rest.list(
-                                    {"xl.id_eq": value, "isCancel_eq" : false, size: 100},
+                                    {"xl.id_eq": value, "isCancel_eq" : false, size: 200},
                                     function(result) {
                                         // 获取值了
                                         console.log("人员配置获取了");
@@ -3371,7 +3371,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
                                 console.log("xlidvalue=" + value);
                                 employeeConfigService_g.rest.list(
-                                    {"xl.id_eq": value, "isCancel_eq" : false, size: 100},
+                                    {"xl.id_eq": value, "isCancel_eq" : false, size: 200},
                                     function(result) {
                                         // 获取值了
                                         console.log("人员配置获取了");