Merge branch 'pudong' into pudong_jdk8

# Conflicts: # src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java

Merge branch 'pudong' into pudong_jdk8
# Conflicts: # src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
游瑞烽
2 parents 8fd41b90 f7de1d19
Showing 4 changed files with 149 additions and 93 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/forms/calc/calcDetailMonthly.html
src/main/resources/static/pages/forms/calc/calcDetailYear.html
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.calc.CalcBusMileage;
 import com.bsth.entity.calc.CalcInterval;
@@ -16,6 +17,7 @@ import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Interval;
+import com.bsth.repository.CarsRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.calc.CalcBusMileageRepository;
 import com.bsth.repository.calc.CalcIntervalRepository;
@@ -91,7 +93,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
     private LineService lineService;
     @Autowired
     private ReportService reportService;
-    
+    @Autowired
+	CarsRepository carsRepository;
+
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -1348,7 +1352,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			} else {
 				calcLineMileageRepository.deleteByDate(date);
 			}
-			calcLineMileageRepository.saveAll(list);
+			calcLineMileageRepository.save(list);
 			resMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -1474,7 +1478,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			} else {
 				calcBusMileageRepository.deleteByDate(date);
 			}
-			calcBusMileageRepository.saveAll(list);
+			calcBusMileageRepository.save(list);
 			resMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -2207,6 +2211,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		} else if(flag==3){
 			list1.add("自编号");
 			list1.add("车牌号");
+			list1.add("燃油类型");
 		}
 		list1.add("计划公里");
 		list1.add("总公里");
@@ -2223,8 +2228,14 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			list1.add("合计");
 		resList.add(list1);
-		int i=1;
+		Map<String, String> carsMap = new HashMap<>();
+		List<Cars> carsList = carsRepository.findCars();
+		for (Cars c:carsList) {
+			String sfdc = c.getSfdc()+"";
+			carsMap.put(c.getInsideCode(), sfdc.equals("true")?"纯电动":"柴油");
+		}
+		int i=1;
         DecimalFormat df = new DecimalFormat("0.00");//格式化小数
 		double allNum = 0.0;
 		while (iter.hasNext()) {
@@ -726,20 +726,28 @@ public class ReportUtils {
 		//设置wordsheet名
 		HSSFSheet sheetYS = workbook.createSheet();//设置wordsheet名
+		HSSFRow row = sheetYS.createRow(0);
+		setCellStyleAndValue(row, style, 0, name);
+		CellRangeAddress callRangeAddress = new CellRangeAddress(0,0,0,list.get(0).size()-1);
+		sheetYS.addMergedRegion(callRangeAddress);
+		// 样式
+		setMergeCellStyle (callRangeAddress, sheetYS, workbook);
 		try{
 			for(int i=0; i<list.size(); i++){
-				HSSFRow rowYSi = sheetYS.createRow(i);
+				HSSFRow rowYSi = sheetYS.createRow(i+1);
 				List<String> stringList = list.get(i);
 				int num = 4;
 				if("xl".equals(type))
 					num = 2;
+				else if("cl".equals(type))
+					num = 5;
 				for(int j=0; j<stringList.size(); j++){
 					String str = stringList.get(j);
 					if(i == list.size()-1){
 						if(j==0) {
 							setCellStyleAndValue(rowYSi, style, j, str);
-							CellRangeAddress callRangeAddressYSi = new CellRangeAddress(i,i,0,num);
+							CellRangeAddress callRangeAddressYSi = new CellRangeAddress(i+1,i+1,0,num);
 							sheetYS.addMergedRegion(callRangeAddressYSi);
 							// 样式
 							setMergeCellStyle (callRangeAddressYSi, sheetYS, workbook);
@@ -752,7 +760,7 @@ public class ReportUtils {
 			}
             // 给列设置宽度自适应
-            setSizeColumn(sheetYS,list.get(0).size());
+			setSizeColumn1(sheetYS,1,list.get(0).size());
             String path = this.getClass().getResource("/").getPath() + "static/pages/forms/export/";
 			String targetPath = path+name+".xls";
 			createFolder(targetPath);
@@ -761,6 +769,7 @@ public class ReportUtils {
 			workbook.write(fout);
 			fout.close();
 		} catch (Exception e) {
+			e.printStackTrace();
 		}
 	}
@@ -795,6 +804,38 @@ public class ReportUtils {
         }
     }
+    /**
+     * 自适应宽度(中文支持)
+     * @param sheet
+     * @param index 从那一行开始自适应
+     * @param size
+     */
+    private static void setSizeColumn1(HSSFSheet sheet,int index, int size) {
+        for (int columnNum = index; columnNum < size; columnNum++) {
+            int columnWidth = sheet.getColumnWidth(columnNum) / 256;
+            for (int rowNum = 0; rowNum < sheet.getLastRowNum(); rowNum++) {
+                HSSFRow currentRow;
+                //当前行未被使用过
+                if (sheet.getRow(rowNum) == null) {
+                    currentRow = sheet.createRow(rowNum);
+                } else {
+                    currentRow = sheet.getRow(rowNum);
+                }
+                if (currentRow.getCell(columnNum) != null) {
+                    HSSFCell currentCell = currentRow.getCell(columnNum);
+                    if (currentCell.getCellType() == XSSFCell.CELL_TYPE_STRING) {
+                        int length = currentCell.getStringCellValue().getBytes().length;
+                        if (columnWidth < length) {
+                            columnWidth = length;
+                        }
+                    }
+                }
+            }
+            sheet.setColumnWidth(columnNum, columnWidth * 300);
+//            sheet.setColumnWidth(columnNum, columnWidth * 256);
+        }
+    }
+
 	/**
 	 * 设置单元格值和样式
 	 * @param row
@@ -29,7 +29,7 @@
     #analy_body{
         margin-top: 20px;
-        height: 650px;
+        height: 620px;
         width: 100%
     }
@@ -46,7 +46,7 @@
     .table_body{
         width:101%;
-        height:620px;
+        height:580px;
         overflow: auto;
         margin-top: -20px;
     }
@@ -218,8 +218,8 @@
             } else if(item == "gl"){
                 options += '<option value="zgl">总公里</option>' +
                     '<option value="jhgl">计划公里</option>';
-                    /*'<option value="jclm">进场路码</option>'+
-                    '<option value="cclm">出场路码</option>'*/
+                /*'<option value="jclm">进场路码</option>'+
+                '<option value="cclm">出场路码</option>'*/
             } else if(item == "bc"){
                 options += '<option value="sjbc">实际班次</option>' +
                     '<option value="jhbc">计划班次</option>';
@@ -255,6 +255,44 @@
             datas.destroy = $("#destroy").val();
             datas.statisticalObj = $("#statisticalObj").val();
             datas.itemDetails = $("#itemDetails").val();
+            var itemDetails = datas.itemDetails,
+                type = "加注量[全部]";
+            if(itemDetails=="jzl0"){
+                type = "加注量[0#]"
+            } else if(itemDetails=="jzl-10"){
+                type = "加注量[-10#]"
+            } else if(itemDetails=="yhl"){
+                type = "油耗量"
+            } else if(itemDetails=="cccy"){
+                type = "出场存油"
+            } else if(itemDetails=="jccy"){
+                type = "进场存油"
+            } else if(itemDetails=="bglyh"){
+                type = "百公里油耗"
+            } else if(itemDetails=="zgl"){
+                type = "总公里"
+            } else if(itemDetails=="jhgl"){
+                type = "计划公里"
+            } else if(itemDetails=="jclm"){
+                type = "进场路码"
+            } else if(itemDetails=="cclm"){
+                type = "出场路码"
+            } else if(itemDetails=="sjbc"){
+                type = "实际班次"
+            } else if(itemDetails=="jhbc"){
+                type = "计划班次"
+            } else if(itemDetails=="dh"){
+                type = "耗电量"
+            } else if(itemDetails=="cdl"){
+                type = "充电量"
+            } else if(itemDetails=="cccd"){
+                type = "出场存电"
+            } else if(itemDetails=="jccd"){
+                type = "进场存电"
+            } else if(itemDetails=="bgldh"){
+                type = "百公里电耗"
+            }
+            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细月报表("+type+")";
             if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
                 layer.msg('请选择时间段！');
             }else if(endTime<startTime){
@@ -276,7 +314,7 @@
                             return;
                         }else
                             $("#export").removeAttr("disabled");
-                        var htmlHead = "", htmlBody = "";
+                        var htmlHead = "<tr><td colspan='"+rs[0].length+"'>"+datas.name+"</td></tr>", htmlBody = "";
                         var rsLength = rs.length;
                         rs.forEach(function (o, i) {
                             var html = "<tr>"
@@ -284,12 +322,14 @@
                                 var colspan;
                                 if (i == rsLength - 1 && j == 0) {
                                     colspan = (statisticalObj == "xl" ?  "colspan='3'" : "colspan='5'");
+                                    if(statisticalObj == "cl")
+                                        colspan = "colspan='6'";
                                 }
                                 html += "<td " + colspan + ">" + td + "</td>"
                             });
                             html += "</tr>"
                             if (i == 0) {
-                                htmlHead = html;
+                                htmlHead += html;
                             } else
                                 htmlBody += html;
                         });
@@ -302,44 +342,6 @@
         });
         $("#export").on("click",function(){
-            var itemDetails = datas.itemDetails,
-                type = "加注量[全部]";
-            if(itemDetails=="jzl0"){
-                type = "加注量[0#]"
-            } else if(itemDetails=="jzl-10"){
-                type = "加注量[-10#]"
-            } else if(itemDetails=="yhl"){
-                type = "油耗量"
-            } else if(itemDetails=="cccy"){
-                type = "出场存油"
-            } else if(itemDetails=="jccy"){
-                type = "进场存油"
-            } else if(itemDetails=="bglyh"){
-                type = "百公里油耗"
-            } else if(itemDetails=="zgl"){
-                type = "总公里"
-            } else if(itemDetails=="jhgl"){
-                type = "计划公里"
-            } else if(itemDetails=="jclm"){
-                type = "进场路码"
-            } else if(itemDetails=="cclm"){
-                type = "出场路码"
-            } else if(itemDetails=="sjbc"){
-                type = "实际班次"
-            } else if(itemDetails=="jhbc"){
-                type = "计划班次"
-            } else if(itemDetails=="dh"){
-                type = "耗电量"
-            } else if(itemDetails=="cdl"){
-                type = "充电量"
-            } else if(itemDetails=="cccd"){
-                type = "出场存电"
-            } else if(itemDetails=="jccd"){
-                type = "进场存电"
-            } else if(itemDetails=="bgldh"){
-                type = "百公里电耗"
-            }
-            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细月报表("+type+")";
             $post("/report/calcDetailMonthlyE",datas,function(result){
                 window.open("/downloadFile/download?fileName="+datas.name);
             });
@@ -29,7 +29,7 @@
     #analy_body{
         margin-top: 20px;
-        height: 650px;
+        height: 620px;
         width: 100%
     }
@@ -46,7 +46,7 @@
     .table_body{
         width:101%;
-        height:620px;
+        height:580px;
         overflow: auto;
         margin-top: -20px;
     }
@@ -263,6 +263,44 @@
             datas.itemDetails = $("#itemDetails").val();
             datas.item = item;
+            var itemDetails = datas.itemDetails,
+                type = "加注量[全部]";
+            if(itemDetails=="jzl0"){
+                type = "加注量[0#]"
+            } else if(itemDetails=="jzl-10"){
+                type = "加注量[-10#]"
+            } else if(itemDetails=="yhl"){
+                type = "油耗量"
+            } else if(itemDetails=="cccy"){
+                type = "出场存油"
+            } else if(itemDetails=="jccy"){
+                type = "进场存油"
+            } else if(itemDetails=="bglyh"){
+                type = "百公里油耗"
+            } else if(itemDetails=="zgl"){
+                type = "总公里"
+            } else if(itemDetails=="jhgl"){
+                type = "计划公里"
+            } else if(itemDetails=="jclm"){
+                type = "进场路码"
+            } else if(itemDetails=="cclm"){
+                type = "出场路码"
+            } else if(itemDetails=="sjbc"){
+                type = "实际班次"
+            } else if(itemDetails=="jhbc"){
+                type = "计划班次"
+            } else if(itemDetails=="dh"){
+                type = "耗电量"
+            } else if(itemDetails=="cdl"){
+                type = "充电量"
+            } else if(itemDetails=="cccd"){
+                type = "出场存电"
+            } else if(itemDetails=="jccd"){
+                type = "进场存电"
+            } else if(itemDetails=="bgldh"){
+                type = "百公里电耗"
+            }
+            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细年报表("+type+")";
             if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
                 layer.msg('请选择时间段！');
             }else if(endTime<startTime){
@@ -284,7 +322,7 @@
                             return;
                         }else
                             $("#export").removeAttr("disabled");
-                        var htmlHead = "", htmlBody = "";
+                        var htmlHead = "<tr><td colspan='"+rs[0].length+"'>"+datas.name+"</td></tr>", htmlBody = "";
                         var rsLength = rs.length;
                         rs.forEach(function (o, i) {
                             var html = "<tr>"
@@ -292,12 +330,14 @@
                                 var colspan;
                                 if (i == rsLength - 1 && j == 0) {
                                     colspan = (statisticalObj == "xl" ?  "colspan='3'" : "colspan='5'");
+                                    if(statisticalObj == "cl")
+                                        colspan = "colspan='6'";
                                 }
                                 html += "<td " + colspan + ">" + td + "</td>"
                             });
                             html += "</tr>"
                             if (i == 0) {
-                                htmlHead = html;
+                                htmlHead += html;
                             } else
                                 htmlBody += html;
                         });
@@ -310,44 +350,6 @@
         });
         $("#export").on("click",function(){
-            var itemDetails = datas.itemDetails,
-                type = "加注量[全部]";
-            if(itemDetails=="jzl0"){
-                type = "加注量[0#]"
-            } else if(itemDetails=="jzl-10"){
-                type = "加注量[-10#]"
-            } else if(itemDetails=="yhl"){
-                type = "油耗量"
-            } else if(itemDetails=="cccy"){
-                type = "出场存油"
-            } else if(itemDetails=="jccy"){
-                type = "进场存油"
-            } else if(itemDetails=="bglyh"){
-                type = "百公里油耗"
-            } else if(itemDetails=="zgl"){
-                type = "总公里"
-            } else if(itemDetails=="jhgl"){
-                type = "计划公里"
-            } else if(itemDetails=="jclm"){
-                type = "进场路码"
-            } else if(itemDetails=="cclm"){
-                type = "出场路码"
-            } else if(itemDetails=="sjbc"){
-                type = "实际班次"
-            } else if(itemDetails=="jhbc"){
-                type = "计划班次"
-            } else if(itemDetails=="dh"){
-                type = "耗电量"
-            } else if(itemDetails=="cdl"){
-                type = "充电量"
-            } else if(itemDetails=="cccd"){
-                type = "出场存电"
-            } else if(itemDetails=="jccd"){
-                type = "进场存电"
-            } else if(itemDetails=="bgldh"){
-                type = "百公里电耗"
-            }
-            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细年报表("+type+")";
             $post("/report/calcDetailMonthlyE",datas,function(result){
                 window.open("/downloadFile/download?fileName="+datas.name);
             });