列表页添加启用禁用名称字段

common/src/main/java/com/lantone/common/dto/GetDataAuthPageDTO.java

@@ -29,5 +29,6 @@ public class GetDataAuthPageDTO implements Serializable {
 
     @ApiModelProperty(value = "状态 0:禁用，1：启用")
     private String status;
-
+    @ApiModelProperty(value = "状态名称")
+    private String statusName;
 }

common/src/main/java/com/lantone/common/dto/GetDeptInfoDTO.java

@@ -18,8 +18,12 @@ public class GetDeptInfoDTO implements Serializable {
     private String deptName;
     @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室）")
     private String type = "5";
+    @ApiModelProperty(value = "组织类型名称")
+    private String typeName = "科室";
     @ApiModelProperty(value = "状态")
     private String status;
+    @ApiModelProperty(value = "状态名称")
+    private String statusName;
     @ApiModelProperty(value = "病区id")
     private String regionId;
     @ApiModelProperty(value = "病区名称")

common/src/main/java/com/lantone/common/dto/GetHospitalListInfoDTO.java

@@ -21,6 +21,8 @@ public class GetHospitalListInfoDTO implements Serializable {
 
     private Long parentId;
 
+    @ApiModelProperty(value = "根目录标志")
+    private boolean rootFlag;
     @ApiModelProperty(value = "名称")
     private String hospitalName;
     @ApiModelProperty(value = "是否存在子组织")
@@ -29,9 +31,13 @@ public class GetHospitalListInfoDTO implements Serializable {
     private boolean hasUserFlag;
     @ApiModelProperty(value = "状态")
     private String status;
+    @ApiModelProperty(value = "状态名称")
+    private String statusName;
 
     @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室）")
     private String type;
+    @ApiModelProperty(value = "组织类型名称")
+    private String typeName;
 
     @ApiModelProperty(value = "该医院的科室列表")
     private List<GetDeptInfoDTO> depts;

common/src/main/java/com/lantone/common/dto/GetMenusTreeDTO.java

@@ -26,7 +26,8 @@ public class GetMenusTreeDTO implements Serializable {
 
     @ApiModelProperty(value = "功能名称")
     private String name;
-
+    @ApiModelProperty(value = "状态名称")
+    private String statusName;
     @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能")
     private String type;
 

common/src/main/java/com/lantone/common/dto/GetRolePageDTO.java

@@ -27,5 +27,6 @@ public class GetRolePageDTO implements Serializable {
 
     @ApiModelProperty(value = "状态 0:禁用，1：启用")
     private String status;
-
+    @ApiModelProperty(value = "状态名称")
+    private String statusName;
 }

common/src/main/java/com/lantone/common/dto/GetUserPageDTO.java

@@ -28,5 +28,7 @@ public class GetUserPageDTO implements Serializable {
     private Integer jobNo;
     @ApiModelProperty(value = "状态")
     private String status;
+    @ApiModelProperty(value = "状态名称")
+    private String statusName;
 
 }

dblayer-mbg/src/main/resources/mapper/DataAuthMapper.xml

@@ -70,11 +70,16 @@
     </select>
     <select id="getDataAuthPage" resultType="com.lantone.common.dto.GetDataAuthPageDTO">
         SELECT DISTINCT
-        auth.id,
-        auth.name,
-        r.id roleId,
-        r.`name` roleName,
-        auth.`status`
+            auth.id,
+            auth.name,
+            r.id roleId,
+            IF (
+            auth.`status` = 1,
+            "启用",
+            "禁用"
+            ) statusName,
+            r.`name` roleName,
+            auth.`status`
         FROM
         sys_role r,
         sys_data_auth auth,

dblayer-mbg/src/main/resources/mapper/DeptMapper.xml

@@ -18,6 +18,7 @@
             d.id deptId,
             d.`name` deptName,
             d.`status`,
+            IF(d.`status`=1,"启用","禁用") statusName,
             r.id regionId,
             r.`name` regionName,
             d.gmt_create gmtCreate

dblayer-mbg/src/main/resources/mapper/HospitalMapper.xml

@@ -11,7 +11,9 @@
             sys_hospital h
         WHERE
             h.is_deleted = 'N'
-        AND h.`status` = #{status}
+        <if test="status !=null and status!=''">
+            AND h.`status` = #{status}
+        </if>
         AND FIND_IN_SET(h.id, getChildList(#{hospitalId}))
     </select>
     <select id="getHospitalById" resultType="com.lantone.common.dto.GetHospitalListInfoDTO">
@@ -20,12 +22,33 @@
             h.`name` hospitalName,
             h.parent_id parentId,
             h.`status`,
+            IF (
+            h.`status` = 1,
+            "启用",
+            "禁用"
+            ) statusName,
             h.type,
+            (
+            CASE
+            WHEN h.type = 0 THEN
+            "AI质控平台"
+            WHEN h.type = 1 THEN
+            "集团医院"
+            WHEN h.type = 2 THEN
+            "医共体"
+            WHEN h.type = 3 THEN
+            "医联体"
+            WHEN h.type = 4 THEN
+            "单家医院"
+            ELSE
+            "未知类型"
+            END
+            ) typeName,
             h.gmt_create gmtCreate
         FROM
-            sys_hospital h
+        sys_hospital h
         WHERE
-            h.is_deleted = 'N'
+        h.is_deleted = 'N'
             AND h.creator = #{getHospitalListInfoVO.creator}
         <if test="getHospitalListInfoVO.hospitalName !=null and getHospitalListInfoVO.hospitalName!=''">
             AND h.`name` LIKE concat ('%',#{getHospitalListInfoVO.hospitalName},'%')

dblayer-mbg/src/main/resources/mapper/HospitalUserMapper.xml

@@ -9,6 +9,11 @@
         h.id hospitalId,
         h.`name` hospitalName,
         u.job_no jobNo,
+        IF (
+        u.`status` = 1,
+        "启用",
+        "禁用"
+        ) statusName,
         u.`status`
         FROM
         sys_user u,

dblayer-mbg/src/main/resources/mapper/RoleMapper.xml

@@ -3,7 +3,12 @@
 <mapper namespace="com.lantone.dblayermbg.mapper.RoleMapper">
     <select id="getRolePage" resultType="com.lantone.common.dto.GetRolePageDTO">
         SELECT
-            *
+            r.*,
+            IF (
+            r.`status` = 1,
+            "启用",
+            "禁用"
+            ) statusName
         FROM
             sys_role r
         WHERE

dblayer-mbg/src/main/resources/mapper/RoleSoftwareMenuMapper.xml

@@ -3,16 +3,21 @@
 <mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareMenuMapper">
     <select id="getMenus" resultType="com.lantone.common.dto.GetMenusTreeDTO">
         SELECT
-        m.id,
-        m.`name`,
-        m.parent_id,
-        m.`status`,
-        m.order_no,
-        m.remark,
-        m.type,
-        m.url url,
-        r.id resourceId,
-        r.url permission
+            m.id,
+            m.`name`,
+            m.parent_id,
+            m.`status`,
+            m.order_no,
+            m.remark,
+            m.type,
+            m.url url,
+            IF (
+            m.`status` = 1,
+            "启用",
+            "禁用"
+            ) statusName,
+            r.id resourceId,
+            r.url permission
         FROM
         sys_software_menu sm,
         sys_role_software_menu rsm,

security-center/src/main/java/com/lantone/security/enums/DictionaryEnum.java

@@ -14,6 +14,7 @@ public enum DictionaryEnum implements KeyedNamed {
     PASSWORD(44, "重置密码"),
     REGION(45, "病区"),
     MANAGE_HIDE_MENU(46, "管理隐藏功能菜单"),
+    STATUS(47, "启用禁用"),
     NOT_SHOW_MENU(41,"不显示菜单");
 
     @Setter

security-center/src/main/java/com/lantone/security/facade/HospitalManagementFacade.java

@@ -1,6 +1,7 @@
 package com.lantone.security.facade;
 
 import cn.hutool.crypto.digest.BCrypt;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -15,6 +16,7 @@ import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EntityUtil;
 import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.common.vo.AddHospitalTreeVO;
 import com.lantone.common.vo.AddHospitalVO;
@@ -190,7 +192,7 @@ public class HospitalManagementFacade {
     public boolean deleteHospital(Long hospitalId) {
         AtomicBoolean out = new AtomicBoolean(false);
         //1.获取该组织及其子组织
-        List<Long> hospitals = hospitalFacade.getBaseMapper().getHospitalTreeInfo(hospitalId,StatusEnum.Enable.getKey()).stream()
+        List<Long> hospitals = hospitalFacade.getBaseMapper().getHospitalTreeInfo(hospitalId,null).stream()
                 .map(GetHospitalTreeDTO::getHospitalId).collect(Collectors.toList());
         //2.删除这些组织的用户、角色
         if (ListUtil.isNotEmpty(hospitals)) {
@@ -220,6 +222,8 @@ public class HospitalManagementFacade {
                 }
 
             });
+        }else {
+            Asserts.fail("要删除的组织不存在,请刷新重试~");
         }
         return out.get();
     }
@@ -393,11 +397,15 @@ public class HospitalManagementFacade {
             });
             outMap.put(DictionaryEnum.REGION.getKey(), downBoxRegions);
         } else {
-            JSONObject Type = JSONObject.parseObject(dictionaryInfoFacade.getBaseMapper().getDictionaryInfoByType(DictionaryEnum.HOSPITAL_TYPE.getKey()).get(0).getVal());
-            outMap.put(DictionaryEnum.HOSPITAL_TYPE.getKey(), Type.get(hospitalType));
+            String type = dictionaryInfoFacade.getBaseMapper().getDictionaryInfoByType(DictionaryEnum.HOSPITAL_TYPE.getKey()).get(hospitalType).getVal();
+            if(StringUtil.isNotEmpty(type)){
+                outMap.put(DictionaryEnum.HOSPITAL_TYPE.getKey(), JSONArray.parseArray(type));
+            }
         }
         //添加职称信息
         outMap.put(DictionaryEnum.TITLE.getKey(), dictionaryInfoFacade.getBaseMapper().getDictionaryInfoByType(DictionaryEnum.TITLE.getKey()));
+        //添加status信息
+        outMap.put(DictionaryEnum.STATUS.getKey(), dictionaryInfoFacade.getBaseMapper().getDictionaryInfoByType(DictionaryEnum.STATUS.getKey()));
         return outMap;
     }
 
@@ -422,6 +430,12 @@ public class HospitalManagementFacade {
             getHospitalListInfoDTO.setHospitalId(hospital.getId());
             getHospitalListInfoDTO.setHospitalName(hospital.getName());
             BeanUtils.copyProperties(hospital, getHospitalListInfoDTO);
+            //添加根目录标志
+            getHospitalListInfoDTO.setRootFlag(true);
+            getHospitalListInfoDTO.setTypeName(HospitalTypeEnum.getName(hospitalType));
+            if(StringUtil.isNotEmpty(getHospitalListInfoDTO.getStatus())){
+                getHospitalListInfoDTO.setStatusName(StatusEnum.getName(Integer.parseInt(getHospitalListInfoDTO.getStatus())));
+            }
             getHospitalListInfoDTO.setDepts(deptFacade.getBaseMapper().getDeptRegion(getHospitalListInfoVO));
             List<GetHospitalListInfoDTO> hospitalListInfos = new ArrayList<>();
             if (ListUtil.isNotEmpty(getHospitalListInfoDTO.getDepts())) {
@@ -435,6 +449,8 @@ public class HospitalManagementFacade {
             Map<Long, List<GetHospitalListInfoDTO>> hospitalMaps = EntityUtil.makeEntityListMap(hospitalListInfoDTOS, "parentId");
             List<GetHospitalListInfoDTO> hospitalListInfos = hospitalMaps.get(hospital.getParentId());
             for (GetHospitalListInfoDTO bean : hospitalListInfos) {
+                //设置根目录
+                bean.setRootFlag(true);
                 //获取该组织是否有子组织、用户
                 getHospitalSonORUser(bean);
                 getSonHospital(bean, hospitalMaps);