【CHG】修改导入规则

railway-business/src/main/java/com/railway/business/bi/domain/ShowSbxj.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * 大屏展示-电力设备巡检兑现表
@@ -58,99 +57,99 @@ public class ShowSbxj extends BaseEntity {
   private String atfqs;
 
   @ApiModelProperty(value = "1月计划")
-  @Excel(name = "1月计划")
+  @Excel(name = "1月")
   private String plan1;
 
   @ApiModelProperty(value = "1月实际")
-  @Excel(name = "1月实际")
+  @Excel(name = "1月`")
   private String actual1;
 
   @ApiModelProperty(value = "plan2")
-  @Excel(name = "plan2")
+  @Excel(name = "2月")
   private String plan2;
 
   @ApiModelProperty(value = "actual2")
-  @Excel(name = "actual2")
+  @Excel(name = "2月`")
   private String actual2;
 
   @ApiModelProperty(value = "plan3")
-  @Excel(name = "plan3")
+  @Excel(name = "3月")
   private String plan3;
 
   @ApiModelProperty(value = "actual3")
-  @Excel(name = "actual3")
+  @Excel(name = "3月`")
   private String actual3;
 
   @ApiModelProperty(value = "plan4")
-  @Excel(name = "plan4")
+  @Excel(name = "4月")
   private String plan4;
 
   @ApiModelProperty(value = "actual4")
-  @Excel(name = "actual4")
+  @Excel(name = "4月`")
   private String actual4;
 
   @ApiModelProperty(value = "plan5")
-  @Excel(name = "plan5")
+  @Excel(name = "5月")
   private String plan5;
 
   @ApiModelProperty(value = "actual5")
-  @Excel(name = "actual5")
+  @Excel(name = "5月`")
   private String actual5;
 
   @ApiModelProperty(value = "plan6")
-  @Excel(name = "plan6")
+  @Excel(name = "6月")
   private String plan6;
 
   @ApiModelProperty(value = "actual6")
-  @Excel(name = "actual6")
+  @Excel(name = "6月`")
   private String actual6;
 
   @ApiModelProperty(value = "plan7")
-  @Excel(name = "plan7")
+  @Excel(name = "7月")
   private String plan7;
 
   @ApiModelProperty(value = "actual7")
-  @Excel(name = "actual7")
+  @Excel(name = "7月`")
   private String actual7;
 
   @ApiModelProperty(value = "plan8")
-  @Excel(name = "plan8")
+  @Excel(name = "8月")
   private String plan8;
 
   @ApiModelProperty(value = "actual8")
-  @Excel(name = "actual8")
+  @Excel(name = "8月`")
   private String actual8;
 
   @ApiModelProperty(value = "plan9")
-  @Excel(name = "plan9")
+  @Excel(name = "9月")
   private String plan9;
 
   @ApiModelProperty(value = "actual9")
-  @Excel(name = "actual9")
+  @Excel(name = "9月`")
   private String actual9;
 
   @ApiModelProperty(value = "plan10")
-  @Excel(name = "plan10")
+  @Excel(name = "10月")
   private String plan10;
 
   @ApiModelProperty(value = "actual10")
-  @Excel(name = "actual10")
+  @Excel(name = "10月`")
   private String actual10;
 
   @ApiModelProperty(value = "plan11")
-  @Excel(name = "plan11")
+  @Excel(name = "11月")
   private String plan11;
 
   @ApiModelProperty(value = "actual11")
-  @Excel(name = "actual11")
+  @Excel(name = "11月`")
   private String actual11;
 
   @ApiModelProperty(value = "plan12")
-  @Excel(name = "plan12")
+  @Excel(name = "12月")
   private String plan12;
 
   @ApiModelProperty(value = "actual12")
-  @Excel(name = "actual12")
+  @Excel(name = "12月`")
   private String actual12;
 
   @ApiModelProperty(value = "del_flag")

railway-common/src/main/java/com/railway/common/utils/poi/ExcelUtil.java

@@ -388,10 +388,14 @@ public class ExcelUtil<T> {
           if (StringUtils.isNotNull(cell)) {
             String value = this.getCellValue(heard, i).toString().replaceAll("\n", "");
             if (cellMapTmp.containsKey(i)) {
-              value = cellMapTmp.get(i) + value;
+              if(StringUtils.isEmpty(value)) {
+                value = cellMapTmp.get(i);
+              } else {
+                value = cellMapTmp.get(i).replaceAll("`", "") + value;
+              }
             }
             if (StringUtils.isEmpty(value) && i > 0) {
-              value = cellMapTmp.get(i - 1);
+              value = cellMapTmp.get(i - 1) + "`";
             }
             cellMapTmp.put(i, value);
           }