liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-dictProvincesCode-childCompany' into 'master'

Browse Source 
修改方法，添加条件

See merge request eshop/biz_service_ebtp_project!3
This commit is contained in:
jlfuqj
2022-09-23 06:41:59 +00:00
parent 3dee1d86f9 7a1926d459
commit f74ec9743e
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java
View File

@ -1,6 +1,8 @@
package com.chinaunicom.mall.ebtp.project.dict.controller; 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.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode;
import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService; import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService;
@ -23,10 +25,10 @@ import java.util.List;
@Api(tags = "省份对应缩写字典表") @Api(tags = "省份对应缩写字典表")
@RequestMapping("/v1/dictprovincescode") @RequestMapping("/v1/dictprovincescode")
public class DictProvincesCodeController{ public class DictProvincesCodeController{
@Resource @Resource
private IDictProvincesCodeService idictProvincesCodeService; private IDictProvincesCodeService idictProvincesCodeService;
/** /**
* 插入新数据 * 插入新数据
* @param dictProvincesCode 省分代码实体 * @param dictProvincesCode 省分代码实体
@ -38,10 +40,10 @@ public class DictProvincesCodeController{
public BaseResponse<Boolean> insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid DictProvincesCode dictProvincesCode){ public BaseResponse<Boolean> insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid DictProvincesCode dictProvincesCode){
boolean save = idictProvincesCodeService.save(dictProvincesCode); boolean save = idictProvincesCodeService.save(dictProvincesCode);
return BaseResponse.success(save); return BaseResponse.success(save);
} }
/** /**
* 修改数据 * 修改数据
* @param dictProvincesCode 省分代码实体 * @param dictProvincesCode 省分代码实体
@ -54,7 +56,7 @@ public class DictProvincesCodeController{
return BaseResponse.success(idictProvincesCodeService.updateById(dictProvincesCode)); return BaseResponse.success(idictProvincesCodeService.updateById(dictProvincesCode));
} }
/** /**
* 查询数据 * 查询数据
* @param id 主键id * @param id 主键id
@ -63,9 +65,9 @@ public class DictProvincesCodeController{
@ApiOperation("查询数据") @ApiOperation("查询数据")
@GetMapping("/{id}") @GetMapping("/{id}")
public BaseResponse<DictProvincesCode> get(@ApiParam(value = "主键id", required = true) @PathVariable Integer id){ public BaseResponse<DictProvincesCode> get(@ApiParam(value = "主键id", required = true) @PathVariable Integer id){
DictProvincesCode dictProvincesCode = idictProvincesCodeService.getById(id); DictProvincesCode dictProvincesCode = idictProvincesCodeService.getById(id);
return BaseResponse.success(dictProvincesCode); return BaseResponse.success(dictProvincesCode);
} }
@ -85,12 +87,15 @@ public class DictProvincesCodeController{
/** /**
* 查询所有数据 * 查询所有数据
*
* @return 返回结果 * @return 返回结果
*/ */
@ApiOperation("查询所有数据") @ApiOperation("查询所有数据")
@GetMapping("queryAll") @GetMapping("queryAll")
public BaseResponse<List<DictProvincesCode>> queryAll(){ public BaseResponse<List<DictProvincesCode>> queryAll(@RequestParam(value = "childCompany", required = false) Boolean childCompany) {
return BaseResponse.success(idictProvincesCodeService.list()); LambdaQueryWrapper<DictProvincesCode> wrapper = Wrappers.lambdaQuery();
wrapper.eq(childCompany != null, DictProvincesCode::getChildCompany, childCompany);
return BaseResponse.success(idictProvincesCodeService.list(wrapper));
} }
} }

8
src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java
View File

@ -57,5 +57,13 @@ public class DictProvincesCode implements Serializable {
*/ */
@ApiModelProperty(value = "省份地市编码") @ApiModelProperty(value = "省份地市编码")
private String provinces; private String provinces;
;
/**
* 公司级别
*/
@ApiModelProperty(value = "公司级别")
private Integer childCompany;
} }