diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java index 22d62a4..e97bb79 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java @@ -1,6 +1,8 @@ package com.chinaunicom.mall.ebtp.project.dict.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService; @@ -23,10 +25,10 @@ import java.util.List; @Api(tags = "省份对应缩写字典表") @RequestMapping("/v1/dictprovincescode") public class DictProvincesCodeController{ - + @Resource private IDictProvincesCodeService idictProvincesCodeService; - + /** * 插入新数据 * @param dictProvincesCode 省分代码实体 @@ -38,10 +40,10 @@ public class DictProvincesCodeController{ public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid DictProvincesCode dictProvincesCode){ boolean save = idictProvincesCodeService.save(dictProvincesCode); - + return BaseResponse.success(save); } - + /** * 修改数据 * @param dictProvincesCode 省分代码实体 @@ -54,7 +56,7 @@ public class DictProvincesCodeController{ return BaseResponse.success(idictProvincesCodeService.updateById(dictProvincesCode)); } - + /** * 查询数据 * @param id 主键id @@ -63,9 +65,9 @@ public class DictProvincesCodeController{ @ApiOperation("查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Integer id){ - + DictProvincesCode dictProvincesCode = idictProvincesCodeService.getById(id); - + return BaseResponse.success(dictProvincesCode); } @@ -85,12 +87,15 @@ public class DictProvincesCodeController{ /** * 查询所有数据 + * * @return 返回结果 */ @ApiOperation("查询所有数据") @GetMapping("queryAll") - public BaseResponse> queryAll(){ - return BaseResponse.success(idictProvincesCodeService.list()); + public BaseResponse> queryAll(@RequestParam(value = "childCompany", required = false) Boolean childCompany) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(childCompany != null, DictProvincesCode::getChildCompany, childCompany); + return BaseResponse.success(idictProvincesCodeService.list(wrapper)); } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java index 082a369..214b8a6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java @@ -57,5 +57,13 @@ public class DictProvincesCode implements Serializable { */ @ApiModelProperty(value = "省份地市编码") private String provinces; +; + + + /** + * 公司级别 + */ + @ApiModelProperty(value = "公司级别") + private Integer childCompany; }