From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期三, 11 六月 2025 10:36:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java index 2bfc351..6c65a0b 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.beust.jcommander.internal.Lists; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -10,9 +11,9 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.mdc.dto.OptionsDto; import org.jeecg.modules.mdc.entity.MdcDowntimeReason; import org.jeecg.modules.mdc.service.IMdcDowntimeReasonService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -166,4 +167,24 @@ return Result.OK(result); } + /** + * 鍋滄満鍘熷洜涓嬫媺閫夋嫨 + * + * @return + */ + @AutoLog(value = "鍋滄満鍘熷洜琛�-鍋滄満鍘熷洜涓嬫媺閫夋嫨") + @ApiOperation(value = "鍋滄満鍘熷洜琛�-鍋滄満鍘熷洜涓嬫媺閫夋嫨", notes = "鍋滄満鍘熷洜琛�-鍋滄満鍘熷洜涓嬫媺閫夋嫨") + @GetMapping(value = "/reasonList") + public Result<List<OptionsDto>> reasonList() { + List<MdcDowntimeReason> result = mdcDowntimeReasonService.list(); + List<OptionsDto> list = Lists.newArrayList(); + result.forEach(mdcDowntimeReason -> { + OptionsDto optionsDto = new OptionsDto(); + optionsDto.setValue(mdcDowntimeReason.getId()); + optionsDto.setLabel(mdcDowntimeReason.getDowntimeDescription()); + list.add(optionsDto); + }); + return Result.OK(list); + } + } -- Gitblit v1.9.3