Merge branch 'dev-lb' into 'main'

Dev lb

See merge request !15

ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java

@@ -47,4 +47,6 @@ public interface GridRegionMapper {
     Integer countByParams(GridRegionSearchParam param);
 
     List<GridRegion> getSecondOrThirdRegion(@Param("wgType")String wgType, @Param("wgCodeLikes")List<String> wgCodeLikes, @Param("name")String name, @Param("level")String level);
+
+    String getWgTypeByWgCode(@Param("wgCode")String wgCode);
 }
\ No newline at end of file

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionService.java

@@ -38,4 +38,5 @@ public interface GridRegionService extends BaseService<GridRegion, GridRegionExa
      */
     List<GridRegion> getByParams(GridRegionSearchParam searchParam);
 
+    List<GridRegion> getGridRegionMapByWgType(String wgType);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/impl/GridCompanyServiceImpl.java

@@ -20,6 +20,7 @@ import com.ruoyi.system.domain.visit.enums.VisitTypeEnum;
 import com.ruoyi.system.domain.visit.ext.VisitFreeInterviewExt;
 import com.ruoyi.system.listener.MyBaseService;
 import com.ruoyi.system.mapper.grid.GridCompanyMapper;
+import com.ruoyi.system.mapper.grid.GridRegionMapper;
 import com.ruoyi.system.service.BaseServiceImpl;
 import com.ruoyi.system.service.grid.*;
 import com.ruoyi.system.service.other.BsCommonService;
@@ -76,6 +77,8 @@ public class GridCompanyServiceImpl extends BaseServiceImpl<GridCompanyMapper, G
     private VisitFreeInterviewService visitFreeInterviewService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private GridRegionMapper gridRegionMapper;
 
     @Override
     public PageInfo page(GridCompany wsCompany, String value) {
@@ -383,7 +386,8 @@ public class GridCompanyServiceImpl extends BaseServiceImpl<GridCompanyMapper, G
     @Override
     public GridCompanyExt selectGridCompanyExt(GridCompanyExt wsCompanyExt) {
 
-        Map<String, String> wgxxbMap = gridRegionService.getGridRegionMap().stream().collect(Collectors.toMap(GridRegion::getWgCode, GridRegion::getWgName));
+        String wgType = gridRegionMapper.getWgTypeByWgCode(wsCompanyExt.getWgCode());
+        Map<String, String> wgxxbMap = gridRegionService.getGridRegionMapByWgType(wgType).stream().collect(Collectors.toMap(GridRegion::getWgCode, GridRegion::getWgName));
         Map<String, String> commonMap = bsCommonService.getBsCommonMap().stream().collect(Collectors.toMap(BsCommon::getCode, BsCommon::getName));
 
         this.dealGridCompanyExt(wgxxbMap, commonMap, wsCompanyExt);

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/impl/GridRegionServiceImpl.java

@@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,10 +71,10 @@ public class GridRegionServiceImpl extends BaseServiceImpl<GridRegionMapper, Gri
 
     @Override
     public List<GridRegion> getGridRegionMap() {
+        List<GridRegion> res = new ArrayList<GridRegion>();
         GridRegionExample ex = new GridRegionExample();
         GridRegionExample.Criteria ca = ex.createCriteria();
         ca.andIsValidEqualTo("1");
-//        ca.andWgTypeEqualTo("1");
         ca.andWgTypeEqualTo("1");
         return gridRegionService.selectByExample(ex);
     }
@@ -166,4 +167,13 @@ public class GridRegionServiceImpl extends BaseServiceImpl<GridRegionMapper, Gri
         return gridRegionMapper.getByParams(searchParam);
     }
 
+    @Override
+    public List<GridRegion> getGridRegionMapByWgType(String wgType) {
+        GridRegionExample ex = new GridRegionExample();
+        GridRegionExample.Criteria ca = ex.createCriteria();
+        ca.andIsValidEqualTo("1");
+        ca.andWgTypeEqualTo(wgType);
+        return gridRegionService.selectByExample(ex);
+    }
+
 }

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -638,4 +638,8 @@
       </if>
       and level = #{level}
     </select>
+  <select id="getWgTypeByWgCode" resultType="java.lang.String">
+    select wg_type from grid_region
+    where wg_code = #{wgCode}
+  </select>
 </mapper>
\ No newline at end of file