白名单导出bug修改

src/main/java/com/nmgs/MyEnvironmentPostProcessor.java

@@ -37,7 +37,7 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
                 fileNewproperties.createNewFile();
             }
             properties.load(new FileInputStream(path));
-            String DBType = properties.getProperty("WhiteDBType") == null ? "1" : properties.getProperty("WhiteDBType");
+            String DBType = properties.getProperty("DBType") == null ? "1" : properties.getProperty("DBType");
             Newproperties.load(new FileInputStream(NewPath));
             properties.setProperty("spring.logback.logPath",PathUtil.TomcatPath+"/logs");
             properties.setProperty("spring.datasource.url",properties.getProperty("DBUrl"));

src/main/java/com/nmgs/entity/WhiteCarnoListDto.java

@@ -35,7 +35,7 @@ public class WhiteCarnoListDto {
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private Date acarnobegdate;
+  private Date begdate;
   @ExcelProperty("车牌")
   @ColumnWidth(10)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
@@ -57,14 +57,14 @@ public class WhiteCarnoListDto {
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private Date acarnobegdt;
+  private Date begdt;
   @ExcelProperty("终止时间")
   @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private Date acarnoenddt;
+  private Date enddt;
   @ExcelProperty("类型")
   @ColumnWidth(10)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
@@ -94,14 +94,14 @@ public class WhiteCarnoListDto {
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String acarnodataflag;
+  private String dataflag;
   @ExcelProperty("车辆描述")
   @ColumnWidth(10)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String acarnodescrib;
+  private String describ;
   @ExcelProperty("录入时间")
   @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
@@ -116,7 +116,7 @@ public class WhiteCarnoListDto {
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private int acarnoaccount;
+  private int account;
   @ExcelProperty("所属公司")
   @ColumnWidth(10)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
@@ -130,7 +130,7 @@ public class WhiteCarnoListDto {
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String acarnoverno;
+  private String verno;
   @ExcelProperty("备注1")
   @ExcelIgnore
   @ColumnWidth(10)
@@ -155,13 +155,13 @@ public class WhiteCarnoListDto {
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
   private String bak3;
-  @ExcelProperty("减免类型")
+  @ExcelProperty("减免路段/收费站")
   @ColumnWidth(10)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String memo;
+  private String discrp;
   @ExcelProperty("车种code")
   @ExcelIgnore
   @ColumnWidth(10)

src/main/java/com/nmgs/mapper/WhiteCarnoListMapper.xml

@@ -320,24 +320,24 @@
         t.id,t.acarno,t.COLOR,t.DT,t.BEGDT,t.ENDDT,
         t.VEHICLE_TYPE,t.DATAFLAG,t.DESCRIB,t.BEGDATE,
         t.ACCOUNT,t.VERNO,t.bak1,t.bak2,t.bak3,t.memo,t.VEHICLE_CLASS,t.DISCRP,
-        <if test="params.DBTYPE =='1'">
+        <if test="params.DBTYPE ==1">
             (case when  t.ENDDT&lt; dateadd(day,0,#{params.CURRENTDATE}) THEN '已过期'
             when t.ENDDT&lt; dateadd(day,0,#{params.CURRENTWILLDATE}) THEN '将到期'
             else '正常' end) AS promperty,
         </if>
-        <if test="params.DBTYPE =='2'">
+        <if test="params.DBTYPE ==2">
             (case
             when t.ENDDT&lt; to_Date(#{params.CURRENTDATE},'YYYY-MM-DD HH24:mi:ss') THEN '已过期'
             when t.ENDDT&lt; to_Date(#{params.CURRENTWILLDATE},'YYYY-MM-DD HH24:mi:ss') THEN '将到期'
             else '正常' end) AS promperty,
         </if>
-        <if test="params.DBTYPE =='3'">
+        <if test="params.DBTYPE ==3">
             (case
             when t.ENDDT&lt; to_Date(#{params.CURRENTDATE},'YYYY-MM-DD HH24:mi:ss') THEN '已过期'
             when t.ENDDT&lt; to_Date(#{params.CURRENTWILLDATE},'YYYY-MM-DD HH24:mi:ss') THEN '将到期'
             else '正常' end) AS promperty,
         </if>
-        <if test="params.DBTYPE =='4'">
+        <if test="params.DBTYPE ==4">
             (case
             when t.ENDDT&lt; STR_TO_DATE(#{params.CURRENTDATE},'%Y-%m-%d %H:%k:%s') THEN '已过期'
             when t.ENDDT&lt; STR_TO_DATE(#{params.CURRENTWILLDATE},'%Y-%m-%d %H:%k:%s') THEN '将到期'

src/main/java/com/nmgs/service/impl/WhiteAccountSeriveImpl.java

@@ -28,7 +28,7 @@ public class WhiteAccountSeriveImpl implements IWhiteAccountSerive {
     @Override
     public Page<WhiteAccountText> getWhiteAccountTextByPage(Map<String, Object> params) {
         //从配置文件中读取数据库连接类型
-        params.put("DBTYPE", PropertiesUtil.getValue("WhiteDBType"));
+        params.put("DBTYPE", PropertiesUtil.getValue("DBType"));
         //设置分页
         Integer pageNum = (Integer) params.get("pageNum");
         Integer pageSize = (Integer) params.get("pageSize");