报表

廖磊
1 parent 3fa0edcc
Showing 3 changed files with 17 additions and 9 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
@@ -130,20 +130,25 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							for (int i = 0; i < ylListBe.size(); i++) {
 								Ylb ylb=ylListBe.get(i);
 								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
-									if(ylb.getJzyl()>0){
-										t.setCzyl(ylb.getJzyl());
-										fage=false;
-										break;
+									if(ylb.getJzyl()!=null){
+										if(ylb.getJzyl()>0){
+											t.setCzyl(ylb.getJzyl());
+											fage=false;
+											break;
+										}
 									}
+									
 								}
 							}
 							if(fage){
 								for (int y = 0; y < clyList.size(); y++) {
 									Cyl cyl=clyList.get(y);
 									if(map.get("clZbh").toString().equals(cyl.getNbbm())){
-										t.setCzyl(cyl.getCyl());
-										fage=false;
-										break;
+										if(cyl.getCyl()!=null){
+											t.setCzyl(cyl.getCyl());
+											fage=false;
+											break;
+										}
 									}
 								}
 							}
@@ -1377,13 +1377,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("addMileage", format.format(addMileage));
         map.put("yygl", format.format(yygl+addMileageYy));
         map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
+        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileageYy));
+//        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
         map.put("jhbc", jhbc);
         map.put("cjbc", cjbc);
         map.put("ljbc", ljbc);
         map.put("sjbc", jhbc - cjbc + ljbc);
         map.put("jcclc", jcclc);
-        map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
+        map.put("zkslc", format.format(ksgl + jcclc));
+//        map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
         return map;
     }
@@ -250,6 +250,7 @@
 			});
 		});
+		
 		$("#export").on("click",function(){
 			if(params.length < 1){
 				return;