From 05caa47bb77fdf4012067e159432defa5e38368e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:26:38 +0800
Subject: [PATCH] 设置可管理派出所三级单位
---
src/main/resources/mapper/DepartmentMapper.xml | 2 +-
src/main/java/com/mindskip/xzs/domain/Department.java | 2 +-
src/main/java/com/mindskip/xzs/domain/enums/YesOrNoEnum.java | 10 ++++++----
src/main/java/com/mindskip/xzs/domain/vo/DepartmentEditVO.java | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/Department.java b/src/main/java/com/mindskip/xzs/domain/Department.java
index c3a6afd..8c15ed6 100644
--- a/src/main/java/com/mindskip/xzs/domain/Department.java
+++ b/src/main/java/com/mindskip/xzs/domain/Department.java
@@ -27,7 +27,7 @@
/**
* 鏄惁鑳界鐞嗘墍鏈塴evel涓�3鐨勬淳鍑烘墍
*/
- private YesOrNoEnum special;
+ private Boolean special;
/**
* 閮ㄩ棬鍑犵骇
diff --git a/src/main/java/com/mindskip/xzs/domain/enums/YesOrNoEnum.java b/src/main/java/com/mindskip/xzs/domain/enums/YesOrNoEnum.java
index ba27dd7..6d226f9 100644
--- a/src/main/java/com/mindskip/xzs/domain/enums/YesOrNoEnum.java
+++ b/src/main/java/com/mindskip/xzs/domain/enums/YesOrNoEnum.java
@@ -1,6 +1,7 @@
package com.mindskip.xzs.domain.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;
/**
@@ -10,16 +11,17 @@
@Getter
public enum YesOrNoEnum {
- YES("yes", "鏄�"),
- NO("yes", "鍚�"),
+ YES(1, "鏄�"),
+ NO(0, "鍚�"),
;
@EnumValue
- private final String value;
+ @JsonValue
+ private final Integer value;
private final String desc;
- YesOrNoEnum(String value, String desc) {
+ YesOrNoEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/DepartmentEditVO.java b/src/main/java/com/mindskip/xzs/domain/vo/DepartmentEditVO.java
index ecd95a7..ef3c9e5 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/DepartmentEditVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/DepartmentEditVO.java
@@ -30,7 +30,7 @@
/**
* 鏄惁鑳界鐞嗘墍鏈塴evel涓�3鐨勬淳鍑烘墍
*/
- private YesOrNoEnum special;
+ private Boolean special;
/**
* 閮ㄩ棬鍑犵骇
diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml
index 7577d5c..598c2a5 100644
--- a/src/main/resources/mapper/DepartmentMapper.xml
+++ b/src/main/resources/mapper/DepartmentMapper.xml
@@ -6,7 +6,7 @@
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="deleted" jdbcType="VARCHAR" property="deleted"/>
<result column="parent_id" property="parentId"/>
- <result column="special" property="special" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
+ <result column="special" property="special"/>
<result column="level" property="level"/>
</resultMap>
--
Gitblit v1.8.0