提交

README.md

@@ -65,7 +65,8 @@
 8131 智能养老业务模块
 802 智能养老系统前端
 
-
+6060 OKC系统后端
+803 OKC系统前端
 
 ## 升级改造
 0.由于很多项目都使用若伊框架开发，如果放在同一个服务器上，那么cookies和redis的存储会重叠，因此这边做了处理

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/SearchYljgJcxxController.java

@@ -7,10 +7,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.organization.domain.YljgJcxx;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -88,10 +85,10 @@ public class SearchYljgJcxxController extends BaseController
      * 工作台-养老机构点位图
      */
 //    @RequiresPermissions("statistics:jcxx:list")
-    @GetMapping("/selectYljgDwtTj/{createUnit}")
-    public AjaxResult selectYljgDwtTj(@PathVariable("createUnit") String createUnit)
+    @PostMapping("/selectYljgDwtTj")
+    public AjaxResult selectYljgDwtTj(@RequestBody YljgJcxx yljgJcxx)
     {
-        return AjaxResult.success(yljgJcxxService.selectYljgDwtTj(createUnit));
+        return AjaxResult.success(yljgJcxxService.selectYljgDwtTj(yljgJcxx));
     }
 
     /**

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/mapper/GztMapper.java

@@ -19,7 +19,11 @@ public interface GztMapper extends BaseMapperPlus<YljgJcxx>
 
     public List<Map<String,Object>> selectMapData(String unit);
 
-    public List<Map<String,Object>> selectYljgDwtTj(String unit);
+    public List<Map<String,Object>> selectYljgDwtTj(YljgJcxx yljgJcxx);
+
+    public List<Map<String,Object>> selectYljgDwtTjJg(YljgJcxx yljgJcxx);
+
+    public List<Map<String,Object>> selectYljgDwtTjSqJg(YljgJcxx yljgJcxx);
 
     public List<Map<String,Object>> selectDwtXq(String id);
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/ISearchYljgJcxxService.java

@@ -37,7 +37,7 @@ public interface ISearchYljgJcxxService
     /*工作台-地图*/
     public Map<String,Object> selectYljgFbtTj(String createUnit);
 
-    public Map<String,Object> selectYljgDwtTj(String createUnit);
+    public Map<String,Object> selectYljgDwtTj(YljgJcxx yljgJcxx);
 
     public Map<String,Object> selectDwtXq(String createUnit);
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/SearchYljgJcxxServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.system.utils.SubCodeUtil;
 import io.seata.common.util.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -100,12 +101,24 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
     }
 
     @Override
-    public Map<String, Object> selectYljgDwtTj(String unit) {
-        if (StringUtils.isEmpty(unit)) {
-            unit = SecurityUtils.getAreaCode();
+    public Map<String, Object> selectYljgDwtTj(YljgJcxx yljgJcxx) {
+        if (StringUtils.isEmpty(yljgJcxx.getSzxzqh())) {
+            yljgJcxx.setSzxzqh(SecurityUtils.getAreaCode());
         }
+        yljgJcxx.setSzxzqh(unitHandler(yljgJcxx.getSzxzqh()));
         Map<String,Object> returnMap = new HashMap<>();
-        returnMap.put("mapData", gztMapper.selectYljgDwtTj(unitHandler(unit)));
+        if (ObjectUtils.isNotEmpty(yljgJcxx.getYljglx())) {
+            // 不传显示所有
+            returnMap.put("mapData", gztMapper.selectYljgDwtTj(yljgJcxx));
+        } else {
+            if (yljgJcxx.getYljglx() == 0) {
+                // 0显示养老机构
+                returnMap.put("mapData", gztMapper.selectYljgDwtTjJg(yljgJcxx));
+            } else {
+                // 1显示社区养老机构
+                returnMap.put("mapData", gztMapper.selectYljgDwtTjSqJg(yljgJcxx));
+            }
+        }
         return returnMap;
     }
 

ruoyi-modules/mz-business/src/main/resources/mapper/business/GztMapper.xml

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.code as code, a.name as name, getyljgcount(a.code) as yljgValue, getyljgsqcount(a.code) as sqyljgValue from (select code, name, parent_id from v_filter_xzqh where level < 4) as a where (select id from sys_dept_jl where code = #{unit}) = a.parent_id and locate('ZS', a.code) = 0
     </select>
 
-    <select id="selectYljgDwtTj" parameterType="String" resultType="java.util.Map">
+    <select id="selectYljgDwtTj" parameterType="YljgJcxx" resultType="java.util.Map">
         SELECT
             id,
             lat,
@@ -92,8 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             yljg_jcxx
         WHERE
-            szxzqh like concat(#{unit}, '%')
+            szxzqh like concat(#{szxzqh}, '%')
             and sczt = '01'
+            <if test="dwxz != null and dwxz != ''"> and dwxz = #{szxzqh} </if>
+            <if test="xbzt != null and xbzt != ''"> and xbzt = #{xbzt} </if>
+            <if test="isChxddjg != null and isChxddjg != ''"> and is_chxddjg = #{isChxddjg} </if>
+            <if test="isTbzrx != null and isTbzrx != ''"> and is_tbzrx = #{isTbzrx} </if>
+            <if test="isTgjjylsmfw != null and isTgjjylsmfw != ''"> and is_tgjjylsmfw = #{isTgjjylsmfw} </if>
+            <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%') </if>
         UNION ALL
         SELECT
             id,
@@ -104,8 +110,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             yljgsq_jcxx
         WHERE
-            szxzqh like concat(#{unit}, '%')
+            szxzqh like concat(#{szxzqh}, '%')
             and sczt = '01'
+            <if test="dwxz != null and dwxz != ''"> and dwxz = #{szxzqh} </if>
+            <if test="xbzt != null and xbzt != ''"> and xbzt = #{xbzt} </if>
+            <if test="isChxddjg != null and isChxddjg != ''"> and is_chxddjg = #{isChxddjg} </if>
+            <if test="isTbzrx != null and isTbzrx != ''"> and is_tbzrx = #{isTbzrx} </if>
+            <if test="isTgjjylsmfw != null and isTgjjylsmfw != ''"> and is_tgjjylsmfw = #{isTgjjylsmfw} </if>
+            <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%') </if>
+    </select>
+
+    <select id="selectYljgDwtTjJg" parameterType="YljgJcxx" resultType="java.util.Map">
+        SELECT
+            id,
+            lat,
+            lng,
+            jgmc,
+            '0' as lb
+        FROM
+            yljg_jcxx
+        WHERE
+            szxzqh like concat(#{szxzqh}, '%')
+            and sczt = '01'
+            <if test="dwxz != null and dwxz != ''"> and dwxz = #{szxzqh} </if>
+            <if test="xbzt != null and xbzt != ''"> and xbzt = #{xbzt} </if>
+            <if test="isChxddjg != null and isChxddjg != ''"> and is_chxddjg = #{isChxddjg} </if>
+            <if test="isTbzrx != null and isTbzrx != ''"> and is_tbzrx = #{isTbzrx} </if>
+            <if test="isTgjjylsmfw != null and isTgjjylsmfw != ''"> and is_tgjjylsmfw = #{isTgjjylsmfw} </if>
+            <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%') </if>
+    </select>
+
+    <select id="selectYljgDwtTjSqJg" parameterType="YljgJcxx" resultType="java.util.Map">
+        SELECT
+            id,
+            lat,
+            lng,
+            jgmc,
+            '1' as lb
+        FROM
+            yljgsq_jcxx
+        WHERE
+            szxzqh like concat(#{szxzqh}, '%')
+            and sczt = '01'
+            <if test="dwxz != null and dwxz != ''"> and dwxz = #{szxzqh} </if>
+            <if test="xbzt != null and xbzt != ''"> and xbzt = #{xbzt} </if>
+            <if test="isChxddjg != null and isChxddjg != ''"> and is_chxddjg = #{isChxddjg} </if>
+            <if test="isTbzrx != null and isTbzrx != ''"> and is_tbzrx = #{isTbzrx} </if>
+            <if test="isTgjjylsmfw != null and isTgjjylsmfw != ''"> and is_tgjjylsmfw = #{isTgjjylsmfw} </if>
+            <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%') </if>
     </select>
 
     <select id="selectDwtXq" parameterType="String" resultType="java.util.Map">