大间隔原有定时统计屏蔽

廖磊
1 parent 1deb3207
Showing 2 changed files with 14 additions and 14 deletions
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -116,7 +116,7 @@ public class CalcToolServiceImpl implements CalcToolService {
 		}
 		//按线路计算大间隔
-        if(list.size() > 0){
+       /* if(list.size() > 0){
 			ScheduleRealInfo s = list.get(0);
 			Map<String, Object> culateDjg = culateMileageService.culateDjg(list, lineCode, xlList, djgList);
 			CalcInterval interval = new CalcInterval();
@@ -156,7 +156,7 @@ public class CalcToolServiceImpl implements CalcToolService {
 				interval.setDjgTime(0);
 			}
 			culcIntervalRepository.save(interval);
-        }
+        }*/
         while(true){
 			int i = 0, l = 0;
@@ -163,10 +163,10 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			}
 			if(date.length() != 0 && line.length() != 0){
 				calcRepository.deleteByDateAndLine(date, line);
-				calcIntervalRepository.deleteByDateAndLine(date, line);
+				//calcIntervalRepository.deleteByDateAndLine(date, line);
 			} else if(date.length() != 0){
 				calcRepository.deleteByDate(date);
-				calcIntervalRepository.deleteByDate(date);
+				//calcIntervalRepository.deleteByDate(date);
 			} else {
 				newMap.put("status", ResponseCode.ERROR);
 				logger.error("save erro.", "日期不能为空");
@@ -283,19 +283,19 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		List<String> keyList = new ArrayList<String>();
 		List<CalcWaybill> list = new ArrayList<CalcWaybill>();
 		List<CalcWaybill> lists = new ArrayList<CalcWaybill>();
-		List<CalcInterval> list_ = new ArrayList<CalcInterval>();
+	//	List<CalcInterval> list_ = new ArrayList<CalcInterval>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, List<CalcWaybill>> keyMap = new HashMap<String, List<CalcWaybill>>();
-		Map<String, List<CalcInterval>> keyMap_ = new HashMap<String, List<CalcInterval>>();
+	//	Map<String, List<CalcInterval>> keyMap_ = new HashMap<String, List<CalcInterval>>();
 		if(line.equals("")){
             //查询所有线路
             list = calcRepository.scheduleByDateAndLineTj(line,date,date2,gsdm,fgsdm);
-            list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2, gsdm, fgsdm);
+          //  list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2, gsdm, fgsdm);
         }else{
             //查询单条线路
             list = calcRepository.scheduleByDateAndLineTj2(line,date,date2);
-            list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2);
+         //  list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2);
         }
 		for(CalcWaybill c : list){
@@ -306,12 +306,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			}
 			keyMap.get(key).add(c);
 		}
-		for(CalcInterval c : list_){
+		/*for(CalcInterval c : list_){
 			String key = c.getXlName();
 			if(!keyMap_.containsKey(key))
 				keyMap_.put(key, new ArrayList<CalcInterval>());
 			keyMap_.get(key).add(c);
-		}
+		}*/
 		Collections.sort(keyList, new AccountXlbmStr());
 		for(String key : keyList){
 			CalcWaybill calc = keyMap.get(key).get(0);
@@ -356,7 +356,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			calc.setSjfyylc(Arith.add(calc.getSjfyylc(), calc.getLjfyylc()));
 			lists.add(calc);
 		}
-		CalcInterval sum_ = new CalcInterval();
+		/*CalcInterval sum_ = new CalcInterval();
 		sum_.setXlName("合计");
 		sum_.setDjgTime(0);
 		for(String key : keyMap_.keySet()){
@@ -374,7 +374,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			sum_.setDjgA(sum_.getDjgA() + calc.getDjgA());
 			if(calc.getDjgTime() > sum_.getDjgTime())
 				sum_.setDjgTime(calc.getDjgTime());
-		}
+		}*/
 		CalcWaybill sum = new CalcWaybill();
 		sum.setXlName("合计");
@@ -459,7 +459,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			m.put("dtbc", c.getDtbc());
 			m.put("dtbc_m", c.getDtbczgf());
 			m.put("dtbc_a", c.getDtbcwgf());
-			if(keyMap_.containsKey(c.getXlName()) || c.getXlName().equals("合计")){
+			/*if(keyMap_.containsKey(c.getXlName()) || c.getXlName().equals("合计")){
 				CalcInterval calc;
 				if(c.getXlName().equals("合计"))
 					calc = sum_;
@@ -474,7 +474,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				m.put("djg_m", 0);
 				m.put("djg_a", 0);
 				m.put("djg_time", 0);
-			}
+			}*/
 			resList.add(m);
 		}