行车路单年报表，日期错误异常修复

娄高锋
1 parent c1cb3544
Showing 1 changed file with 45 additions and 25 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -12,7 +12,6 @@ import com.bsth.entity.calc.CalcLineMileage;
 import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.calc.CalcWaybillDetail;
-import com.bsth.entity.oil.Cwjy;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -38,6 +37,7 @@ import com.bsth.util.ReportUtils;
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1931,7 +1931,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				fgsdm.add(fgsdms[i]);
 			}
 		}
-//		String line= null;
 		List<String> line= new ArrayList<>();
 		String lineStr = "";
 		if(map.get("lineCode")!=null){
@@ -1941,6 +1940,14 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				line.add(lines[i]);
 			}
 		}
+		//查询全部线路(测试时使用)
+//		Iterable<Line> findAll = lineService.findAll();
+//		for(Line l : findAll){
+//			line.add(l.getLineCode());
+//			lineStr += l.getLineCode() + ",";
+//		}
+//		lineStr = lineStr.substring(0, lineStr.length() - 1);
+		
 		String startDate="";
 		if(map.get("startDate")!=null){
 			startDate=map.get("startDate").toString().trim();
@@ -1990,7 +1997,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				dayList.add(daym);
 			}
 			startDate += "-01";
-			endDate += "-31";
+			try {
+				endDate = dateFormat.format(new Date(dateFormat.parse(dateFormat.format(dateFormat.parse(endDate + "-32")).substring(0,7) + "-01").getTime() - 1l*1000*60*60*24));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 		int flag = 0;
@@ -2474,9 +2486,17 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				}
 				dayc = dayList.get(dayIndex).get(cw.getRqStr());
 			} else if("y".equals(timeType)){
-				while (!dayList.get(dayIndex).containsKey(cw.getRqStr().substring(0,7))){
-					calcList.add(new CalcWaybillDetail());
-					dayIndex++;
+				if(calcList.size() < dayList.size()){	//列还没加满则往后加新的列
+					while (dayList.size() > dayIndex && !dayList.get(dayIndex).containsKey(cw.getRqStr().substring(0,7))){
+						calcList.add(new CalcWaybillDetail());
+						dayIndex++;
+					}
+				} else {	//列已经加满说明是前面的日期
+					int temp = 0;
+					while (!dayList.get(temp).containsKey(cw.getRqStr().substring(0,7))){
+						temp++;
+					}
+					dayIndex = temp;
 				}
 				dayc = dayList.get(dayIndex).get(cw.getRqStr().substring(0,7));
 			}
@@ -2568,7 +2588,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		}
 		int i=1;
-        DecimalFormat df = new DecimalFormat("0.00");//格式化小数
+        DecimalFormat df = new DecimalFormat("0.000");//格式化小数
 		double allNum = 0.0;
 		while (iter.hasNext()) {
 			Map.Entry entry = (Map.Entry) iter.next();
@@ -2597,11 +2617,11 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			} else if("xl".equals(statisticalObj)){
 			}
-			listStr.add(df.format(c.getJhyylc()+c.getJhfyylc()));
-			listStr.add(df.format(c.getSjyylc()+c.getSjfyylc()+c.getLjyylc()+c.getLjfyylc()));
-//			listStr.add(df.format(c.getSjyylc()+c.getLjyylc()));
-			listStr.add(df.format(c.getSjfyylc()+c.getLjfyylc()));
-			listStr.add(df.format(c.getLjyylc()+c.getLjfyylc()));
+			listStr.add(df.format(Arith.add(c.getJhyylc(), c.getJhfyylc())));
+			listStr.add(df.format(Arith.add(Arith.add(c.getSjyylc(), c.getSjfyylc()),
+					Arith.add(c.getLjyylc(), c.getLjfyylc()))));
+			listStr.add(df.format(Arith.add(c.getSjfyylc(), c.getLjfyylc())));
+			listStr.add(df.format(Arith.add(c.getLjyylc(), c.getLjfyylc())));
 			listStr.add(df.format(c.getLblc()));
 			listStr.add(c.getTs()+"");
 			c.setBglhd(c.getBglhd()/c.getTs());
@@ -2639,9 +2659,10 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                         listStr.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
 //                        listStr.add(df.format(c1.getBglhd()));
                     } else if("zgl".equals(itemDetails)){
-                        listStr.add(df.format((c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
+                    	listStr.add(df.format(Arith.add(Arith.add(c1.getSjyylc(), c1.getSjfyylc()),
+                    			Arith.add(c1.getLjyylc(), c1.getLjfyylc()))));
                     } else if("jhgl".equals(itemDetails)){
-                        listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc()));
+                    	listStr.add(df.format(Arith.add(c1.getJhyylc(), c1.getJhfyylc())));
                     } else if("sjbc".equals(itemDetails)){
                         listStr.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
                     } else if("jhbc".equals(itemDetails)){
@@ -2649,18 +2670,18 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     }
                 }
             }
-			allNum = allNum + Double.parseDouble(listStr.get(listStr.size()-1));
+			allNum = Arith.add(allNum, Double.parseDouble(listStr.get(listStr.size()-1)));
 			resList.add(listStr);
 		}
 		// 合计列
 		List<String> listEnd = new ArrayList<>();
 		listEnd.add("合计");
-		listEnd.add(df.format(zjCalc.getJhyylc()+zjCalc.getJhfyylc()));
-		listEnd.add(df.format(zjCalc.getSjfyylc()+zjCalc.getSjyylc()+zjCalc.getLjyylc()+zjCalc.getLjfyylc()));//总公里
-//		listEnd.add(df.format(zjCalc.getSjyylc()+zjCalc.getLjyylc()));//营运
-		listEnd.add(df.format(zjCalc.getSjfyylc()+zjCalc.getLjfyylc()));
-		listEnd.add(df.format(zjCalc.getLjfyylc()+zjCalc.getLjyylc()));
+		listEnd.add(df.format(Arith.add(zjCalc.getJhyylc(), zjCalc.getJhfyylc())));
+		listEnd.add(df.format(Arith.add(Arith.add(zjCalc.getSjyylc(), zjCalc.getSjfyylc()),
+				Arith.add(zjCalc.getLjyylc(), zjCalc.getLjfyylc()))));//总公里
+		listEnd.add(df.format(Arith.add(zjCalc.getSjfyylc(), zjCalc.getLjfyylc())));
+		listEnd.add(df.format(Arith.add(zjCalc.getLjyylc(), zjCalc.getLjfyylc())));
 		listEnd.add(df.format(zjCalc.getLblc()));
 		listEnd.add(zjCalc.getTs()+"");
 		double all = 0.0;
@@ -2693,16 +2714,17 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 //					listEnd.add(df.format(c1.getBglhd()));
 					listEnd.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
 				} else if("zgl".equals(itemDetails)){
-					listEnd.add((df.format(c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
+					listEnd.add(df.format(Arith.add(Arith.add(c1.getSjyylc(), c1.getSjfyylc()),
+                			Arith.add(c1.getLjyylc(), c1.getLjfyylc()))));
 				} else if("jhgl".equals(itemDetails)){
-					listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc())));
+					listEnd.add(df.format(Arith.add(c1.getJhyylc(), c1.getJhfyylc())));
 				} else if("sjbc".equals(itemDetails)){
 					listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
 				} else if("jhbc".equals(itemDetails)){
 					listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+"");
 				}
 			}
-			all = all + Double.parseDouble(listEnd.get(listEnd.size()-1));
+			all = Arith.add(all, Double.parseDouble(listEnd.get(listEnd.size()-1)));
 		}
 		// 百公里电油耗时为平均数
@@ -2753,10 +2775,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		c1.setJhfyylc(Arith.add(c1.getJhfyylc(), c2.getJhfyylc()));
 		c1.setSjyybc(c1.getSjyybc() + c2.getSjyybc());
 		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getSjyylc()));
-//		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getLjyylc()));// 把临加的也算上了，后面不用加了
 		c1.setSjfyybc(c1.getSjfyybc() + c2.getSjfyybc());
 		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getSjfyylc()));
-//		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getLjfyylc()));// 把临加的也算上了，后面不用加了
 		c1.setLbbc(c1.getLbbc() + c2.getLbbc());
 		c1.setLblc(Arith.add(c1.getLblc(), c2.getLblc()));
 		c1.setLjbc(c1.getLjbc() + c2.getLjbc());