未符合项整改去除 产品类型字段 影响点--》导出

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");

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)
+//    @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
-    @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
+//    @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
-    @TableField("PRODUCT_TYPE")
+//    @TableField("PRODUCT_TYPE")
-    private String productType;
+//    private String productType;
 
     @ExcelProperty("产品线")
     @ApiModelProperty(value = "产品线")

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<String> ids;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java

@@ -27,6 +27,9 @@ public class ProductTypeConverter implements Converter<String> {
             if(stringValue.equals("在产产品")){
                 return "product";
             }
+            if (!stringValue.equals("在研产品") && !stringValue.equals("在产产品")){
+                return "";
+            }
         }
         return null;
     }
@@ -40,6 +43,9 @@ public class ProductTypeConverter implements Converter<String> {
             if(s.equals("product")){
                 return new CellData<>("在产产品");
             }
+            if (!s.equals("research") && !s.equals("product")){
+                return new CellData<>("");
+            }
         }
         return null;
     }