bf

yiming
1 parent 4be34257
Showing 12 changed files with 542 additions and 35 deletions
bsthLineProfiles/pom.xml
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/Export.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
bsthLineProfiles/src/main/java/com/ruoyi/project/utils/ExcelUtils.java
bsthLineProfiles/src/main/resources/application-druid.yml
bsthLineProfiles/src/main/resources/application.yml
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/index.html
bsthLineProfiles/src/main/resources/templates/system/historyReport/historyReport.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
@@ -305,6 +305,16 @@
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
     </dependencies>
     <build>
 package com.ruoyi.project.system.line.controller;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import cn.hutool.poi.excel.StyleSet;
+import com.ruoyi.project.system.line.domain.Export;
+import org.apache.poi.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.project.system.line.domain.LineHistoryReport;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -38,6 +51,9 @@ import com.ruoyi.project.system.user.domain.User;
 import com.ruoyi.project.system.user.service.IUserService;
 import com.ruoyi.project.utils.ExcelUtils;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
 @Controller
 @RequestMapping("/system/historyReport")
 public class BsthTLineHistoryReportController extends BaseController
@@ -70,11 +86,9 @@ public class BsthTLineHistoryReportController extends BaseController
     public TableDataInfo list(BsthTLine bsthTLine)
     {
         startPage();
-        bsthTLine.setHistoryId(1L);
         List<BsthTLine> list = bsthTLineService.selectBsthTLineHistoryList(bsthTLine);
         return getDataTable(list);
     }
-    
     @RequiresPermissions("system:HistoryReport:export")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
@@ -180,6 +194,256 @@ public class BsthTLineHistoryReportController extends BaseController
         return util.exportExcel(list, "line");
     }
+
+    
+    @RequiresPermissions("system:HistoryReport:export2")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @RequestMapping("/export2")
+    @ResponseBody
+    public void export(HttpServletResponse response,BsthTLine bsthTLine) throws NoSuchFieldException {
+
+        //查询变更记录
+        List<LineHistoryReport> list =bsthTLineService.getLineHistoryReport(bsthTLine);
+
+        List<DictData> dicts = dictDataService.selectDictDataList(null);
+        Map<String,List<DictData>> dictMap = new HashMap();
+        List<String> titles=new ArrayList<>();
+        for(DictData d : dicts) {
+            if(dictMap.get(d.getDictType()) == null) {
+                dictMap.put(d.getDictType(), new ArrayList<DictData>());
+            }
+            dictMap.get(d.getDictType()).add(d);
+        }
+
+        try {
+            for(LineHistoryReport line:list) {
+                Field[] field = line.getClass().getDeclaredFields();
+                for(int j=0 ; j<field.length ; j++){ //遍历所有属性
+                    String name = field[j].getName(); //获取属性的名字
+                    if(name.length()>3&&!"Old".equals(name.substring(name.length()-3))&&!"lineName".equals(name)){
+                        //获取变更前后的值
+                        Field f = line.getClass().getDeclaredField(name);
+                        Field f2 = line.getClass().getDeclaredField(name+"Old");
+                        f.setAccessible(true);
+                        f2.setAccessible(true);
+                        f.get(line);
+                        String v =f.get(line)==null?"":f.get(line).toString();
+                        String vo=f2.get(line)==null?"":f2.get(line).toString();
+                        //如果没变置空
+//                        if(v.equals(vo)){
+//                            f.set(line, null);
+//                            f2.set(line, null);
+//                        }
+                        //编码转换
+                        if(dictMap.get(name) != null) {
+                            if(v != null && v.split(",").length > 0) {
+                                String result = "";
+                                for(String str:v.split(",")) {
+                                    for(DictData d:dictMap.get(name)) {
+                                        if(d.getDictValue().equals(str)) {
+                                            result += d.getDictLabel() + ",";
+                                        }
+                                    }
+                                }
+                                if(!result.isEmpty()) {
+                                    f.set(line, result.substring(0,result.length()-1));
+                                }else {
+                                    f.set(line, v);
+                                }
+                            }
+                            if(vo != null && vo.split(",").length > 0) {
+                                String result = "";
+                                for(String str:vo.split(",")) {
+                                    for(DictData d:dictMap.get(name)) {
+                                        if(d.getDictValue().equals(str)) {
+                                            result += d.getDictLabel() + ",";
+                                        }
+                                    }
+                                }
+                                if(!result.isEmpty()) {
+                                    f2.set(line, result.substring(0,result.length()-1));
+                                }else {
+                                    f2.set(line, vo);
+                                }
+                            }
+                        }
+                        if("inoutDistrict".equals(name)||"isWarrant".equals(name)||"isMetro".equals(name)||"hasTimelists".equals(name)){
+                            if(!"".equals(v)){
+                                for(DictData d:dictMap.get("trueFalse")) {
+                                    if(d.getDictValue().equals(v)) {
+                                        f.set(line, d.getDictLabel());
+                                    }
+                                }
+                            }
+                            if(!"".equals(vo)){
+                                for(DictData d:dictMap.get("trueFalse")) {
+                                    if(d.getDictValue().equals(vo)) {
+                                        f2.set(line, d.getDictLabel());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        //设置列名
+        ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriterWithSheet("统计");
+        Sheet sheet = writer.getSheet();
+        //设置默认样式
+        Font font=ExcelUtils.setBaseFont(writer.getWorkbook(),false,false,"宋体",10);
+        ExcelUtils.GlobalStyleSet(writer,font);
+        //跳过3行做列名
+        writer.passCurrentRow();
+        writer.passCurrentRow();
+        writer.passCurrentRow();
+        //设置列名
+        writer.merge(0,0,0,13, "2021年1月1日起至今延辟调线路情况",true);
+        writer.setRowHeight(0,30);
+        writer.merge(1,2,0,0,"单位",false);
+        writer.merge(1,2,1,1,"序号",false);
+        writer.merge(1,2,2,2,"类别",false);
+        writer.merge(1,2,3,3,"线路",false);
+        writer.merge(1,2,4,4,"实施日期",false);
+        writer.merge(1,1,5,7,"调整类别",false);
+        writer.writeCellValue(5,2,"新辟");
+        writer.writeCellValue(6,2,"调整（分为：缩线、延伸、调整、增能、减能、调整首末班、增加班次、减少班次）");
+        writer.setRowHeight(2,60);
+        writer.writeCellValue(7,2,"撤销");
+        writer.merge(1,2,8,8,"合计",false);
+        writer.merge(1,2,9,9,"理由（备注)",false);
+        writer.merge(1,1,10,11,"调整前",false);
+        writer.writeCellValue(10,2,"配车");
+        writer.writeCellValue(11,2,"劳动力");
+        writer.merge(1,1,12,13,"调整后",false);
+        writer.writeCellValue(12,2,"配车");
+        writer.writeCellValue(13,2,"劳动力");
+
+        //数据处理
+        Map<String,List<LineHistoryReport>>map= list.stream().collect(Collectors.groupingBy(LineHistoryReport::getCompany));
+
+        int rowIndex=3;
+        //合计计数
+        long xpAll=0;
+        long tzAll=0;
+        long cxAll=0;
+        long xtcAll=0;
+        long pcAll=0;
+        long ldlAll=0;
+        long pcoAll=0;
+        long ldloAll=0;
+
+        for(String k : map.keySet()){
+            List<LineHistoryReport> ll=map.get(k);
+            List<Export> list1=new ArrayList();
+            //小计计数
+            long xp=0;
+            long tz=0;
+            long cx=0;
+            long xtc=0;
+            long pc=0;
+            long ldl=0;
+            long pco=0;
+            long ldlo=0;
+            int i=1;
+            for (LineHistoryReport lineHistoryReport : ll) {
+                Export export=new Export();
+                export.setLine1(lineHistoryReport.getCompany());//单位
+                writer.setColumnWidth(0,25);
+                export.setLine2(String.valueOf(i));//序号
+                writer.setColumnWidth(1,10);
+                i++;
+                export.setLine3(lineHistoryReport.getLineLevel());//类别
+                writer.setColumnWidth(2,20);
+                export.setLine4(lineHistoryReport.getLineName());//线路
+                writer.setColumnWidth(3,20);
+                Date date=lineHistoryReport.getStartDate();
+                SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+                export.setLine5( simpleDateFormat.format(date));//实施日期
+                writer.setColumnWidth(4,20);
+                if("新辟".equals(lineHistoryReport.getLineUpdateType())){
+                    export.setLine6(lineHistoryReport.getLineUpdateType());//新辟
+                    writer.setColumnWidth(5,20);
+                    xp++;
+                }else if("撤销".equals(lineHistoryReport.getLineUpdateType())){
+                    export.setLine8(lineHistoryReport.getLineUpdateType());//撤销
+                    writer.setColumnWidth(7,20);
+                    cx++;
+                }else {
+                    export.setLine7(lineHistoryReport.getLineUpdateType());//调整
+                    writer.setColumnWidth(6,20);
+                    tz++;
+                }
+                writer.setColumnWidth(8,20);
+                export.setLine10(lineHistoryReport.getRemark());
+                writer.setColumnWidth(9,20);
+                long count=lineHistoryReport.getWarrantVehiclesLarge()+lineHistoryReport.getWarrantVehiclesMiddle()+lineHistoryReport.getVehiclesNumber()+
+                        lineHistoryReport.getNumberVehiclesLarge()+lineHistoryReport.getNumberVehiclesMiddle();
+                pc+=count;
+                long countOld=lineHistoryReport.getWarrantVehiclesLargeOld()+lineHistoryReport.getWarrantVehiclesMiddleOld()+lineHistoryReport.getVehiclesNumberOld()+
+                        lineHistoryReport.getNumberVehiclesLargeOld()+lineHistoryReport.getNumberVehiclesMiddleOld();
+                pco+=countOld;
+                export.setLine11(String.valueOf(count));
+                writer.setColumnWidth(10,10);
+                export.setLine12(String.valueOf(lineHistoryReport.getNumberPersonDriver()));
+                writer.setColumnWidth(11,10);
+                ldl+=lineHistoryReport.getNumberPersonDriver();
+                export.setLine13(String.valueOf(countOld));
+                writer.setColumnWidth(12,10);
+                export.setLine14(String.valueOf(lineHistoryReport.getNumberPersonDriverOld()));
+                writer.setColumnWidth(13,10);
+                ldlo+=lineHistoryReport.getNumberPersonDriverOld();
+                list1.add(export);
+                rowIndex++;
+            }
+
+            Export export=new Export();
+            export.setLine2("小计");
+            export.setLine6(String.valueOf(xp));
+            xpAll+=xp;
+            export.setLine7(String.valueOf(tz));
+            tzAll+=tz;
+            export.setLine8(String.valueOf(cx));
+            cxAll+=cx;
+            xtc=xp+tz+cx;
+            xtcAll+=xtc;
+            export.setLine9(String.valueOf(xtc));
+            export.setLine11(String.valueOf(pc));
+            pcAll+=pc;
+            export.setLine12(String.valueOf(ldl));
+            ldlAll+=ldl;
+            export.setLine13(String.valueOf(pco));
+            pcoAll+=pco;
+            export.setLine14(String.valueOf(ldlo));
+            ldloAll+=ldlo;
+            list1.add(export);
+            //写入sheet
+            writer.write(list1, false);
+            //加背景色
+            ExcelUtils.setBackground(writer,IndexedColors.SEA_GREEN.getIndex(),rowIndex,writer.getColumnCount());
+            rowIndex++;
+        }
+        Export export=new Export();
+        export.setLine1("合计");
+        export.setLine6(String.valueOf(xpAll));
+        export.setLine7(String.valueOf(tzAll));
+        export.setLine8(String.valueOf(cxAll));
+        export.setLine9(String.valueOf(xtcAll));
+        export.setLine11(String.valueOf(pcAll));
+        export.setLine12(String.valueOf(ldlAll));
+        export.setLine13(String.valueOf(pcoAll));
+        export.setLine14(String.valueOf(ldloAll));
+        List<Export> result=new ArrayList();
+        result.add(export);
+        writer.write(result, false);
+        //设置行高
+        ExcelUtils.setHeight(writer, (short) 2);
+        ExcelUtils.downloadExcel(response,"变更报表",writer);
+    }
+
     public static Object getObjectField(Field field,String valueStr) throws Exception{
         Class typeClass = field.getType();
         Constructor con = typeClass.getConstructor(valueStr.getClass());
@@ -187,7 +451,4 @@ public class BsthTLineHistoryReportController extends BaseController
         return obj;
     }
-    public static void main(String[] args) {
-
-    }
 }
+package com.ruoyi.project.system.line.domain;
+
+public class Export {
+    private String line1;
+    private String line2;
+    private String line3;
+    private String line4;
+    private String line5;
+    private String line6;
+    private String line7;
+    private String line8;
+    private String line9;
+    private String line10;
+    private String line11;
+    private String line12;
+    private String line13;
+    private String line14;
+
+    public String getLine1() {
+        return line1;
+    }
+
+    public void setLine1(String line1) {
+        this.line1 = line1;
+    }
+
+    public String getLine2() {
+        return line2;
+    }
+
+    public void setLine2(String line2) {
+        this.line2 = line2;
+    }
+
+    public String getLine3() {
+        return line3;
+    }
+
+    public void setLine3(String line3) {
+        this.line3 = line3;
+    }
+
+    public String getLine4() {
+        return line4;
+    }
+
+    public void setLine4(String line4) {
+        this.line4 = line4;
+    }
+
+    public String getLine5() {
+        return line5;
+    }
+
+    public void setLine5(String line5) {
+        this.line5 = line5;
+    }
+
+    public String getLine6() {
+        return line6;
+    }
+
+    public void setLine6(String line6) {
+        this.line6 = line6;
+    }
+
+    public String getLine7() {
+        return line7;
+    }
+
+    public void setLine7(String line7) {
+        this.line7 = line7;
+    }
+
+    public String getLine8() {
+        return line8;
+    }
+
+    public void setLine8(String line8) {
+        this.line8 = line8;
+    }
+
+    public String getLine9() {
+        return line9;
+    }
+
+    public void setLine9(String line9) {
+        this.line9 = line9;
+    }
+
+    public String getLine10() {
+        return line10;
+    }
+
+    public void setLine10(String line10) {
+        this.line10 = line10;
+    }
+
+    public String getLine11() {
+        return line11;
+    }
+
+    public void setLine11(String line11) {
+        this.line11 = line11;
+    }
+
+    public String getLine12() {
+        return line12;
+    }
+
+    public void setLine12(String line12) {
+        this.line12 = line12;
+    }
+
+    public String getLine13() {
+        return line13;
+    }
+
+    public void setLine13(String line13) {
+        this.line13 = line13;
+    }
+
+    public String getLine14() {
+        return line14;
+    }
+
+    public void setLine14(String line14) {
+        this.line14 = line14;
+    }
+}
@@ -1098,7 +1098,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getWarrantVehiclesLarge() {
-		return warrantVehiclesLarge;
+		return warrantVehiclesLarge==null?0:warrantVehiclesLarge;
 	}
 	public void setWarrantVehiclesLarge(Long warrantVehiclesLarge) {
@@ -1106,7 +1106,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getWarrantVehiclesLargeOld() {
-		return warrantVehiclesLargeOld;
+		return warrantVehiclesLargeOld==null?0:warrantVehiclesLargeOld;
 	}
 	public void setWarrantVehiclesLargeOld(Long warrantVehiclesLargeOld) {
@@ -1114,7 +1114,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getWarrantVehiclesMiddle() {
-		return warrantVehiclesMiddle;
+		return warrantVehiclesMiddle==null?0:warrantVehiclesMiddle;
 	}
 	public void setWarrantVehiclesMiddle(Long warrantVehiclesMiddle) {
@@ -1122,7 +1122,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getWarrantVehiclesMiddleOld() {
-		return warrantVehiclesMiddleOld;
+		return warrantVehiclesMiddleOld==null?0:warrantVehiclesMiddleOld;
 	}
 	public void setWarrantVehiclesMiddleOld(Long warrantVehiclesMiddleOld) {
@@ -1130,7 +1130,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getVehiclesNumber() {
-		return vehiclesNumber;
+		return vehiclesNumber==null?0:vehiclesNumber;
 	}
 	public void setVehiclesNumber(Long vehiclesNumber) {
@@ -1138,7 +1138,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getVehiclesNumberOld() {
-		return vehiclesNumberOld;
+		return vehiclesNumberOld==null?0:vehiclesNumberOld;
 	}
 	public void setVehiclesNumberOld(Long vehiclesNumberOld) {
@@ -1146,7 +1146,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberVehiclesLarge() {
-		return numberVehiclesLarge;
+		return numberVehiclesLarge==null?0:numberVehiclesLarge;
 	}
 	public void setNumberVehiclesLarge(Long numberVehiclesLarge) {
@@ -1154,7 +1154,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberVehiclesLargeOld() {
-		return numberVehiclesLargeOld;
+		return numberVehiclesLargeOld==null?0:numberVehiclesLargeOld;
 	}
 	public void setNumberVehiclesLargeOld(Long numberVehiclesLargeOld) {
@@ -1162,7 +1162,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberVehiclesMiddle() {
-		return numberVehiclesMiddle;
+		return numberVehiclesMiddle==null?0:numberVehiclesMiddle;
 	}
 	public void setNumberVehiclesMiddle(Long numberVehiclesMiddle) {
@@ -1170,7 +1170,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberVehiclesMiddleOld() {
-		return numberVehiclesMiddleOld;
+		return numberVehiclesMiddleOld==null?0:numberVehiclesMiddleOld;
 	}
 	public void setNumberVehiclesMiddleOld(Long numberVehiclesMiddleOld) {
@@ -1194,7 +1194,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberPerson() {
-		return numberPerson;
+		return numberPerson==null?0:numberPerson;
 	}
 	public void setNumberPerson(Long numberPerson) {
@@ -1202,7 +1202,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberPersonOld() {
-		return numberPersonOld;
+		return numberPersonOld==null?0:numberPersonOld;
 	}
 	public void setNumberPersonOld(Long numberPersonOld) {
@@ -1210,7 +1210,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberPersonDriver() {
-		return numberPersonDriver;
+		return numberPersonDriver==null?0:numberPersonDriver;
 	}
 	public void setNumberPersonDriver(Long numberPersonDriver) {
@@ -1218,7 +1218,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberPersonDriverOld() {
-		return numberPersonDriverOld;
+		return numberPersonDriverOld==null?0:numberPersonDriverOld;
 	}
 	public void setNumberPersonDriverOld(Long numberPersonDriverOld) {
@@ -1226,7 +1226,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberPersonSales() {
-		return numberPersonSales;
+		return numberPersonSales==null?0:numberPersonSales;
 	}
 	public void setNumberPersonSales(Long numberPersonSales) {
@@ -1234,7 +1234,7 @@ public class LineHistoryReport extends BaseEntity
 	}
 	public Long getNumberPersonSalesOld() {
-		return numberPersonSalesOld;
+		return numberPersonSalesOld==null?0:numberPersonSalesOld;
 	}
 	public void setNumberPersonSalesOld(Long numberPersonSalesOld) {
@@ -3,11 +3,16 @@ package com.ruoyi.project.utils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import cn.hutool.poi.excel.StyleSet;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -16,7 +21,10 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.domain.LineEditReport;
+import org.apache.poi.ss.usermodel.*;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
 public class ExcelUtils {
@@ -178,4 +186,97 @@ public class ExcelUtils {
 		}
 	}
+	public static Font setBaseFont(Workbook workbook, boolean bold, boolean italic, String fontName, int fontSize) {
+		Font font = workbook.createFont();
+		//设置字体名称 宋体 / 微软雅黑 /等
+		font.setFontName(fontName);
+		//设置是否斜体
+		font.setItalic(italic);
+		//设置字体高度
+		//font.setFontHeight((short) fontHeight);
+		//设置字体大小 以磅为单位
+		font.setFontHeightInPoints((short) fontSize);
+		//设置是否加粗
+		font.setBold(bold);
+		//默认字体颜色
+		// font.setColor(Font.COLOR_NORMAL);
+		//红色
+		//font.setColor(Font.COLOR_RED);
+		//设置下划线样式
+		//font.setUnderline(Font.ANSI_CHARSET);
+		//设定文字删除线
+		//font.setStrikeout(true);
+		return font;
+	}
+
+	//全局样式
+	public static StyleSet GlobalStyleSet(ExcelWriter writer, Font font) {
+		Workbook workbook=writer.getWorkbook();
+		//全局样式设置
+		StyleSet styleSet = writer.getStyleSet();
+		//设置全局文本居中
+		styleSet.setAlign(HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+		//设置全局字体样式
+		styleSet.setFont(font,true);
+		//设置背景颜色 第二个参数表示是否将样式应用到头部
+		styleSet.setBackgroundColor(IndexedColors.WHITE, false);
+		//设置自动换行 当文本长于单元格宽度是否换行
+		styleSet.setWrapText();
+		// 设置全局边框样式
+		styleSet.setBorder(BorderStyle.THIN, IndexedColors.BLACK);
+		CellStyle cellStyle=styleSet.getCellStyle();
+		//设置头部标题样式
+		CellStyle headCellStyle = styleSet.getHeadCellStyle();
+		//水平居中
+		headCellStyle.setAlignment(HorizontalAlignment.CENTER);
+		//垂直居中
+		headCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+		//设置字体样式
+		Font f=setBaseFont(workbook,true,false,"宋体",15);
+		headCellStyle.setFont(f);
+		return styleSet;
+	}
+
+	public static void setBackground(ExcelWriter writer,short color,int rowIndex,int columnCount){
+		CellStyle style = writer.getWorkbook().createCellStyle();
+		Sheet sheet=writer.getSheet();
+		style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+		style.setFillForegroundColor(color);
+		style.setAlignment(HorizontalAlignment.CENTER);
+		style.setVerticalAlignment(VerticalAlignment.CENTER);
+		Row row = sheet.getRow(rowIndex);
+		for (int i=0;i<columnCount;i++){
+			Cell cell = row.getCell(i);
+			cell.setCellStyle(style);
+		}
+	}
+
+	public static void setHeight(ExcelWriter writer,short high){
+		Sheet sheet=writer.getSheet();
+		for (int i=3;i<writer.getCurrentRow();i++){
+			Row row = sheet.getRow(i);
+			short s= (short) (256*high);
+			row.setHeight(s);
+		}
+	}
+
+	public static   void downloadExcel(HttpServletResponse response, String fileName, ExcelWriter writer) {
+		response.setContentType("application/vnd.ms-excel;charset=utf-8");
+		// test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+		ServletOutputStream out = null;
+		try {
+			// 设置请求头属性
+			response.setHeader("Content-Disposition", "attachment;filename=" + new String((fileName + ".xlsx").getBytes(), StandardCharsets.ISO_8859_1));
+			out = response.getOutputStream();
+			// 写出到文件
+			writer.flush(out, true);
+			// 关闭writer，释放内存
+			writer.close();
+			// 此处记得关闭输出Servlet流
+			IoUtil.close(out);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
 }
@@ -5,15 +5,15 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-            master:
-                url: jdbc:mysql://localhost:3306/linedata?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: Aa123456
-            # 主库数据源
 #            master:
-#                url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://localhost:3306/linedata?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
-#                password: 1995627a
+#                password: Aa123456
+            # 主库数据源
+            master:
+                url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 1995627a
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -80,7 +80,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: test123
+    #password: test123
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -1776,7 +1776,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			   h2.full_customer_percent fullCustomerPercentOld,h2.low_customer_percent lowCustomerPercentOld,h2.divide_level divideLevelOld,
 			   h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,h2.night_parking nightParkingOld,h2.start_date startDateOld,
 			   h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld
-		FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id where h1.history_id is not null
+		FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id
 	</select>
 </mapper>
 \ No newline at end of file
@@ -100,7 +100,7 @@
                 <ul class="nav navbar-top-links navbar-right welcome-message" style="height:50px;">
                     <li class="dropdown user-menu">
 						<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
-							<img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}" th:onerror="this.src='img/profile.jpg'" class="user-image">
+							<img src="img/profile.jpg" class="user-image">
 							<i  class="el-icon-caret-bottom"></i>
 						</a>
 						<ul class="dropdown-menu">
@@ -42,7 +42,8 @@
             </div>
             <div class="btn-group-sm" id="toolbar" role="group">
-					<el-button plain size="mini" type="warning" icon="el-icon-download"  onClick="$.table.exportExcel();" shiro:hasPermission="system:line:export"> 导出</el-button>
+					<el-button plain size="mini" type="warning" icon="el-icon-download"  onClick="$.table.exportExcel();" shiro:hasPermission="system:line:export"> 明细</el-button>
+                    <el-button plain size="mini" type="warning" icon="el-icon-download"  onClick="report();" shiro:hasPermission="system:line:export"> 统计</el-button>
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -53,7 +54,6 @@
 	<th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
-
 	new Vue({
 	    el: '#context',
 	    data: function() {
@@ -158,6 +158,11 @@
 			maxView : 3,
 			autoclose : true
 		});
+    function report(){
+        $.modal.confirm("确定导出统计报表吗？", function() {
+            location.href ="/system/historyReport/export2";
+        });
+    }
     </script>
 </body>
 </html>
 \ No newline at end of file
@@ -456,7 +456,7 @@
                 <label class="col-sm-1 control-label">性质：</label>
                 <div class="col-sm-2">
                     <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" readonly>
-                        <option value="3" selected="selected">新辟</option>
+                        <option value="0" selected="selected">新辟</option>
                     </select>
                 </div>
                 <!---------------------------------->
@@ -475,7 +475,7 @@
 				<label class="col-sm-1 control-label">性质：</label>
 				<div class="col-sm-2">
 					<select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" readonly>
-						<option value="3" selected="selected">新辟</option>
+						<option value="0" selected="selected">新辟</option>
 					</select>
 				</div>
 				<!---------------------------------->