数据表对应xml修改

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RegionMapper.java

@@ -1,7 +1,11 @@
 package com.lantone.dblayermbg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.ViewRegionDTO;
+import com.lantone.common.vo.ViewRegionVO;
 import com.lantone.dblayermbg.entity.Region;
+import org.springframework.data.repository.query.Param;
 
 /**
  * <p>
@@ -10,5 +14,6 @@ import com.lantone.dblayermbg.entity.Region;
  */
 public interface RegionMapper extends BaseMapper<Region> {
 
-}
+    IPage<ViewRegionDTO> getWard(@Param("viewRegionVO") ViewRegionVO viewRegionVO);
 
+}

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.DataAuthDetailMapper">
 
-</mapper>
+</mapper>

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

@@ -107,4 +107,4 @@
             AND auth.name LIKE concat('%',#{dataAuthVO.name},'%')
         </if>
     </select>
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.DeptDoctorMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.DeptMapper">
 
-</mapper>
+</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.DictionariesMapper">
-
-</mapper>

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

@@ -59,4 +59,4 @@
             t.relation = #{doctorVO.relation}
         </if>
     </select>
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.HospitalMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.HospitalUserMapper">
 
-</mapper>
+</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.LogMapper">
-
-</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.LoginLogMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.MedoupDoctorMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.MedoupMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.MenuMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.MenuResourceMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.RegionDeptMapper">
 
-</mapper>
+</mapper>

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

@@ -1,5 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.RegionMapper">
-
-</mapper>
+    <select id="getWard" resultType="com.lantone.common.dto.ViewRegionDTO">
+        select t1.name,t1.hospital_name as hospitalName,t2.deptName,
+        case t1.status
+        when 1 then '启用'
+        when 0 then '禁用'end as status,
+        t1.gmt_create as gmtCreate
+        from sys_region t1 LEFT JOIN
+        (select a.hospital_id,a.region_id,GROUP_CONCAT(b.name)as deptName
+        from sys_region_dept a,sys_dept b
+        where
+        a.is_deleted = 'N'
+        and b.is_deleted = 'N'
+        and a.hospital_id = b.hospital_id
+        and a.dept_id = b.id
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+        GROUP BY a.region_id
+        )t2
+        on t1.hospital_id = t2.hospital_id
+        and t1.id = t2.region_id
+        where
+        t1.is_deleted = 'N'
+        <if test='hospitalId != null and hospitalId != ""'>
+            AND t1.hospital_id = #{hospitalId}
+        </if>
+        <if test='name != null and name != ""'>
+            and t1.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test='status != null and status != ""'>
+            and t2.status like CONCAT('%',#{status},'%')
+        </if>
+    </select>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.ResourceMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.RoleMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareDataAuthMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareMapper">
 
-</mapper>
+</mapper>

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

@@ -38,4 +38,4 @@
         m.gmt_create,
         m.order_no DESC
     </select>
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareResourceMapper">
 
-</mapper>
+</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.ServiceSetMapper">
-
-</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.SoftwareDataAuthMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.SoftwareMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.SoftwareMenuMapper">
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.SoftwareResourceMapper">
 
-</mapper>
+</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.SysRegionDeptMapper">
-
-</mapper>

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

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.SysRegionMapper">
-    <select id="getWard"  resultType="com.lantone.common.dto.ViewRegionDTO">
-        select t1.name,t1.hospital_name as hospitalName,t2.deptName,
-        case t1.status
-        when  1 then '启用'
-        when  0 then '禁用'end as status,
-        t1.gmt_create as gmtCreate
-        from sys_region t1 LEFT JOIN
-           (select a.hospital_id,a.region_id,GROUP_CONCAT(b.name)as deptName
-            from sys_region_dept a,sys_dept b
-            where
-            a.is_deleted = 'N'
-            and b.is_deleted = 'N'
-            and a.hospital_id = b.hospital_id
-            and a.dept_id = b.id
-        <if test="hospitalId != null and hospitalId != ''">
-            AND a.hospital_id = #{hospitalId}
-        </if>
-            GROUP BY a.region_id
-            )t2
-        on t1.hospital_id = t2.hospital_id
-        and t1.id = t2.region_id
-        where
-        t1.is_deleted = 'N'
-        <if test='hospitalId != null and hospitalId != ""'>
-            AND t1.hospital_id = #{hospitalId}
-        </if>
-        <if test='name != null and name != ""'>
-            and t1.name like CONCAT('%',#{name},'%')
-        </if>
-        <if test='status != null and status != ""'>
-            and t2.status like CONCAT('%',#{status},'%')
-        </if>
-    </select>
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.SysServiceMapper">
-
-</mapper>

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

@@ -45,4 +45,4 @@
         </if>
     </select>
 
-</mapper>
+</mapper>

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

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.UserRoleMapper">
 
-</mapper>
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDictionariesMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.DictionariesMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.Dictionaries">
-        <id column="id" property="id"/>
-        <result column="type" property="type"/>
-        <result column="code" property="code"/>
-        <result column="name" property="name"/>
-        <result column="explain" property="explain"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseLogMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.LogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.Log">
-        <id column="id" property="id"/>
-        <result column="operationContent" property="operationContent"/>
-        <result column="type" property="type"/>
-        <result column="remote_addr" property="remoteAddr"/>
-        <result column="user_agent" property="userAgent"/>
-        <result column="request_uri" property="requestUri"/>
-        <result column="method" property="method"/>
-        <result column="params" property="params"/>
-        <result column="exception" property="exception"/>
-        <result column="operator" property="operator"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseServiceSetMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.ServiceSetMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.ServiceSet">
-        <id column="id" property="id"/>
-        <result column="organize_id" property="organizeId"/>
-        <result column="organize_name" property="organizeName"/>
-        <result column="param_name" property="paramName"/>
-        <result column="param_value" property="paramValue"/>
-        <result column="explain" property="explain"/>
-        <result column="describe" property="describe"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseSysServiceMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.SysServiceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.SysService">
-        <id column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>