Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

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

@@ -21,6 +21,21 @@ public class FactoryProperty implements AbstractExcelProperty {
     @ExcelHeadAlias(value = "供应商类型(必填) 枚举值:包材厂,啤酒厂")
     private String factoryType;
 
+    @ExcelHeadAlias(value = "供应商级别 1-一级供应商 2-二级供应商")
+    private Integer factoryLevel;
+
+    @ExcelHeadAlias(value = "省")
+    private String province;
+
+    @ExcelHeadAlias(value = "市")
+    private String city;
+
+    @ExcelHeadAlias(value = "区")
+    private String district;
+
+    @ExcelHeadAlias(value = "详细地址")
+    private String address;
+
     @ExcelHeadAlias(value = "联系人姓名")
     private String keymanName;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseFactory.java

@@ -34,6 +34,21 @@ public class BaseFactory {
     @ApiModelProperty(value = "供应商类型 1-包材厂 2-啤酒厂")
     private Integer factoryType;
 
+    @ApiModelProperty(value = "供应商级别 1-一级供应商 2-二级供应商")
+    private Integer factoryLevel;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
     @ApiModelProperty(value = "联系人姓名")
     private String keymanName;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/enums/FactoryLevelEnum.java

@@ -0,0 +1,48 @@
+package com.abi.qms.platform.dao.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * @author Eurus
+ * @date 2021/5/25 14:04
+ * @Description: 供应商级别
+ */
+@Getter
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum FactoryLevelEnum {
+
+    //供应商级别 1-一级供应商 2-二级供应商
+    ONE(1, "一级供应商"),
+    TWO(2, "二级供应商");
+
+    @EnumValue
+    private Integer code;
+    private String name;
+
+    private static final Set<FactoryLevelEnum> ALL = EnumSet.allOf(FactoryLevelEnum.class);
+
+    public static String getName(Integer code) {
+        return ALL.stream()
+                .filter(o -> o.code.equals(code))
+                .map(FactoryLevelEnum::getName)
+                .findAny().orElse(null);
+    }
+
+    public static Integer getCode(String name) {
+        return ALL.stream()
+                .filter(o -> o.name.equals(name))
+                .map(FactoryLevelEnum::getCode)
+                .findAny().orElse(null);
+    }
+
+    public boolean is(Integer code) {
+        return getCode().equals(code);
+    }
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveFactoryReq.java

@@ -26,6 +26,21 @@ public class SaveFactoryReq implements Serializable {
     @ApiModelProperty(value = "供应商类型 1-包材厂 2-啤酒厂")
     private Integer factoryType;
 
+    @ApiModelProperty(value = "供应商级别 1-一级供应商 2-二级供应商")
+    private Integer factoryLevel;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
     @ApiModelProperty(value = "联系人姓名")
     private String keymanName;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetFactoryDetailRes.java

@@ -28,6 +28,21 @@ public class GetFactoryDetailRes implements Serializable {
     @ApiModelProperty(value = "供应商类型 1-包材厂 2-啤酒厂")
     private Integer factoryType;
 
+    @ApiModelProperty(value = "供应商级别 1-一级供应商 2-二级供应商")
+    private Integer factoryLevel;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
     @ApiModelProperty(value = "联系人姓名")
     private String keymanName;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListFactoryRes.java

@@ -46,6 +46,21 @@ public class ListFactoryRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "供应商类型 1-包材厂 2-啤酒厂")
         private Integer factoryType;
 
+        @ApiModelProperty(value = "供应商级别 1-一级供应商 2-二级供应商")
+        private Integer factoryLevel;
+
+        @ApiModelProperty(value = "省")
+        private String province;
+
+        @ApiModelProperty(value = "市")
+        private String city;
+
+        @ApiModelProperty(value = "区")
+        private String district;
+
+        @ApiModelProperty(value = "详细地址")
+        private String address;
+
         @ApiModelProperty(value = "联系人姓名")
         private String keymanName;
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseFactoryMapper.xml

@@ -8,6 +8,11 @@
         <result column="factory_code" property="factoryCode"/>
         <result column="factory_name" property="factoryName"/>
         <result column="factory_type" property="factoryType"/>
+        <result column="factory_level" property="factoryLevel"/>
+        <result column="province" property="province"/>
+        <result column="city" property="city"/>
+        <result column="district" property="district"/>
+        <result column="address" property="address"/>
         <result column="keyman_name" property="keymanName"/>
         <result column="keyman_mobile" property="keymanMobile"/>
         <result column="email" property="email"/>
@@ -21,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, factory_code, factory_name, factory_type, keyman_name, keyman_mobile, email, max_file_count, description, create_time, create_by, update_time, is_delete
+        id, factory_code, factory_name, factory_type, factory_level, province, city, district, address, keyman_name, keyman_mobile, email, max_file_count, description, create_time, create_by, update_time, is_delete
     </sql>
 
 </mapper>