Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemberController.java

@@ -58,13 +58,15 @@ public class DemGridMemberController {
      * @param gridArea     网格区域
      * @param mapGridName    测绘院地图网格名称
      * @param gridGrade    网格等级(1、大网格 2、中网格 3、小网格)
+     * @param seniorGrid    上级网格
      * @return
      */
     @GetMapping("gridMemberScatter")
     public ApiResult<List<DemGridMember>> gridMemberScatter(@RequestParam(value = "gridArea",required = false) String gridArea,
                                                             @RequestParam(value = "mapGridName",required = false) String mapGridName,
-                                                         @RequestParam(value = "gridGrade",required = false) Integer gridGrade) {
-        return ApiResult.success(demGridMemberService.gridMemberScatter(gridArea, mapGridName, gridGrade));
+                                                            @RequestParam(value = "gridGrade",required = false) Integer gridGrade,
+                                                            @RequestParam(value = "seniorGrid",required = false) Integer seniorGrid) {
+        return ApiResult.success(demGridMemberService.gridMemberScatter(gridArea, mapGridName, gridGrade, seniorGrid));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemGridMemberService.java

@@ -20,7 +20,7 @@ public interface DemGridMemberService extends CrudService<DemGridMember> {
 
     CommonPage<DemGridMember> gridMemberList(String gridArea, String streetTown, String gridPersonnel, Integer id, Integer pageNum, Integer pageSize);
 
-    List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade);
+    List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade, Integer seniorGrid);
 
     List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id);
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemGridMemberServiceImpl.java

@@ -79,13 +79,14 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
     }
 
     @Override
-    public List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade){
+    public List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade, Integer seniorGrid){
         List<DemGridMember> list = new ArrayList<>();
         LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
                 .eq(StringUtils.isNotBlank(gridArea),DemGridMember::getGridArea, gridArea)
                 .eq(StringUtils.isNotBlank(mapGridName),DemGridMember::getMapGridName, mapGridName)
-                .eq(gridGrade != null,DemGridMember::getGridGrade, gridGrade);
+                .eq(gridGrade != null,DemGridMember::getGridGrade, gridGrade)
+                .eq(seniorGrid != null,DemGridMember::getId, seniorGrid);
         list = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list)) {
             List<Integer> gridMemberId = new ArrayList<>();