优化

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/ChannelMapAceeptVo.java

@@ -45,7 +45,9 @@ public class ChannelMapAceeptVo implements Serializable {
 
     String isTelephone = ""; //有无联系方式
 
-    String storeAge = ""; //店零
+    String storeAge = ""; //店龄
+
+    String organization = "";
     int size = 15; //tag分析时候用
 
     /*

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelAnalyseServiceImpl.java

@@ -590,6 +590,13 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
             });
         }
 
+        //组织结构
+        if(channelMapAceeptVo.getOrganization() != null && !channelMapAceeptVo.getOrganization().equals("")){
+            queryWrapper.and(wdInfoQueryWrapper -> {
+                wdInfoQueryWrapper.eq("organization",channelMapAceeptVo.getOrganization());
+            });
+        }
+
         //地区过滤
         queryWrapper.and(wdInfoQueryWrapper -> {
             wdInfoQueryWrapper.in("addr_code", wdAddrCode);
@@ -676,80 +683,5 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         return collect;
     }
 
-    /**
-     * 分装筛选条件（模糊查询）
-     * @param queryWrapper
-     * @param channelMapAceeptVo
-     */
-    /*    public void assembleQueryWrapper(QueryWrapper<WdInfo> queryWrapper,ChannelMapAceeptVo channelMapAceeptVo){
-        //1.根据不同级别得到需要查询的 地区码
-        List<String> addrCodeList = new ArrayList<>();
-        if ("province".equals(channelMapAceeptVo.getRankType())) {
-            //省码
-            for (String s : channelMapAceeptVo.getAddrCode()) {
-                String substring = s.substring(0, 2);
-                addrCodeList.add(substring);
-            }
-        } else if ("city".equals(channelMapAceeptVo.getRankType())) {
-            //省的所有市
-            for (String s : channelMapAceeptVo.getAddrCode()) {
-                String substring = s.substring(0, 2);
-                addrCodeList.add(substring);
-            }
-        } else if ("zone".equals(channelMapAceeptVo.getRankType())) {
-            //市的所有区
-            for (String s : channelMapAceeptVo.getAddrCode()) {
-                String substring = s.substring(0, 4);
-                addrCodeList.add(substring);
-            }
-        } else if ("district".equals(channelMapAceeptVo.getRankType())){
-            //区的所有街道
-            for (String s : channelMapAceeptVo.getAddrCode()) {
-                String substring = s.substring(0, 6);
-                addrCodeList.add(substring);
-            }
-        }else {
-            //省码
-            for (String s : channelMapAceeptVo.getAddrCode()) {
-                String substring = s.substring(0, 2);
-                addrCodeList.add(substring);
-            }
-        }
-
-        queryWrapper.in("wd_type_code", channelMapAceeptVo.getChannel()).and(originWdInfoQueryWrapper -> {
-            for (String s : addrCodeList) {
-                originWdInfoQueryWrapper.likeRight("addr_code", s).or();
-            }
-        });
-
-        //搜索字段
-        if (channelMapAceeptVo.getSearchText() != null && !channelMapAceeptVo.getSearchText() .trim().equals("")) {
-            queryWrapper.and(originWdInfoQueryWrapper -> {
-                originWdInfoQueryWrapper.like("wd_name", channelMapAceeptVo.getSearchText() );
-            });
-        }
-
-        //城市等级分类
-        if(channelMapAceeptVo.getCityTier() != null && channelMapAceeptVo.getCityTier().length > 0){
-            List<String> tierCode = new ArrayList<>();
-            for (String s : channelMapAceeptVo.getCityTier()) {
-                List<String> list = initMapUtil.getInitCityTierListMap(s);
-                if (list != null){
-                    tierCode.addAll(list);
-                }
-            }
-            queryWrapper.and(wdInfoQueryWrapper -> {
-                for (String s : tierCode) {
-                    wdInfoQueryWrapper.likeRight("addr_code", s).or();
-                }
-            });
-        }
-
-        //排序字段查询
-        if (channelMapAceeptVo.getOrderby() != null && !channelMapAceeptVo.getOrderby().trim().equals("")) {
-            PageHelper.orderBy(channelMapAceeptVo.getOrderby());
-        }
-
-    }*/
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelMapServiceImpl.java

@@ -777,6 +777,13 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             });
         }
 
+        //组织结构
+        if(channelMapAceeptVo.getOrganization() != null && !channelMapAceeptVo.getOrganization().equals("")){
+            queryWrapper.and(wdInfoQueryWrapper -> {
+                wdInfoQueryWrapper.eq("organization",channelMapAceeptVo.getOrganization());
+            });
+        }
+
 
         //地区过滤
         queryWrapper.and(wdInfoQueryWrapper -> {