From a3a93896f5e674b00f80a5165f9cdf9564a1c156 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Sat, 10 Jun 2023 17:33:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/api.md                                     |  6 ++++--
 .../controller/AppealRegController.java        | 11 +++++++++++
 .../modules/system/mapper/DictBizMapper.xml    | 18 ++++++++++++++++--
 .../modules/system/vo/DictSimpleVO.java        | 12 ++++++------
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/doc/api.md b/doc/api.md
index 95f5d64..40f45e6 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -44,11 +44,13 @@
     "data": [
         {
             "id": "1666700063321280514",
-            "dictValue": "其他事项"
+            "dictValue": "其他事项",
+            "isSealed": 0 // 是否被使用, 0:否, 1:是
         },
         {
             "id": "1666626705640546306",
-            "dictValue": "婚恋家庭纠纷"
+            "dictValue": "婚恋家庭纠纷",
+            "isSealed": 0
         }
     ],
     "msg": "操作成功"
diff --git a/src/main/java/org/springblade/modules/business/controller/AppealRegController.java b/src/main/java/org/springblade/modules/business/controller/AppealRegController.java
index fc20c74..d865066 100644
--- a/src/main/java/org/springblade/modules/business/controller/AppealRegController.java
+++ b/src/main/java/org/springblade/modules/business/controller/AppealRegController.java
@@ -74,6 +74,17 @@ public class AppealRegController extends BladeController {
 		return null;
 	}
 
+	/**
+	 * 导出
+	 *
+	 * @param file 诉求状态
+	 * @return
+	 */
+	@GetMapping("/importData")
+	public R importData(String file) {
+		return null;
+	}
+
 	/**
 	 * 根据id获取诉求信息, 上一次调解记录(点击"再次调解")
 	 *
diff --git a/src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml
index 381a470..cd74eb0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml
@@ -15,6 +15,19 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
+    <!-- 通用查询映射结果 -->
+    <resultMap id="dictResultMap2" type="org.springblade.modules.system.entity.DictBiz">
+        <id column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="code" property="code"/>
+        <result column="dict_key" property="dictKey"/>
+        <result column="dict_value" property="dictValue"/>
+        <result column="sort" property="sort"/>
+        <result column="remark" property="remark"/>
+        <result column="sealed" property="isSealed"/>
+    </resultMap>
+
     <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
         <id column="id" property="id"/>
         <result column="parent_id" property="parentId"/>
@@ -40,11 +53,12 @@
         select id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark from blade_dict_biz where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0
     </select>
 
-    <select id="getListThirdLevel" resultMap="dictResultMap">
-        SELECT biz3.*
+    <select id="getListThirdLevel" resultMap="dictResultMap2">
+        SELECT biz3.*, if(swd.id IS NULL, 0, 1) sealed
         FROM blade_dict_biz biz
         LEFT JOIN blade_dict_biz biz2 ON biz.id = biz2.parent_id
         LEFT JOIN blade_dict_biz biz3 ON biz2.id = biz3.parent_id
+        LEFT JOIN mp_server_windows_dispute swd ON biz3.id = swd.dispute_id
         WHERE biz.code = #{dictCode} AND biz.parent_id = 0
     </select>
 
diff --git a/src/main/java/org/springblade/modules/system/vo/DictSimpleVO.java b/src/main/java/org/springblade/modules/system/vo/DictSimpleVO.java
index 0bae855..04bdd8c 100644
--- a/src/main/java/org/springblade/modules/system/vo/DictSimpleVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/DictSimpleVO.java
@@ -16,19 +16,13 @@
  */
 package org.springblade.modules.system.vo;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tool.node.INode;
-import org.springblade.modules.system.entity.Dict;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 视图实体类
@@ -50,4 +44,10 @@ public class DictSimpleVO implements Serializable {
 	 */
 	@ApiModelProperty(value = "字典名称")
 	private String dictValue;
+
+	/**
+	 * 是否被使用, 0:否, 1:是
+	 */
+	@ApiModelProperty(value = "是否被使用")
+	private Integer isSealed;
 }