Prechádzať zdrojové kódy

init: init project step4: biz code support

shc 1 rok pred
rodič
commit
1ba0045094

+ 3 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmDaHospitalMapper.java

@@ -1,9 +1,7 @@
-
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaHospital;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +15,7 @@ import java.util.List;
  */
 @Mapper
 public interface WmDaHospitalMapper extends BaseMapper<WmDaHospital> {
-	public List<WmDaHospital> listByPoint(@Param("query")WmDaHospital wmDaHospital);
+    List<WmDaHospital> listByPoint(@Param("query") WmDaHospital wmDaHospital);
+
+    List<WmDaHospital> listByPointForDM(@Param("query") WmDaHospital wmDaHospital);
 }

+ 19 - 21
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -6,7 +6,6 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -223,7 +222,12 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
             queryWrapper.like("zjNamber", wmDaAgent.getZjNumber());
         }
 
-        List<Long> areaIds = sysUserAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
+        List<Long> areaIds;
+        if (CollUtil.isNotEmpty(wmDaAgent.getAreaCodes())) {
+            areaIds = wmDaAgent.getAreaCodes();
+        } else {
+            areaIds = sysUserAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
+        }
 
         List<Long> ents = enterpriseAreaService.listAreaEnts(areaIds);
         wmDaAgent.setEntIds(ents);
@@ -525,11 +529,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         sysDept.setDeptId(wmDaAgent.getDeptId());
 //		sysDept.setSubjectType(wmDaAgent.getSubjectType());
 
-        /**
-         * @Modify: start
-         * @Author: ryz
-         * @Date: 2021/4/19
-         */
+
         sysDept.setTaxCode(wmDaAgent.getZjNumber());
 
 //		if(!Arrays.equals(sysDept.getSubjectType(),wmDaAgent.getSubjectType())){
@@ -562,9 +562,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 //			}
 
 //		}
-        /**
-         * @Modify: end
-         */
+
         sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
         sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
         sysDeptMapper.updateByPrimaryKeySelective(sysDept);
@@ -686,18 +684,18 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
             List<WmDaAgent> wmDaAgentList = new ArrayList<>();
             List<WmDaDrugEnt> wmDaDrugEntList = new ArrayList<>();
             List<SysDept> sysDeptList = new ArrayList<>();
-            if (sysDeptRelationList.size() > 0) {
-                List<Integer> ids = sysDeptRelationList.stream().map(p -> p.getDescendant()).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(sysDeptRelationList)) {
+                List<Integer> ids = sysDeptRelationList.stream().map(SysDeptRelation::getDescendant).collect(Collectors.toList());
                 for (Integer id : ids) {
                     SysDept sysDept = sysDeptService.getById(id);
                     if (null != sysDept) {
                         sysDeptList.add(sysDept);
                     }
                 }
-                List<Integer> ids1 = sysDeptList.stream().filter(task -> 2 == task.getLevel()).map(p -> p.getDeptId()).collect(Collectors.toList());
-                List<Integer> ids2 = sysDeptList.stream().filter(task -> 3 == task.getLevel()).map(p -> p.getDeptId()).collect(Collectors.toList());
-                List<Integer> ids3 = sysDeptList.stream().filter(task -> 4 == task.getLevel()).map(p -> p.getDeptId()).collect(Collectors.toList());
-                List<Integer> ids4 = sysDeptList.stream().filter(task -> 5 == task.getLevel()).map(p -> p.getDeptId()).collect(Collectors.toList());
+                List<Integer> ids1 = sysDeptList.stream().filter(task -> 2 == task.getLevel()).map(SysDept::getDeptId).collect(Collectors.toList());
+                List<Integer> ids2 = sysDeptList.stream().filter(task -> 3 == task.getLevel()).map(SysDept::getDeptId).collect(Collectors.toList());
+                List<Integer> ids3 = sysDeptList.stream().filter(task -> 4 == task.getLevel()).map(SysDept::getDeptId).collect(Collectors.toList());
+                List<Integer> ids4 = sysDeptList.stream().filter(task -> 5 == task.getLevel()).map(SysDept::getDeptId).collect(Collectors.toList());
 
                 for (Integer id : ids1) {
                     WmDaDrugEnt wmDaDrugEnt1 = wmDaDrugEntMapper.selectByDeptId(id);
@@ -775,7 +773,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
             deptIds.setName(wmDaAgent.getGsmc());
             sysDeptService.updateById(deptIds);
             wmDaDrugEnts = wmDaAgentMapper.updateById(wmDaAgent);
-        } else if (wmDaDrugEnts == null) {
+        } else {
             return -1;
         }
         return wmDaDrugEnts;
@@ -784,8 +782,8 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
     /**
      * 根据sys_dept表的level字段查询
      *
-     * @param deptLevel
-     * @return
+     * @param deptLevel 企业等级
+     * @return 代理商列表
      */
     @Override
     public List<WmDaAgent> listAgentByDeptLevel(String deptLevel) {
@@ -795,8 +793,8 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
     /**
      * 根据deptRelation查询
      *
-     * @param deptId
-     * @return
+     * @param deptId 企业ID
+     * @return 代理列表
      */
     @Override
     public List<WmDaAgent> listAgentByDeptRelation(Integer deptId) {

+ 134 - 127
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,37 +38,37 @@ import java.util.Map;
 @AllArgsConstructor
 public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaDrugEnt> implements WmDaDrugEntService {
 
-	private final SysDeptService sysDeptService;
-	private final WmDaDrugEntMapper wmDaDrugEntMapper;
-	private final SysDeptRelationService sysDeptRelationService;
-	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
-	private final SysEnterpriseAreaService enterpriseAreaService;
-	private final WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
-	private final SysUserAreaService sysUserAreaService;
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public boolean saveDrugEnt(WmDaDrugEnt entity) {
-		Integer deptId = Integer.parseInt(System.currentTimeMillis() / 1000 + "");
-		entity.setDeptId(deptId);
-		entity.setCreateTime(LocalDateTime.now());
-		boolean isSave = super.save(entity);
-		if (isSave) {
-			SysDept sysDept = new SysDept();
-			sysDept.setDeptId(deptId);
-			sysDept.setName(entity.getEntname());
-			sysDept.setLevel(2);
-			sysDept.setLevel1Id(entity.getId());
-			sysDept.setLevel1Name(entity.getEntname());
-			sysDept.setTaxCode(entity.getEntcode());
-			sysDept.setFinancialReviewType(entity.getFinancialReviewType());
-			sysDept.setDeptPermissions(entity.getDeptPermissions());
-			/**
-			 * @Modify: start
-			 * @Author: ryz
-			 * @Date: 2021/4/19
-			 */
-			if(sysDeptService.saveDept(sysDept) > 0){
+    private final SysDeptService sysDeptService;
+    private final WmDaDrugEntMapper wmDaDrugEntMapper;
+    private final SysDeptRelationService sysDeptRelationService;
+    private final WmTaskSubmissionRuleService taskSubmissionRuleService;
+    private final SysEnterpriseAreaService enterpriseAreaService;
+    private final WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
+    private final SysUserAreaService sysUserAreaService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveDrugEnt(WmDaDrugEnt entity) {
+        Integer deptId = Integer.parseInt(System.currentTimeMillis() / 1000 + "");
+        entity.setDeptId(deptId);
+        entity.setCreateTime(LocalDateTime.now());
+        boolean isSave = super.save(entity);
+        if (isSave) {
+            SysDept sysDept = new SysDept();
+            sysDept.setDeptId(deptId);
+            sysDept.setName(entity.getEntname());
+            sysDept.setLevel(2);
+            sysDept.setLevel1Id(entity.getId());
+            sysDept.setLevel1Name(entity.getEntname());
+            sysDept.setTaxCode(entity.getEntcode());
+            sysDept.setFinancialReviewType(entity.getFinancialReviewType());
+            sysDept.setDeptPermissions(entity.getDeptPermissions());
+            /**
+             * @Modify: start
+             * @Author: ryz
+             * @Date: 2021/4/19
+             */
+            if (sysDeptService.saveDept(sysDept) > 0) {
 
 //				Map<String, Integer> subjectTypeAndChannel = entity.getSubjectTypeAndChannel();
 //				if (CollUtil.isNotEmpty(subjectTypeAndChannel)) {
@@ -82,103 +83,109 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 //
 //					}
 //				}
-				return true;
-			}
-			return  false;
+                return true;
+            }
+            return false;
 
-			/**
-			 * @Modify: end
-			 */
+            /**
+             * @Modify: end
+             */
 
 //			return sysDeptService.saveDept(sysDept) > 0 ? true : false;
-		}
-		return false;
-	}
-
-	@Override
-	public List<WmDaDrugEnt> selectByScope(Wrapper<WmDaDrugEnt> queryWrapper) {
-		return wmDaDrugEntMapper.selectListByScope(queryWrapper, new DataScope());
-
-	}
-
-	@Override
-	public boolean saveDrugEnts(WmDaDrugEnt entity) {
-
-		LocalDateTime now = LocalDateTime.now();
-		Integer deptId = (int) System.currentTimeMillis() / 1000;
-		entity.setDeptId(deptId);
-		entity.setCreateTime(now);
-		entity.setCreateUser(SecurityUtils.getUser().getId());
-
-		if (super.save(entity)) {
-			SysDept sysDept = new SysDept();
-			sysDept.setDeptId(deptId);
-			sysDept.setName(entity.getEntname());
-			sysDept.setLevel(2);
-			sysDept.setDeptPermissions(entity.getDeptPermissions());
-			sysDept.setFinancialReviewType(entity.getFinancialReviewType());
-			sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
-			sysDeptService.save(sysDept);
-
-			List<SysDeptRelation> newList = new ArrayList<>(2);
-			SysDeptRelation sysDeptRelation = new SysDeptRelation();
-			sysDeptRelation.setAncestor(SecurityUtils.getUser().getDeptId());
-			sysDeptRelation.setDescendant(deptId);
-			newList.add(sysDeptRelation);
-			SysDeptRelation sysDeptRelation1 = new SysDeptRelation();
-			sysDeptRelation1.setAncestor(deptId);
-			sysDeptRelation1.setDescendant(deptId);
-			newList.add(sysDeptRelation1);
-			sysDeptRelationService.saveBatch(newList);
-
-			// 初始化任务规则
-			taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(deptId));
-			// 初始化企业的任务类型配置的信息
-			taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(deptId));
-
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public WmDaDrugEnt selectByDeptId(Integer deptId) {
-		return wmDaDrugEntMapper.selectByDeptId(deptId);
-	}
-
-	@Override
-	public List<Map<String, Object>> selectEntNameByDeptId(Integer deptId) {
-		return wmDaDrugEntMapper.selectEntNameByDeptId(deptId);
-	}
-
-	@Override
-	public List selectEntNameByByDeptIds(Integer upId) {
-		return wmDaDrugEntMapper.selectEntNameByByDeptIds(upId);
-	}
-
-	@Override
-	public List<WmDaDrugEnt> getListByCsoDeptId(Integer deptId) {
-		return wmDaDrugEntMapper.getListByCsoDeptId(deptId);
-	}
-
-	/**
-	 * 分页查询
-	 *
-	 * @param page 分页对象
-	 * @param wmDaDrugEnt 实体对象
-	 */
-	@Override
-	public void selectPage(Page<WmDaDrugEnt> page, WmDaDrugEnt wmDaDrugEnt) {
-
-		List<Long> areas = sysUserAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
-
-		List<Long> ents = enterpriseAreaService.listAreaEnts(areas);
-		wmDaDrugEnt.setEntIds(ents);
-		wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
-		page.getRecords().forEach(ent -> {
-			List<Long> areaCodes = enterpriseAreaService.listEntAreas(Collections.singletonList(Long.valueOf(ent.getDeptId())));
-			ent.setAreaCodes(areaCodes);;
-		});
-
-	}
+        }
+        return false;
+    }
+
+    @Override
+    public List<WmDaDrugEnt> selectByScope(Wrapper<WmDaDrugEnt> queryWrapper) {
+        return wmDaDrugEntMapper.selectListByScope(queryWrapper, new DataScope());
+
+    }
+
+    @Override
+    public boolean saveDrugEnts(WmDaDrugEnt entity) {
+
+        LocalDateTime now = LocalDateTime.now();
+        Integer deptId = (int) System.currentTimeMillis() / 1000;
+        entity.setDeptId(deptId);
+        entity.setCreateTime(now);
+        entity.setCreateUser(SecurityUtils.getUser().getId());
+
+        if (super.save(entity)) {
+            SysDept sysDept = new SysDept();
+            sysDept.setDeptId(deptId);
+            sysDept.setName(entity.getEntname());
+            sysDept.setLevel(2);
+            sysDept.setDeptPermissions(entity.getDeptPermissions());
+            sysDept.setFinancialReviewType(entity.getFinancialReviewType());
+            sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
+            sysDeptService.save(sysDept);
+
+            List<SysDeptRelation> newList = new ArrayList<>(2);
+            SysDeptRelation sysDeptRelation = new SysDeptRelation();
+            sysDeptRelation.setAncestor(SecurityUtils.getUser().getDeptId());
+            sysDeptRelation.setDescendant(deptId);
+            newList.add(sysDeptRelation);
+            SysDeptRelation sysDeptRelation1 = new SysDeptRelation();
+            sysDeptRelation1.setAncestor(deptId);
+            sysDeptRelation1.setDescendant(deptId);
+            newList.add(sysDeptRelation1);
+            sysDeptRelationService.saveBatch(newList);
+
+            // 初始化任务规则
+            taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(deptId));
+            // 初始化企业的任务类型配置的信息
+            taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(deptId));
+
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public WmDaDrugEnt selectByDeptId(Integer deptId) {
+        return wmDaDrugEntMapper.selectByDeptId(deptId);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectEntNameByDeptId(Integer deptId) {
+        return wmDaDrugEntMapper.selectEntNameByDeptId(deptId);
+    }
+
+    @Override
+    public List selectEntNameByByDeptIds(Integer upId) {
+        return wmDaDrugEntMapper.selectEntNameByByDeptIds(upId);
+    }
+
+    @Override
+    public List<WmDaDrugEnt> getListByCsoDeptId(Integer deptId) {
+        return wmDaDrugEntMapper.getListByCsoDeptId(deptId);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param page        分页对象
+     * @param wmDaDrugEnt 实体对象
+     */
+    @Override
+    public void selectPage(Page<WmDaDrugEnt> page, WmDaDrugEnt wmDaDrugEnt) {
+
+        List<Long> areas;
+        if (CollUtil.isNotEmpty(wmDaDrugEnt.getAreaCodes())) {
+            areas = wmDaDrugEnt.getAreaCodes();
+        } else {
+            areas = sysUserAreaService.listUserAreas(Long.valueOf(SecurityUtils.getUser().getId()));
+        }
+
+        List<Long> ents = enterpriseAreaService.listAreaEnts(areas);
+        wmDaDrugEnt.setEntIds(ents);
+        wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
+        page.getRecords().forEach(ent -> {
+            List<Long> areaCodes = enterpriseAreaService.listEntAreas(Collections.singletonList(Long.valueOf(ent.getDeptId())));
+            ent.setAreaCodes(areaCodes);
+            ;
+        });
+
+    }
 }

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 475 - 476
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaHospitalServiceImpl.java


+ 61 - 47
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaHospitalMapper.xml

@@ -4,52 +4,66 @@
 
 <mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.WmDaHospitalMapper">
 
-  <resultMap id="wmDaHospitalMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmDaHospital">
-                  <id property="id" column="id"/>
-                        <result property="yymc" column="yymc"/>
-                        <result property="province" column="province"/>
-                        <result property="city" column="city"/>
-                        <result property="area" column="area"/>
-                        <result property="address" column="address"/>
-                        <result property="longitude" column="longitude"/>
-                        <result property="latitude" column="latitude"/>
-                        <result property="yygm" column="yygm"/>
-						<result property="yyxz" column="yyxz"/>
-						<result property="lxzj" column="lxzj"/>
-                        <result property="ggyx" column="ggyx"/>
-                        <result property="yzxm" column="yzxm"/>
-                        <result property="yzlxfs" column="yzlxfs"/>
-                        <result property="fyzxm" column="fyzxm"/>
-                        <result property="fyzlxfs" column="fyzlxfs"/>
-                        <result property="ywcczxm" column="ywcczxm"/>
-                        <result property="ywcczlxfs" column="ywcczlxfs"/>
-                        <result property="jwcczxm" column="jwcczxm"/>
-                        <result property="jwcczlxfs" column="jwcczlxfs"/>
-                        <result property="yjkzrxm" column="yjkzrxm"/>
-                        <result property="yjkzrlsfs" column="yjkzrlsfs"/>
-                        <result property="ybczs" column="ybczs"/>
-	  					<result property="zlghsy" column="zlghsy"/>
-                        <result property="pspzsfry" column="pspzsfry"/>
-                        <result property="pspzpssy" column="pspzpssy"/>
-                        <result property="deptId" column="dept_id"/>
-                        <result property="delFlag" column="del_flag"/>
-                        <result property="enableFlag" column="enable_flag"/>
-                        <result property="tenantId" column="tenant_id"/>
-                        <result property="createTime" column="create_time"/>
-                        <result property="createUser" column="create_user"/>
-                        <result property="updateTime" column="update_time"/>
-                        <result property="updateUser" column="update_user"/>
-            </resultMap>
+    <resultMap id="wmDaHospitalMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmDaHospital">
+        <id property="id" column="id"/>
+        <result property="yymc" column="yymc"/>
+        <result property="province" column="province"/>
+        <result property="city" column="city"/>
+        <result property="area" column="area"/>
+        <result property="address" column="address"/>
+        <result property="longitude" column="longitude"/>
+        <result property="latitude" column="latitude"/>
+        <result property="yygm" column="yygm"/>
+        <result property="yyxz" column="yyxz"/>
+        <result property="lxzj" column="lxzj"/>
+        <result property="ggyx" column="ggyx"/>
+        <result property="yzxm" column="yzxm"/>
+        <result property="yzlxfs" column="yzlxfs"/>
+        <result property="fyzxm" column="fyzxm"/>
+        <result property="fyzlxfs" column="fyzlxfs"/>
+        <result property="ywcczxm" column="ywcczxm"/>
+        <result property="ywcczlxfs" column="ywcczlxfs"/>
+        <result property="jwcczxm" column="jwcczxm"/>
+        <result property="jwcczlxfs" column="jwcczlxfs"/>
+        <result property="yjkzrxm" column="yjkzrxm"/>
+        <result property="yjkzrlsfs" column="yjkzrlsfs"/>
+        <result property="ybczs" column="ybczs"/>
+        <result property="zlghsy" column="zlghsy"/>
+        <result property="pspzsfry" column="pspzsfry"/>
+        <result property="pspzpssy" column="pspzpssy"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="enableFlag" column="enable_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createUser" column="create_user"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateUser" column="update_user"/>
+    </resultMap>
 
-	<!-- 根据经纬度获取指定范围内数据 -->
-	<select  id="listByPoint" resultMap="wmDaHospitalMap">
-		SELECT
-		s.*,
-		(st_distance (point (s.longitude, s.latitude),point(#{query.longitude},#{query.latitude})) / 0.0111) AS distance
-		FROM wm_da_hospital s
-		where s.longitude is not null and s.latitude is not null and s.del_flag=0 and s.enable_flag=0
-	  	AND (st_distance (point (s.longitude, s.latitude),point(#{query.longitude},#{query.latitude})) / 0.0111)
-			&lt;= (SELECT value from sys_dict_item WHERE type='point_jwd' limit 1) / 1000
-		ORDER BY distance asc
-	</select>
+    <!-- 根据经纬度获取指定范围内数据 -->
+    <select id="listByPoint" resultMap="wmDaHospitalMap">
+        SELECT
+        s.*,
+        (st_distance (point (s.longitude, s.latitude),point(#{query.longitude},#{query.latitude})) / 0.0111) AS distance
+        FROM wm_da_hospital s
+        where s.longitude is not null and s.latitude is not null and s.del_flag=0 and s.enable_flag=0
+        AND (st_distance (point (s.longitude, s.latitude),point(#{query.longitude},#{query.latitude})) / 0.0111)
+        &lt;= (SELECT value from sys_dict_item WHERE type='point_jwd' limit 1) / 1000
+        ORDER BY distance asc
+    </select>
+
+    <select id="listByPointForDM" resultMap="wmDaHospitalMap">
+        SELECT * from (
+        SELECT s.*,
+        (dmgeo.st_distance(dmgeo.st_pointfromtext(CONCAT('point(',s.longitude,' ', s.latitude,')'),0),
+        dmgeo.st_pointfromtext('point(#{query.longitude} #{query.latitude})',0)) / 0.0111) AS distance
+        FROM wm_da_hospital s
+        WHERE s.longitude IS NOT NULL
+        AND s.latitude IS NOT NULL
+        AND s.del_flag = 0
+        AND s.enable_flag = 0) temp
+        WHERE distance &lt;= 1
+        ORDER BY distance ASC;
+    </select>
 </mapper>

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov