区域添加字段：类别（国内、国外），字典id

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java

@@ -3,6 +3,7 @@ package com.nflg.mobilebroken.admin.pojo.dto;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  *
@@ -17,4 +18,10 @@ public class BaseAreaEditDTO {
 
     @NotBlank(message = "区域名称不能为空")
     private String areaName;
+
+    /**
+     * 类别（国内、国外），字典id
+     */
+    @NotNull(message = "类别不能为空")
+    private Long categoryId;
 }

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/BaseAreaQuery.java

@@ -15,5 +15,5 @@ public class BaseAreaQuery extends PageBaseQuery {
     /**
      * 状态 状态 0-无效  1-有效
      */
-    private Integer areaState;
+    private Byte areaState;
 }

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java

@@ -79,6 +79,16 @@ public class TBaseAreaVO implements Serializable {
      */
     private LocalDateTime dataModifyTime;
 
+    /**
+     * 类别（国内、国外），字典id
+     */
+    private Long categoryId;
+
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+
     /**
      * 子级列表
      */

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java

@@ -85,4 +85,9 @@ public class TBaseArea implements Serializable {
      * 是否删除0-否 1-是
      */
     private Integer delIs;
+
+    /**
+     * 类别（国内、国外），字典id
+     */
+    private Long categoryId;
 }

nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml

@@ -13,9 +13,11 @@
 
     </sql>
     <select id="getList" resultType="com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO">
-        select  * from t_base_area where del_is=0
+        select a.*,di.name as 'category_name'
+        from t_base_area a where del_is=0
+        left join dictionary_item di on a.category_id=di.id
         <if test="(query.areaCodeOrName==null or query.areaCodeOrName=='') and query.areaState==null ">
-            and  parent_area_row_id=0
+            and a.parent_area_row_id=0
         </if>
           <include refid="whr" />