Browse Source

fix: 供应商导入模版修改

fangxinjian 3 years ago
parent
commit
52dd4f8b0e

+ 3 - 3
abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/preperties/FactoryProperty.java

@@ -21,13 +21,13 @@ public class FactoryProperty implements AbstractExcelProperty {
     @ExcelHeadAlias(value = "供应商类型(必填) 枚举值:包材厂,啤酒厂")
     private String factoryType;
 
-    @ExcelHeadAlias(value = "联系人姓名(必填)")
+    @ExcelHeadAlias(value = "联系人姓名")
     private String keymanName;
 
-    @ExcelHeadAlias(value = "联系人手机号(必填)")
+    @ExcelHeadAlias(value = "联系人手机号")
     private String keymanMobile;
 
-    @ExcelHeadAlias(value = "邮箱(必填)")
+    @ExcelHeadAlias(value = "邮箱")
     private String email;
 
     @ExcelHeadAlias(value = "文件最大数")

+ 5 - 3
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -197,9 +197,11 @@ public class FactoryServiceImpl implements FactoryService {
                 req.setFactoryCode(factoryProperty.getFactoryCode());
                 req.setFactoryName(factoryProperty.getFactoryName());
                 req.setFactoryType(FactoryTypeEnum.getCode(factoryProperty.getFactoryType()));
-                req.setKeymanName(factoryProperty.getKeymanName());
-                req.setKeymanMobile(factoryProperty.getKeymanMobile());
-                req.setEmail(factoryProperty.getEmail());
+                if (FactoryTypeEnum.COVER.is(FactoryTypeEnum.getCode(factoryProperty.getFactoryType()))) {
+                    req.setKeymanName(factoryProperty.getKeymanName());
+                    req.setKeymanMobile(factoryProperty.getKeymanMobile());
+                    req.setEmail(factoryProperty.getEmail());
+                }
                 req.setMaxFileCount(Long.valueOf(factoryProperty.getMaxFileCount()));
                 req.setDescription(factoryProperty.getDescription());