diff --git a/src/main/java/com/dc/dc_project/enums/laboratory/Equipment/EStatus.java b/src/main/java/com/dc/dc_project/enums/Equipment/EStatus.java similarity index 93% rename from src/main/java/com/dc/dc_project/enums/laboratory/Equipment/EStatus.java rename to src/main/java/com/dc/dc_project/enums/Equipment/EStatus.java index 4141f4e..b4254d3 100644 --- a/src/main/java/com/dc/dc_project/enums/laboratory/Equipment/EStatus.java +++ b/src/main/java/com/dc/dc_project/enums/Equipment/EStatus.java @@ -1,4 +1,4 @@ -package com.dc.dc_project.enums.laboratory.Equipment; +package com.dc.dc_project.enums.Equipment; import lombok.Getter; diff --git a/src/main/java/com/dc/dc_project/enums/IsDeleted.java b/src/main/java/com/dc/dc_project/enums/IsDeleted.java new file mode 100644 index 0000000..e6b8ce9 --- /dev/null +++ b/src/main/java/com/dc/dc_project/enums/IsDeleted.java @@ -0,0 +1,38 @@ +package com.dc.dc_project.enums; + + +import lombok.Getter; + +@Getter +public enum IsDeleted { + + NO(0, "正常"), + YES(1, "已删除"); + + private final Integer code; + private final String message; + + IsDeleted(Integer code, String message) { + this.code = code; + this.message = message; + } + + public static String getMessageByCode(Integer code) { + for (IsDeleted value : values()) { + if (value.code.equals(code)) { + return value.message; + } + } + return null; + } + + public static Integer getCodeByMessage(String message) { + for (IsDeleted value : values()) { + if (value.message.equals(message)) { + return value.code; + } + } + return null; + } + +} diff --git a/src/main/java/com/dc/dc_project/enums/laboratory/OrgType.java b/src/main/java/com/dc/dc_project/enums/OrgType.java similarity index 92% rename from src/main/java/com/dc/dc_project/enums/laboratory/OrgType.java rename to src/main/java/com/dc/dc_project/enums/OrgType.java index 985fc60..9ffdf43 100644 --- a/src/main/java/com/dc/dc_project/enums/laboratory/OrgType.java +++ b/src/main/java/com/dc/dc_project/enums/OrgType.java @@ -1,6 +1,5 @@ -package com.dc.dc_project.enums.laboratory; +package com.dc.dc_project.enums; -import lombok.Data; import lombok.Getter; @Getter diff --git a/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java index 10c4acc..6b761e6 100644 --- a/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dc.dc_project.common.ResponseResult; import com.dc.dc_project.common.ResultCode; -import com.dc.dc_project.enums.laboratory.OrgType; +import com.dc.dc_project.enums.OrgType; import com.dc.dc_project.model.dto.OrgDto; import com.dc.dc_project.model.pojo.Laboratory; import com.dc.dc_project.model.pojo.Org; diff --git a/src/main/java/com/dc/dc_project/service/impl/StandardCategoryServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/StandardCategoryServiceImpl.java index 86b7945..f5e3f8f 100644 --- a/src/main/java/com/dc/dc_project/service/impl/StandardCategoryServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/StandardCategoryServiceImpl.java @@ -41,6 +41,8 @@ public class StandardCategoryServiceImpl extends ServiceImpl