From bc57848bdf3d75ff587eddf5de8e3e8fd3033bec Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 7 Jan 2022 10:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E5=8E=BB=E9=99=A4=20=E4=BA=A7=E5=93=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=20=E5=BD=B1=E5=93=8D=E7=82=B9--?= =?UTF-8?q?=E3=80=8B=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/login/security/WebMvcConfig.java | 1 + .../sarStandUnqualified/entity/SarStandUnqualified.java | 8 ++++---- .../entity/StandUnqualifiedExcelVO.java | 2 ++ .../sarStandUnqualified/utils/ProductTypeConverter.java | 6 ++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index b1186a6d..622389ee 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -31,6 +31,7 @@ public class WebMvcConfig implements WebMvcConfigurer { */ addInterceptor.excludePathPatterns("/api/login"); addInterceptor.excludePathPatterns("/v2/api-docs"); + addInterceptor.excludePathPatterns("/favicon.ico"); addInterceptor.excludePathPatterns("/webjars/**"); addInterceptor.excludePathPatterns("/swagger-resources/**"); addInterceptor.excludePathPatterns("/swagger-ui.html"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 65dfec0e..1b256213 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -78,10 +78,10 @@ public class SarStandUnqualified extends BaseEntity { @TableField("ITEMS_NAME") private String itemsName; - @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) - @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") - @TableField("PRODUCT_TYPE") - private String productType; +// @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) +// @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") +// @TableField("PRODUCT_TYPE") +// private String productType; @ExcelProperty("产品线") @ApiModelProperty(value = "产品线") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java index 830e23c1..47602dea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java @@ -11,6 +11,8 @@ import java.util.List; public class StandUnqualifiedExcelVO { @ApiModelProperty("文件名") String exportName; + @ApiModelProperty("导出类型") + String exportType; @ApiModelProperty("导出的未符合项ID列表") List ids; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java index 168354ed..d2b1cd58 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java @@ -27,6 +27,9 @@ public class ProductTypeConverter implements Converter { if(stringValue.equals("在产产品")){ return "product"; } + if (!stringValue.equals("在研产品") && !stringValue.equals("在产产品")){ + return ""; + } } return null; } @@ -40,6 +43,9 @@ public class ProductTypeConverter implements Converter { if(s.equals("product")){ return new CellData<>("在产产品"); } + if (!s.equals("research") && !s.equals("product")){ + return new CellData<>(""); + } } return null; }