From 6d342a00ca2e63e72f2c7384c251b34cdd2943be Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Thu, 3 Dec 2020 14:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E4=BA=BA=E9=85=8D?= =?UTF-8?q?=E9=A4=90=E8=AE=BE=E7=BD=AE=E7=AE=A1=E7=90=86=EF=BC=8C=E7=97=85?= =?UTF-8?q?=E4=BA=BA=E8=90=A5=E5=85=BB=E9=85=8D=E9=A4=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtFoodDemandDaoController.java | 12 +- .../FtNutritionFoodDaoController.java | 119 +++++++ .../fantang/domain/FtFoodDemandDao.java | 40 ++- .../fantang/domain/FtNutritionFoodDao.java | 56 ++++ .../fantang/mapper/FtFoodDemandDaoMapper.java | 6 +- .../mapper/FtNutritionFoodDaoMapper.java | 14 + .../service/IFtFoodDemandDaoService.java | 3 +- .../service/IFtNutritionFoodDaoService.java | 14 + .../impl/FtFoodDemandDaoServiceImpl.java | 6 +- .../impl/FtNutritionFoodDaoServiceImpl.java | 18 + .../mapper/fantang/FtFoodDemandDaoMapper.xml | 8 +- .../fantang/FtNutritionFoodDaoMapper.xml | 17 + ruoyi-ui/src/api/fantang/nutritionFood.js | 62 ++++ .../src/views/fantang/foodDemand/index.vue | 111 +++---- .../src/views/fantang/nutritionFood/index.vue | 312 ++++++++++++++++++ 15 files changed, 700 insertions(+), 98 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtNutritionFoodDaoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtNutritionFoodDaoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtNutritionFoodDaoServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/fantang/FtNutritionFoodDaoMapper.xml create mode 100644 ruoyi-ui/src/api/fantang/nutritionFood.js create mode 100644 ruoyi-ui/src/views/fantang/nutritionFood/index.vue 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 783f4da88..ffd055f1e 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 @@ -31,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 病人报餐Controller * * @author ft - * @date 2020-11-26 + * @date 2020-12-03 */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @@ -49,14 +49,8 @@ public class FtFoodDemandDaoController extends BaseController { { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftFoodDemandDao); - if (ftFoodDemandDao.getType() != null){ - lqw.eq(FtFoodDemandDao::getType ,ftFoodDemandDao.getType()); - } - if (ftFoodDemandDao.getUpdateAt() != null){ - lqw.eq(FtFoodDemandDao::getUpdateAt ,ftFoodDemandDao.getUpdateAt()); - } - if (ftFoodDemandDao.getUpdateFrom() != null){ - lqw.eq(FtFoodDemandDao::getUpdateFrom ,ftFoodDemandDao.getUpdateFrom()); + if (ftFoodDemandDao.getFlag() != null){ + lqw.eq(FtFoodDemandDao::getFlag ,ftFoodDemandDao.getFlag()); } List list = iFtFoodDemandDaoService.list(lqw); return getDataTable(list); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java new file mode 100644 index 000000000..9396d7c48 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java @@ -0,0 +1,119 @@ +package com.ruoyi.system.fantang.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.fantang.domain.FtNutritionFoodDao; +import com.ruoyi.system.fantang.service.IFtNutritionFoodDaoService; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + +/** + * 病患营养配餐Controller + * + * @author ft + * @date 2020-12-03 + */ +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/fantang/nutritionFood") +public class FtNutritionFoodDaoController extends BaseController { + + private final IFtNutritionFoodDaoService iFtNutritionFoodDaoService; + + /** + * 查询病患营养配餐列表 + */ + @PreAuthorize("@ss.hasPermi('fantang:nutritionFood:list')") + @GetMapping("/list") + public TableDataInfo list(FtNutritionFoodDao ftNutritionFoodDao) { + startPage(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftNutritionFoodDao); + if (StringUtils.isNotBlank(ftNutritionFoodDao.getName())) { + lqw.like(FtNutritionFoodDao::getName, ftNutritionFoodDao.getName()); + } + if (ftNutritionFoodDao.getPrice() != null) { + lqw.eq(FtNutritionFoodDao::getPrice, ftNutritionFoodDao.getPrice()); + } + if (ftNutritionFoodDao.getFlag() != null) { + lqw.eq(FtNutritionFoodDao::getFlag, ftNutritionFoodDao.getFlag()); + } + List list = iFtNutritionFoodDaoService.list(lqw); + return getDataTable(list); + } + + /** + * 导出病患营养配餐列表 + */ + @PreAuthorize("@ss.hasPermi('fantang:nutritionFood:export')") + @Log(title = "病患营养配餐", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(FtNutritionFoodDao ftNutritionFoodDao) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftNutritionFoodDao); + List list = iFtNutritionFoodDaoService.list(lqw); + ExcelUtil util = new ExcelUtil(FtNutritionFoodDao.class); + return util.exportExcel(list, "nutritionFood"); + } + + /** + * 获取病患营养配餐详细信息 + */ + @PreAuthorize("@ss.hasPermi('fantang:nutritionFood:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(iFtNutritionFoodDaoService.getById(id)); + } + + /** + * 新增病患营养配餐 + */ + @PreAuthorize("@ss.hasPermi('fantang:nutritionFood:add')") + @Log(title = "病患营养配餐", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody FtNutritionFoodDao ftNutritionFoodDao) { + ftNutritionFoodDao.setFlag(1); + return toAjax(iFtNutritionFoodDaoService.save(ftNutritionFoodDao) ? 1 : 0); + } + + /** + * 修改病患营养配餐 + */ + @PreAuthorize("@ss.hasPermi('fantang:nutritionFood:edit')") + @Log(title = "病患营养配餐", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody FtNutritionFoodDao ftNutritionFoodDao) { + return toAjax(iFtNutritionFoodDaoService.updateById(ftNutritionFoodDao) ? 1 : 0); + } + + /** + * 停用病患营养配餐 + */ + @PutMapping("/deactivate/{id}") + public AjaxResult deactivate(@PathVariable("id") Long id) { + FtNutritionFoodDao ftNutritionFoodDao = iFtNutritionFoodDaoService.getById(id); + ftNutritionFoodDao.setFlag(0); + iFtNutritionFoodDaoService.updateById(ftNutritionFoodDao); + return AjaxResult.success("停用成功"); + } + + /** + * 删除病患营养配餐 + */ + @PreAuthorize("@ss.hasPermi('fantang:nutritionFood:remove')") + @Log(title = "病患营养配餐", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(iFtNutritionFoodDaoService.removeByIds(Arrays.asList(ids)) ? 1 : 0); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java index 9a13a0167..50c9a84e9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java @@ -19,7 +19,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * 病人报餐对象 ft_food_demand * * @author ft - * @date 2020-11-26 + * @date 2020-12-03 */ @Data @ToString @@ -39,11 +39,12 @@ private static final long serialVersionUID=1L; /** 病人id */ private Long patientId; - /** 订单详情 */ + /** 正餐清单 */ + @Excel(name = "正餐清单") private String foods; - /** 用餐类型 */ - @Excel(name = "用餐类型") + /** 正餐类型 */ + @Excel(name = "正餐类型") private Long type; /** 创建时间 */ @@ -52,22 +53,37 @@ private static final long serialVersionUID=1L; /** 创建人 */ private Long createBy; - /** 总价 */ - @Excel(name = "总价") - private BigDecimal price; - - /** 有效期 */ - private Long term; - /** 更新日期 */ @Excel(name = "更新日期" , width = 30, dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateAt; + /** 加菜 */ + @Excel(name = "加菜") + private Integer vegetables; + /** 更新操作人 id */ private Long updateBy; + /** 加肉 */ + @Excel(name = "加肉") + private Integer meat; + /** 更新来源 */ - @Excel(name = "更新来源") private Integer updateFrom; + + /** 加饭 */ + @Excel(name = "加饭") + private Integer rice; + + /** 加蛋 */ + @Excel(name = "加蛋") + private Integer egg; + + /** 订单详情 */ + private String orderInfo; + + /** 启用状态 */ + @Excel(name = "启用状态") + private Integer flag; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java new file mode 100644 index 000000000..dbf360212 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java @@ -0,0 +1,56 @@ +package com.ruoyi.system.fantang.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 病患营养配餐对象 ft_nutrition_food + * + * @author ft + * @date 2020-12-03 + */ +@Data +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@Accessors(chain = true) +@TableName("ft_nutrition_food") +public class FtNutritionFoodDao implements Serializable { + +private static final long serialVersionUID=1L; + + + /** id */ + @TableId(value = "id") + private Long id; + + /** 营养餐名称 */ + @Excel(name = "营养餐名称") + private String name; + + /** 价格 */ + @Excel(name = "价格") + private BigDecimal price; + + /** 启用标志 */ + @Excel(name = "启用标志") + private Integer flag; + + /** 创建日期 */ + private Date createAt; + + /** 创建人 */ + private String createBy; +} 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 cff14af12..4b2f6e17d 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 @@ -1,7 +1,7 @@ package com.ruoyi.system.fantang.mapper; -import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -12,11 +12,11 @@ import java.util.List; * 病人报餐Mapper接口 * * @author ft - * @date 2020-11-26 + * @date 2020-12-03 */ public interface FtFoodDemandDaoMapper extends BaseMapper { @Insert("insert into ft_food_demand (patient_id, foods, type, price) select #{patient_id}, food_list, type, price FROM ft_food_default") - public Integer GenerateOrderByPatientId(@Param("patient_id") Long patientId) ; + public Integer GenerateOrderByPatientId(@Param("patient_id") Long patientId); @Select("select a.patient_id from ft_patient a where a.patient_id not in (select patient_id from ft_food_demand c )") public List getNewPatientNotDemand(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtNutritionFoodDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtNutritionFoodDaoMapper.java new file mode 100644 index 000000000..fcd628d78 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtNutritionFoodDaoMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.system.fantang.mapper; + +import com.ruoyi.system.fantang.domain.FtNutritionFoodDao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 病患营养配餐Mapper接口 + * + * @author ft + * @date 2020-12-03 + */ +public interface FtNutritionFoodDaoMapper extends BaseMapper { + +} 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 9269c2c7a..0e48aee4c 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 @@ -7,12 +7,11 @@ import com.baomidou.mybatisplus.extension.service.IService; * 病人报餐Service接口 * * @author ft - * @date 2020-11-26 + * @date 2020-12-03 */ public interface IFtFoodDemandDaoService extends IService { public Integer GenerateOrderByPatientId(Long patientId); public Integer GenerateOrderForNewPatient() ; - } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtNutritionFoodDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtNutritionFoodDaoService.java new file mode 100644 index 000000000..4f4fcb116 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtNutritionFoodDaoService.java @@ -0,0 +1,14 @@ +package com.ruoyi.system.fantang.service; + +import com.ruoyi.system.fantang.domain.FtNutritionFoodDao; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 病患营养配餐Service接口 + * + * @author ft + * @date 2020-12-03 + */ +public interface IFtNutritionFoodDaoService extends IService { + +} 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 5b6faacaf..7226cf359 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,10 +1,10 @@ package com.ruoyi.system.fantang.service.impl; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.system.fantang.mapper.FtFoodDemandDaoMapper; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; +import com.ruoyi.system.fantang.mapper.FtFoodDemandDaoMapper; import com.ruoyi.system.fantang.service.IFtFoodDemandDaoService; +import org.springframework.stereotype.Service; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; * 病人报餐Service业务层处理 * * @author ft - * @date 2020-11-26 + * @date 2020-12-03 */ @Service public class FtFoodDemandDaoServiceImpl extends ServiceImpl implements IFtFoodDemandDaoService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtNutritionFoodDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtNutritionFoodDaoServiceImpl.java new file mode 100644 index 000000000..cd1458103 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtNutritionFoodDaoServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.system.fantang.service.impl; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.fantang.mapper.FtNutritionFoodDaoMapper; +import com.ruoyi.system.fantang.domain.FtNutritionFoodDao; +import com.ruoyi.system.fantang.service.IFtNutritionFoodDaoService; + +/** + * 病患营养配餐Service业务层处理 + * + * @author ft + * @date 2020-12-03 + */ +@Service +public class FtNutritionFoodDaoServiceImpl extends ServiceImpl implements IFtNutritionFoodDaoService { + +} diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml index e511c40f8..a1476df64 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml @@ -11,11 +11,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + + + + + diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtNutritionFoodDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtNutritionFoodDaoMapper.xml new file mode 100644 index 000000000..a70f57135 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtNutritionFoodDaoMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/fantang/nutritionFood.js b/ruoyi-ui/src/api/fantang/nutritionFood.js new file mode 100644 index 000000000..65859a0d7 --- /dev/null +++ b/ruoyi-ui/src/api/fantang/nutritionFood.js @@ -0,0 +1,62 @@ +import request from '@/utils/request' + +// 查询病患营养配餐列表 +export function listNutritionFood(query) { + return request({ + url: '/fantang/nutritionFood/list', + method: 'get', + params: query + }) +} + +// 查询病患营养配餐详细 +export function getNutritionFood(id) { + return request({ + url: '/fantang/nutritionFood/' + id, + method: 'get' + }) +} + +// 新增病患营养配餐 +export function addNutritionFood(data) { + return request({ + url: '/fantang/nutritionFood', + method: 'post', + data: data + }) +} + +// 修改病患营养配餐 +export function updateNutritionFood(data) { + return request({ + url: '/fantang/nutritionFood', + method: 'put', + data: data + }) +} + +// 停用病患营养配餐 +export function deactivate(id) { + return request({ + url: '/fantang/nutritionFood/deactivate/' + id, + method: 'put', + params: id + }) +} + +// 删除病患营养配餐 +export function delNutritionFood(id) { + return request({ + url: '/fantang/nutritionFood/' + id, + method: 'delete' + }) +} + +// 导出病患营养配餐 +export function exportNutritionFood(query) { + return request({ + url: '/fantang/nutritionFood/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue index acf6599b9..63f7af90a 100644 --- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue +++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue @@ -1,33 +1,14 @@