潘钊 / bsth_control · Commits

Commit 89519584c3190ed0cdee70117ed6975db57af047

Authored by 廖磊
1 parent 1deb3207

大间隔原有定时统计屏蔽

Inline Side-by-side
Showing 2 changed files with 14 additions and 14 deletions
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
  View file @8951958
... ... @@ -116,7 +116,7 @@ public class CalcToolServiceImpl implements CalcToolService {
116 116 }
117 117  
118 118 //按线路计算大间隔
119   - if(list.size() > 0){
  119 + /* if(list.size() > 0){
120 120 ScheduleRealInfo s = list.get(0);
121 121 Map<String, Object> culateDjg = culateMileageService.culateDjg(list, lineCode, xlList, djgList);
122 122 CalcInterval interval = new CalcInterval();
... ... @@ -156,7 +156,7 @@ public class CalcToolServiceImpl implements CalcToolService {
156 156 interval.setDjgTime(0);
157 157 }
158 158 culcIntervalRepository.save(interval);
159   - }
  159 + }*/
160 160  
161 161 while(true){
162 162 int i = 0, l = 0;
... ...
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @8951958
... ... @@ -163,10 +163,10 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
163 163 }
164 164 if(date.length() != 0 && line.length() != 0){
165 165 calcRepository.deleteByDateAndLine(date, line);
166   - calcIntervalRepository.deleteByDateAndLine(date, line);
  166 + //calcIntervalRepository.deleteByDateAndLine(date, line);
167 167 } else if(date.length() != 0){
168 168 calcRepository.deleteByDate(date);
169   - calcIntervalRepository.deleteByDate(date);
  169 + //calcIntervalRepository.deleteByDate(date);
170 170 } else {
171 171 newMap.put("status", ResponseCode.ERROR);
172 172 logger.error("save erro.", "日期不能为空");
... ... @@ -283,19 +283,19 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
283 283 List<String> keyList = new ArrayList<String>();
284 284 List<CalcWaybill> list = new ArrayList<CalcWaybill>();
285 285 List<CalcWaybill> lists = new ArrayList<CalcWaybill>();
286   - List<CalcInterval> list_ = new ArrayList<CalcInterval>();
  286 + // List<CalcInterval> list_ = new ArrayList<CalcInterval>();
287 287 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
288 288 Map<String, List<CalcWaybill>> keyMap = new HashMap<String, List<CalcWaybill>>();
289   - Map<String, List<CalcInterval>> keyMap_ = new HashMap<String, List<CalcInterval>>();
  289 + // Map<String, List<CalcInterval>> keyMap_ = new HashMap<String, List<CalcInterval>>();
290 290  
291 291 if(line.equals("")){
292 292 //查询所有线路
293 293 list = calcRepository.scheduleByDateAndLineTj(line,date,date2,gsdm,fgsdm);
294   - list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2, gsdm, fgsdm);
  294 + // list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2, gsdm, fgsdm);
295 295 }else{
296 296 //查询单条线路
297 297 list = calcRepository.scheduleByDateAndLineTj2(line,date,date2);
298   - list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2);
  298 + // list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2);
299 299 }
300 300  
301 301 for(CalcWaybill c : list){
... ... @@ -306,12 +306,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
306 306 }
307 307 keyMap.get(key).add(c);
308 308 }
309   - for(CalcInterval c : list_){
  309 + /*for(CalcInterval c : list_){
310 310 String key = c.getXlName();
311 311 if(!keyMap_.containsKey(key))
312 312 keyMap_.put(key, new ArrayList<CalcInterval>());
313 313 keyMap_.get(key).add(c);
314   - }
  314 + }*/
315 315 Collections.sort(keyList, new AccountXlbmStr());
316 316 for(String key : keyList){
317 317 CalcWaybill calc = keyMap.get(key).get(0);
... ... @@ -356,7 +356,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
356 356 calc.setSjfyylc(Arith.add(calc.getSjfyylc(), calc.getLjfyylc()));
357 357 lists.add(calc);
358 358 }
359   - CalcInterval sum_ = new CalcInterval();
  359 + /*CalcInterval sum_ = new CalcInterval();
360 360 sum_.setXlName("合计");
361 361 sum_.setDjgTime(0);
362 362 for(String key : keyMap_.keySet()){
... ... @@ -374,7 +374,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
374 374 sum_.setDjgA(sum_.getDjgA() + calc.getDjgA());
375 375 if(calc.getDjgTime() > sum_.getDjgTime())
376 376 sum_.setDjgTime(calc.getDjgTime());
377   - }
  377 + }*/
378 378  
379 379 CalcWaybill sum = new CalcWaybill();
380 380 sum.setXlName("合计");
... ... @@ -459,7 +459,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
459 459 m.put("dtbc", c.getDtbc());
460 460 m.put("dtbc_m", c.getDtbczgf());
461 461 m.put("dtbc_a", c.getDtbcwgf());
462   - if(keyMap_.containsKey(c.getXlName()) || c.getXlName().equals("合计")){
  462 + /*if(keyMap_.containsKey(c.getXlName()) || c.getXlName().equals("合计")){
463 463 CalcInterval calc;
464 464 if(c.getXlName().equals("合计"))
465 465 calc = sum_;
... ... @@ -474,7 +474,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
474 474 m.put("djg_m", 0);
475 475 m.put("djg_a", 0);
476 476 m.put("djg_time", 0);
477   - }
  477 + }*/
478 478 resList.add(m);
479 479 }
480 480  
... ...