Merge remote-tracking branch 'origin/import_250116' into import_250116

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/analysis/EntitlementsImportAnalysis.java

@@ -165,9 +165,9 @@ public class EntitlementsImportAnalysis extends DataAnalysis<EntitlementsImportA
                 }
             }
             if (item.getPeriod() == null) {
-                ret += "周期错误；";
+                ret += "周期错误且不能为空；";
             } else if (item.getPeriod() == PeriodEnum.PERPETUAL) {
-                if (!"SVIP".equals(item.getEntitlementType()) && "TENANT_ALBUM".equals(item.getEntitlementType())) {
+                if (!"SVIP".equals(item.getEntitlementType()) && !"TENANT_ALBUM".equals(item.getEntitlementType())) {
                     ret += "仅SVIP、机构专辑支持永久；";
                 }
                 item.setNumber("100");
@@ -184,7 +184,7 @@ public class EntitlementsImportAnalysis extends DataAnalysis<EntitlementsImportA
                 ret += "原因不能为空；";
             }
             if (item.getSendPush()== null) {
-                ret += "是否发送推送错误；";
+                ret += "是否发送推送错误且不能为空；";
             }
             if (StringUtils.isNotEmpty(ret)) {
                 verifyDataMap.put(item.getRowIndex(), ret);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/entity/EntitlementsImport.java

@@ -74,7 +74,7 @@ public class EntitlementsImport {
         return this;
     }
 
-    private class PeriodEnumConverter implements Converter {
+    public static class PeriodEnumConverter implements Converter<PeriodEnum> {
         @Override
         public Class<PeriodEnum> supportJavaTypeKey() {
             return PeriodEnum.class;
@@ -104,7 +104,7 @@ public class EntitlementsImport {
         }
 
         @Override
-        public CellData convertToExcelData(Object value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        public CellData convertToExcelData(PeriodEnum value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
             return null;
         }
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/FileImportInfoWrapper.java

@@ -142,7 +142,7 @@ public class FileImportInfoWrapper {
     public static class FileImport {
 
 
-        @EnumValidation(clazz = EImportType.class, message = "数据类型不正确")
+//        @EnumValidation(clazz = EImportType.class, message = "数据类型不正确")
         @ApiModelProperty("数据类型")
         private EImportType dataType;