Merge branch 'dev' into 'main'

Dev

See merge request !201

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -961,4 +961,10 @@ public class RegionController extends BaseController {
         return AjaxResult.success(gridRegionMapper.updateRegionJzArea(gridRegionDetail.getId(),gridRegionDetail.getJzArea()));
     }
 
+    @RequestMapping(value = "/getFourRegionList", method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult getFourRegionList(@RequestParam("wgCode") String wgCode) {
+        return AjaxResult.success(gridRegionMapper.getFourRegionList(wgCode));
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.ruoyi.system.domain.grid.GridRegion;
 import com.ruoyi.system.domain.grid.GridRegionExample;
 import com.ruoyi.system.domain.grid.enums.GridRegionSearchParam;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -75,4 +76,6 @@ public interface GridRegionMapper {
     int updateRegionJzArea(@Param("id")String id,@Param("jzArea")String jzArea);
 
     String getJzAreaByCode(@Param("code")String code);
+
+    List<GridRegion> getFourRegionList(@RequestParam("wgCode") String wgCode);
 }
\ No newline at end of file

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

@@ -1281,13 +1281,14 @@ public class GridRegionFacadeService {
                 List<GridTreeNode> threeNodes = new ArrayList<>();
                 for(GridRegion gridRegion : threeLevelNode){
                     GridTreeNode treeNode = convertNodeToTree(gridRegion);
-                    List<GridRegion> fourLevelNode = gridRegionMapper.getAllLevelFourByType(type,treeNode.getCode());
-                    List<GridTreeNode> fourNodes = new ArrayList<>();
-                    for(GridRegion gridFourRegion : fourLevelNode){
-                        GridTreeNode treeFourNode = convertNodeToTree(gridFourRegion);
-                        fourNodes.add(treeFourNode);
-                    }
-                    treeNode.setChild(fourNodes);
+//                    //四级
+//                    List<GridRegion> fourLevelNode = gridRegionMapper.getAllLevelFourByType(type,treeNode.getCode());
+//                    List<GridTreeNode> fourNodes = new ArrayList<>();
+//                    for(GridRegion gridFourRegion : fourLevelNode){
+//                        GridTreeNode treeFourNode = convertNodeToTree(gridFourRegion);
+//                        fourNodes.add(treeFourNode);
+//                    }
+//                    treeNode.setChild(fourNodes);
                     threeNodes.add(treeNode);
                 }
                 gridTreeNode1.setChild(threeNodes);

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

@@ -722,7 +722,7 @@
       where wg_code = #{code}
     </select>
 
-    <update id="changeTreeNodeName">
+  <update id="changeTreeNodeName">
     update grid_region set wg_name=#{name} where id = #{id}
   </update>
     <update id="changeTreeNodeNameByCode">
@@ -735,4 +735,12 @@
     update grid_region set jz_area=#{jzArea} where wg_code = #{id}
   </update>
 
+  <select id="getFourRegionList" resultType="com.ruoyi.system.domain.grid.GridRegion">
+    select
+    <include refid="Base_Column_List" />
+    from grid_region where is_valid = '1'
+    and wg_parent_id = #{wgCode}
+  </select>
+
+
 </mapper>
\ No newline at end of file