营运服务报表车辆加注表

廖磊
1 parent 00864ff1
Showing 1 changed file with 31 additions and 14 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
@@ -33,6 +33,7 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.LineRepository;
@@ -1031,9 +1032,16 @@ public class FormsServiceImpl implements FormsService {
 				List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
 				for (int j = 0; j < listReal.size(); j++) {
-					ScheduleRealInfo s=listReal.get(j);
-					if(s.getXlBm().equals(line) && !lineSet.contains(s.getXlName())){
-						newList.add(s);
+					ScheduleRealInfo s = listReal.get(j);
+					if (s.getXlBm().equals(line) && !lineSet.contains(s.getXlName())) {
+						Set<ChildTaskPlan> cts = s.getcTasks();
+						if (cts != null && cts.size() > 0) {
+							newList.add(s);
+						} else {
+							if (s.getZdsjActual() != null) {
+								newList.add(s);
+							}
+						}
 					}
 				}
@@ -1041,12 +1049,12 @@ public class FormsServiceImpl implements FormsService {
 				int ljbc=culateMileageService.culateLjbc(newList,"");
 				double ksgl=culateMileageService.culateKsgl(newList);
 				double jccgl=culateMileageService.culateJccgl(newList);
-						
+				double zksgl=Arith.add(ksgl, jccgl);
 			    double sjgl=culateMileageService.culateSjgl(newList);
 				double ljgl=culateMileageService.culateLjgl(newList);
-				
+				double zyygl=Arith.add(sjgl, ljgl);
 				o.setEmptMileage(String.valueOf(Arith.add(ksgl, jccgl)));
-				o.setXsgl(String.valueOf(Arith.add(sjgl, ljgl)));
+				o.setXsgl(String.valueOf(Arith.add(zyygl, zksgl)));
 				o.setSjbc(String.valueOf(sjbc+ljbc));
 				double jzl=0.0;
@@ -1103,24 +1111,33 @@ public class FormsServiceImpl implements FormsService {
 		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
 		for (int i = 0; i < list.size(); i++) {
 			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+			List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
 			Vehicleloading sin=list.get(i);
 			sin.setrQ(date);
 			String jsy=sin.getJgh();
 			String clzbh=sin.getClzbh();
 			for (int j = 0; j < listReal.size(); j++) {
-				ScheduleRealInfo s=listReal.get(j);
-				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
+				ScheduleRealInfo s = listReal.get(j);
+				if (s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)) {
+					Set<ChildTaskPlan> cts = s.getcTasks();
+					if (cts != null && cts.size() > 0) {
+						newList_.add(s);
+					} else {
+						if (s.getZdsjActual() != null) {
+							newList_.add(s);
+						}
+					}
 					newList.add(s);
 				}
 			}
 			int jhbc=culateMileageService.culateJhbc(newList, "");
-			int sjbc=culateMileageService.culateSjbc(newList, "");
-			int ljbc=culateMileageService.culateLjbc(newList, "");
-			double yygl=culateMileageService.culateSjgl(newList);
-			double ljgl=culateMileageService.culateLjgl(newList);
-			double ksgl=culateMileageService.culateKsgl(newList);
-			double jcgl=culateMileageService.culateJccgl(newList);
+			int sjbc=culateMileageService.culateSjbc(newList_, "");
+			int ljbc=culateMileageService.culateLjbc(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);
 			sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));