Merge branch 'lggj' of http://61.169.120.202:8888/panzhaov5/bsth_control into lggj

王通
2 parents 1550ce8c 0221d131
Showing 2 changed files with 21 additions and 41 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
 package com.bsth.service.impl;
-import java.io.File;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.data.BasicData;
@@ -49,13 +22,23 @@ import com.bsth.service.LineService;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
-import com.bsth.util.Arith;
-import com.bsth.util.ComparableChild;
-import com.bsth.util.ComparableReal;
-import com.bsth.util.ReportRelatedUtils;
-import com.bsth.util.ReportUtils;
-import com.bsth.util.TimeUtils;
+import com.bsth.util.*;
 import com.google.gson.Gson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
@@ -2883,7 +2866,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				Map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
 				Map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
 				Map<String,Double> ljmap = culateService.culateLjgl_yy_ks(lists);
-				Map.put("addMileage_yy", ljmap.get("addMileage_yy")); //临加烂班公里
+				Map.put("addMileage_yy", ljmap.get("addMileage_yy")); //临加营运公里
 				Map.put("addMileage_ks", ljmap.get("addMileage_ks")); //临加烂班公里
 		        double yygl=Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists));
 		        Map.put("yygl", yygl);
@@ -13,12 +13,9 @@ import com.bsth.util.ComparableJob;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -548,7 +545,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 					if(childTaskPlans.isEmpty()){
 						if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-								|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+								 || scheduleRealInfo.getBcType().equals("ldks")){
 							addMileage_ks=Arith.add(addMileage_ks,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
 						}else {
 							addMileage_yy=Arith.add(addMileage_yy,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
@@ -561,7 +558,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 								if (!childTaskPlan.isDestroy()) {
 									Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 									if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-											|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+											|| scheduleRealInfo.getBcType().equals("ldks")){
 										addMileage_ks=Arith.add(addMileage_ks,jhgl);
 									}else {
 										addMileage_yy=Arith.add(addMileage_yy,jhgl);
@@ -578,7 +575,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						double zjlc=Arith.sub(jhlc, jhlcOrig);
 						if(zjlc>0){
 							if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-									|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+									|| scheduleRealInfo.getBcType().equals("ldks")){
 								addMileage_ks=Arith.add(addMileage_ks,ljgl);
 							}else {
 								addMileage_yy=Arith.add(addMileage_yy,ljgl);
@@ -593,7 +590,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									if (!childTaskPlan.isDestroy()) {
 										Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 										if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-												|| scheduleRealInfo.getBcType().equals("venting") || scheduleRealInfo.getBcType().equals("ldks")){
+												|| scheduleRealInfo.getBcType().equals("ldks")){
 											addMileage_ks=Arith.add(addMileage_ks,jhgl);
 										}else {
 											addMileage_yy=Arith.add(addMileage_yy,jhgl);