diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java index 9b128d3..1e7d61a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java @@ -25,12 +25,21 @@ public class DictItemController { @Resource private IDictItemService dictItemService; + /** + * 根据字典编码获取所有选项 + */ + @ApiOperation(value = "根据字典编码获取所有选项") + @GetMapping("/{dicCode}") + public ResponseMessage listByPageCode(String dicCode) { + return dictItemService.listByPageCode(dicCode); + } + /** * 分页获取所有数据字典记录 */ @ApiOperation(value = "分页获取所有数据字典记录") @GetMapping("/page") - public ResponseMessage pageById(@Valid DictItemQueryVo dictItemQueryVo) { + public ResponseMessage pageByDicId(@Valid DictItemQueryVo dictItemQueryVo) { return dictItemService.pageById(dictItemQueryVo); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java index 7869751..bcddedf 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java @@ -136,6 +136,25 @@ public class DictItemServiceImpl extends ServiceImpl dicWrapper = new LambdaQueryWrapper<>(); + dicWrapper.eq(DictEntity::getDicCode, dicCode); + dicWrapper.eq(DictEntity::getDelFlag, 0); + DictEntity dictEntity = dictDao.selectOne(dicWrapper); + if (dictEntity == null) { + return Result.error("此字典编码不存在或已被删除"); + } + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(DictItemEntity::getDelFlag, 0); + wrapper.eq(DictItemEntity::getTypeId, dictEntity.getId()); + wrapper.orderByAsc(DictItemEntity::getItemOrder); + List list = list(wrapper); + List dictItemVos = BeanCopyUtils.copyBeanList(list, DictItemVo.class); + return Result.success(dictItemVos); + } } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictItemService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictItemService.java index 40327d6..201dea9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictItemService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictItemService.java @@ -42,4 +42,11 @@ public interface IDictItemService extends IService { * @return */ ResponseMessage add(DictItemVo dictItemVo); + + /** + * 根据字典编码获取所有选项 + * @param dicCode + * @return + */ + ResponseMessage listByPageCode(String dicCode); }