部门单位修改接口新增

This commit is contained in:
2023-10-25 16:54:20 +08:00
parent b6968824f0
commit 06822c414f
7 changed files with 94 additions and 19 deletions

View File

@@ -288,5 +288,25 @@ public class AreaController extends BaseController {
List<AreaTreeVO> result = areaService.areaSelect();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 获取指定区域父级的子级区域集合
* @author cdf
* @date 2023/10/25
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getPidAreaList")
@ApiOperation("获取指定区域父级的子级区域集合")
@ApiImplicitParams({
@ApiImplicitParam(name = "areaId",value = "区域id"),
@ApiImplicitParam(name = "type", value = "区域类型", required = true)
})
public HttpResult<List<Area>> getPidAreaList(@RequestParam("areaId")String areaId , @RequestParam("type") Integer type) {
String methodDescribe = getMethodDescribe("getPidAreaList");
List<Area> result = areaService.getPidAreaList(areaId,type);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

View File

@@ -104,12 +104,14 @@ public interface IAreaService extends IService<Area> {
* @return 行政区域详情
*/
Area selectAreaByName(String name);
/**
* @Description: areaSelect
* @Param: []
* @return: java.util.List<com.njcn.system.pojo.vo.AreaTreeVO>
/**
* @Description: areaSelect
* @Param: []
* @return: java.util.List<com.njcn.system.pojo.vo.AreaTreeVO>
* @Author: clam
* @Date: 2023/4/11
*/
* @Date: 2023/4/11
*/
List<AreaTreeVO> areaSelect();
List<Area> getPidAreaList(String areaId,Integer type);
}

View File

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -213,7 +214,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
area = areaPro(id, type);
}
return area;
}
}
@Override
public Area areaDeptPro(String id) {
@@ -295,4 +296,22 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
return collect;
}
@Override
public List<Area> getPidAreaList(String areaId, Integer type) {
List<Area> result = new ArrayList<>();
Area area = this.getById(areaId);
if(Objects.isNull(area)){
return result;
}
if(area.getPid().equals("-1")){
result.add(area);
}else {
LambdaQueryWrapper<Area> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Area::getPid,area.getPid())
.eq(Area::getState,DataStateEnum.ENABLE.getCode()).eq(Area::getType,type).orderByAsc(Area::getAreaCode);
result = this.list(lambdaQueryWrapper);
}
return result;
}
}