diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java index ab1f173c7..66219a906 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java @@ -64,7 +64,8 @@ public class FtFoodDemandDaoController extends BaseController { @PreAuthorize("@ss.hasPermi('fantang:foodDemand:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(iFtFoodDemandDaoService.getById(id)); + FtFoodDemandDao ftFoodDemandDao = iFtFoodDemandDaoService.getByIdNewFormatter(id); + return AjaxResult.success(ftFoodDemandDao); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java index dd9d52631..b6dd8f646 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java @@ -23,4 +23,6 @@ public interface FtFoodDemandDaoMapper extends BaseMapper { public List getNewPatientNotDemand(); List listNewFormatter(FtFoodDemandDao ftFoodDemandDao); + + FtFoodDemandDao getByIdNewFormatter(Long id); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java index 0ceec0a8c..7f32a640e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java @@ -18,4 +18,6 @@ public interface IFtFoodDemandDaoService extends IService { public Integer GenerateOrderForNewPatient() ; List listNewFormatter(FtFoodDemandDao ftFoodDemandDao); + + FtFoodDemandDao getByIdNewFormatter(Long id); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java index 93630c556..db318bcfd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.system.fantang.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.mapper.FtFoodDemandDaoMapper; @@ -38,4 +37,9 @@ public class FtFoodDemandDaoServiceImpl extends ServiceImpl listNewFormatter(FtFoodDemandDao ftFoodDemandDao) { return this.baseMapper.listNewFormatter(ftFoodDemandDao); } + + @Override + public FtFoodDemandDao getByIdNewFormatter(Long id) { + return this.baseMapper.getByIdNewFormatter(id); + } } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml index 04df73907..da3767b6b 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml @@ -31,4 +31,10 @@ and b.hospital_id = #{hospitalId} and a.flag = #{flag} + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue index 89becf4fa..a69ab4a46 100644 --- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue +++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue @@ -260,7 +260,6 @@ export default { this.updateFromOptions = response.data; }); listDepart().then(response => { - console.log(response); this.departOptions = response.rows; }) },