路单数据报表

廖磊
1 parent bce4952d
Showing 4 changed files with 46 additions and 16 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/entity/mcy_forms/Singledata.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/mforms/singledatas/singledata.html
@@ -186,7 +186,7 @@ public class ExportController {
 			m.put("i", i);
 			m.put("rQ", l.getrQ());
 			m.put("gS", l.getgS());
-			m.put("xL", l.getxL());
+			m.put("xL", l.getXlmc());
 			m.put("clzbh", l.getClzbh());
 			m.put("jsy", l.getJsy());
 			m.put("jName", l.getjName());
@@ -7,6 +7,7 @@ public class Singledata {
 	private String gS;//所属公司
 	private String xL;//线路
+	private String xlmc;//线路名称
 	private String clzbh;//车号
@@ -141,6 +142,14 @@ public class Singledata {
 	public void setJhjl(String jhjl) {
 		this.jhjl = jhjl;
 	}
+
+	public String getXlmc() {
+		return xlmc;
+	}
+
+	public void setXlmc(String xlmc) {
+		this.xlmc = xlmc;
+	}
@@ -765,7 +765,8 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(y.getXlbm()));
+					sin.setxL(y.getXlbm());
+					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
 					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
@@ -787,19 +788,28 @@ public class FormsServiceImpl implements FormsService {
 					String line=y.getXlbm();
 					String clzbh=y.getNbbm();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
 					for (int j = 0; j < listReal.size(); j++) {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
 							newList.add(s);
+							 Set<ChildTaskPlan> cts = s.getcTasks();
+					            if(cts != null && cts.size() > 0){
+					            	newList_.add(s);
+					            }else{
+						            if(s.getZdsjActual()!=null){
+						            	newList_.add(s);
+						            }
+					            }
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
 					double jhjcc=culateMileageService.culateJhJccgl(newList);
-					double yygl=culateMileageService.culateSjgl(newList);
-					double ljgl=culateMileageService.culateLjgl(newList);
-					double ksgl=culateMileageService.culateKsgl(newList);
-					double jcgl=culateMileageService.culateJccgl(newList);
+					double yygl=culateMileageService.culateSjgl(newList_);
+					double ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
@@ -809,7 +819,8 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(y.getXlbm()));
+					sin.setxL(y.getXlbm());
+					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
 					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
@@ -823,10 +834,10 @@ public class FormsServiceImpl implements FormsService {
 					listD.add(sin);
 				}
-			Collections.sort(listY,new SingledataByXlbm());
-			Collections.sort(listD,new SingledataByXlbm());
-			list.addAll(listY);
-			list.addAll(listD);
+				Collections.sort(listY,new SingledataByXlbm());
+				Collections.sort(listD,new SingledataByXlbm());
+				list.addAll(listY);
+				list.addAll(listD);
 			}else{
 				String sql="select r.s_gh,r.s_name, "
 						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
@@ -862,19 +873,29 @@ public class FormsServiceImpl implements FormsService {
 					String line=sin.getxL();
 					String clzbh=sin.getClzbh();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
+
 					for (int j = 0; j < listReal.size(); j++) {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getsGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
 							newList.add(s);
+							 Set<ChildTaskPlan> cts = s.getcTasks();
+					            if(cts != null && cts.size() > 0){
+					            	newList_.add(s);
+					            }else{
+						            if(s.getZdsjActual()!=null){
+						            	newList_.add(s);
+						            }
+					            }
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
 					double jhjcc=culateMileageService.culateJhJccgl(newList);
-					double yygl=culateMileageService.culateSjgl(newList);
-					double ljgl=culateMileageService.culateLjgl(newList);
-					double ksgl=culateMileageService.culateKsgl(newList);
-					double jcgl=culateMileageService.culateJccgl(newList);
+					double yygl=culateMileageService.culateSjgl(newList_);
+					double ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
@@ -221,7 +221,7 @@
 			<td>{{i+1}}</td>
 			<td>{{obj.rQ}}</td>
 			<td>{{obj.gS}}</td>
- 			<td>{{obj.xL}}</td>
+ 			<td>{{obj.xlmc}}</td>
 			<td>{{obj.clzbh}}</td>
 			<td>{{obj.jsy}}</td>
 			<td>{{obj.jName}}</td>