From 10e70120e879248e3dea1314f4372c70bdd283af Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Mon, 7 Dec 2020 17:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=A4=90=E5=8A=9F=E8=83=BD=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtCateringDaoController.java | 108 +++++++----- .../controller/FtConfigDaoController.java | 119 +++++++++++++ .../system/fantang/domain/FtCateringDao.java | 82 ++++++--- .../system/fantang/domain/FtConfigDao.java | 54 ++++++ .../fantang/mapper/FtCateringDaoMapper.java | 3 + .../service/IFtCateringDaoService.java | 5 +- .../impl/FtCateringDaoServiceImpl.java | 10 +- .../ruoyi/system/fantang/vo/FtCateringVo.java | 30 ++++ .../mapper/fantang/FtCateringDaoMapper.xml | 42 +++-- ruoyi-ui/src/views/fantang/catering/index.vue | 162 ++++++++++++++---- 10 files changed, 492 insertions(+), 123 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtConfigDao.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java index d9ca38f36..821f0a413 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java @@ -1,98 +1,118 @@ package com.ruoyi.system.fantang.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - -import java.util.List; -import java.util.Arrays; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.common.utils.StringUtils; -import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; 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.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtCateringDao; import com.ruoyi.system.fantang.service.IFtCateringDaoService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.system.fantang.service.IFtDepartDaoService; +import com.ruoyi.system.fantang.service.IFtPatientDaoService; +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.Date; +import java.util.List; /** * 配餐功能Controller - * + * * @author ft * @date 2020-12-07 */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController -@RequestMapping("/fantang/catering" ) +@RequestMapping("/fantang/catering") public class FtCateringDaoController extends BaseController { private final IFtCateringDaoService iFtCateringDaoService; + private final IFtDepartDaoService departDaoService; + + private final IFtPatientDaoService patientDaoService; + /** * 查询配餐功能列表 */ @PreAuthorize("@ss.hasPermi('fantang:catering:list')") @GetMapping("/list") - public TableDataInfo list(FtCateringDao ftCateringDao) - { + public TableDataInfo list(FtCateringDao ftCateringDao) { startPage(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftCateringDao); - if (ftCateringDao.getFlag() != null){ - lqw.eq(FtCateringDao::getFlag ,ftCateringDao.getFlag()); - } - List list = iFtCateringDaoService.list(lqw); +// LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftCateringDao); +// if (ftCateringDao.getFlag() != null) { +// lqw.eq(FtCateringDao::getFlag, ftCateringDao.getFlag()); +// } +// List list = iFtCateringDaoService.list(lqw); +// List listWithDepart = iFtCateringDaoService.list(lqw); +// for (FtCateringDao cateringDao : list) { +// FtPatientDao Patient = patientDaoService.getById(cateringDao.getPatientId()); +// Long departId = Patient.getDepartId(); +// String departName = departDaoService.getById(departId).getDepartName(); +// cateringDao.setDepartName(departName); +// cateringDao.setName(Patient.getName()); +// cateringDao.setBedId(Patient.getBedId()); +// listWithDepart.add(cateringDao); +// } + List list = iFtCateringDaoService.listNewFormatter(ftCateringDao); return getDataTable(list); } /** * 导出配餐功能列表 */ - @PreAuthorize("@ss.hasPermi('fantang:catering:export')" ) - @Log(title = "配餐功能" , businessType = BusinessType.EXPORT) - @GetMapping("/export" ) + @PreAuthorize("@ss.hasPermi('fantang:catering:export')") + @Log(title = "配餐功能", businessType = BusinessType.EXPORT) + @GetMapping("/export") public AjaxResult export(FtCateringDao ftCateringDao) { LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftCateringDao); List list = iFtCateringDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtCateringDao. class); - return util.exportExcel(list, "catering" ); + ExcelUtil util = new ExcelUtil(FtCateringDao.class); + return util.exportExcel(list, "catering"); } /** * 获取配餐功能详细信息 */ - @PreAuthorize("@ss.hasPermi('fantang:catering:query')" ) - @GetMapping(value = "/{id}" ) - public AjaxResult getInfo(@PathVariable("id" ) Long id) { + @PreAuthorize("@ss.hasPermi('fantang:catering:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(iFtCateringDaoService.getById(id)); } /** * 新增配餐功能 */ - @PreAuthorize("@ss.hasPermi('fantang:catering:add')" ) - @Log(title = "配餐功能" , businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('fantang:catering:add')") + @Log(title = "配餐功能", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtCateringDao ftCateringDao) { - return toAjax(iFtCateringDaoService.save(ftCateringDao) ? 1 : 0); + List types = ftCateringDao.getTypes(); + for (Integer type : types) { + FtCateringDao ftCatering = new FtCateringDao(); + ftCatering.setPatientId(ftCateringDao.getPatientId()); + ftCatering.setNumber(ftCateringDao.getNumber()); + ftCatering.setFrequency(ftCateringDao.getFrequency()); + ftCatering.setCateringUsage(ftCateringDao.getCateringUsage()); + ftCatering.setFlag(true); + ftCatering.setCreateAt(new Date()); + ftCatering.setType(type); + iFtCateringDaoService.save(ftCatering); + } + + return AjaxResult.success("新增成功"); } /** * 修改配餐功能 */ - @PreAuthorize("@ss.hasPermi('fantang:catering:edit')" ) - @Log(title = "配餐功能" , businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('fantang:catering:edit')") + @Log(title = "配餐功能", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody FtCateringDao ftCateringDao) { return toAjax(iFtCateringDaoService.updateById(ftCateringDao) ? 1 : 0); @@ -101,9 +121,9 @@ public class FtCateringDaoController extends BaseController { /** * 删除配餐功能 */ - @PreAuthorize("@ss.hasPermi('fantang:catering:remove')" ) - @Log(title = "配餐功能" , businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}" ) + @PreAuthorize("@ss.hasPermi('fantang:catering:remove')") + @Log(title = "配餐功能", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(iFtCateringDaoService.removeByIds(Arrays.asList(ids)) ? 1 : 0); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java new file mode 100644 index 000000000..2d8d92417 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java @@ -0,0 +1,119 @@ +package com.ruoyi.system.fantang.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +import java.util.List; +import java.util.Arrays; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.fantang.domain.FtConfigDao; +import com.ruoyi.system.fantang.service.IFtConfigDaoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 饭堂参数Controller + * + * @author ft + * @date 2020-12-07 + */ +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/fantang/fantangConfig" ) +public class FtConfigDaoController extends BaseController { + + private final IFtConfigDaoService iFtConfigDaoService; + + /** + * 查询饭堂参数列表 + */ + @PreAuthorize("@ss.hasPermi('fantang:fantangConfig:list')") + @GetMapping("/list") + public TableDataInfo list(FtConfigDao ftConfigDao) + { + startPage(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftConfigDao); + if (ftConfigDao.getCorpId() != null){ + lqw.eq(FtConfigDao::getCorpId ,ftConfigDao.getCorpId()); + } + if (StringUtils.isNotBlank(ftConfigDao.getConfigKey())){ + lqw.eq(FtConfigDao::getConfigKey ,ftConfigDao.getConfigKey()); + } + if (StringUtils.isNotBlank(ftConfigDao.getConfigValue())){ + lqw.eq(FtConfigDao::getConfigValue ,ftConfigDao.getConfigValue()); + } + if (ftConfigDao.getFlag() != null){ + lqw.eq(FtConfigDao::getFlag ,ftConfigDao.getFlag()); + } + List list = iFtConfigDaoService.list(lqw); + return getDataTable(list); + } + + /** + * 导出饭堂参数列表 + */ + @PreAuthorize("@ss.hasPermi('fantang:fantangConfig:export')" ) + @Log(title = "饭堂参数" , businessType = BusinessType.EXPORT) + @GetMapping("/export" ) + public AjaxResult export(FtConfigDao ftConfigDao) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftConfigDao); + List list = iFtConfigDaoService.list(lqw); + ExcelUtil util = new ExcelUtil(FtConfigDao. class); + return util.exportExcel(list, "fantangConfig" ); + } + + /** + * 获取饭堂参数详细信息 + */ + @PreAuthorize("@ss.hasPermi('fantang:fantangConfig:query')" ) + @GetMapping(value = "/{id}" ) + public AjaxResult getInfo(@PathVariable("id" ) Long id) { + return AjaxResult.success(iFtConfigDaoService.getById(id)); + } + + /** + * 新增饭堂参数 + */ + @PreAuthorize("@ss.hasPermi('fantang:fantangConfig:add')" ) + @Log(title = "饭堂参数" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody FtConfigDao ftConfigDao) { + return toAjax(iFtConfigDaoService.save(ftConfigDao) ? 1 : 0); + } + + /** + * 修改饭堂参数 + */ + @PreAuthorize("@ss.hasPermi('fantang:fantangConfig:edit')" ) + @Log(title = "饭堂参数" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody FtConfigDao ftConfigDao) { + return toAjax(iFtConfigDaoService.updateById(ftConfigDao) ? 1 : 0); + } + + /** + * 删除饭堂参数 + */ + @PreAuthorize("@ss.hasPermi('fantang:fantangConfig:remove')" ) + @Log(title = "饭堂参数" , businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}" ) + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(iFtConfigDaoService.removeByIds(Arrays.asList(ids)) ? 1 : 0); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtCateringDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtCateringDao.java index c0cd04a44..da63a034e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtCateringDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtCateringDao.java @@ -1,82 +1,108 @@ package com.ruoyi.system.fantang.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.system.fantang.vo.FtCateringVo; 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_catering - * + * * @author ft * @date 2020-12-07 */ @Data @ToString -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) @NoArgsConstructor @Accessors(chain = true) @TableName("ft_catering") -public class FtCateringDao implements Serializable { +public class FtCateringDao extends FtCateringVo { -private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; - /** id */ + /** + * id + */ @TableId(value = "id") private Long id; - /** 病人 id */ + /** + * 病人 id + */ private Long patientId; - /** 正餐类型 */ + /** + * 正餐类型 + */ @Excel(name = "正餐类型") private Integer type; - /** 配餐号 */ + /** + * 配餐号 + */ @Excel(name = "配餐号") private Long number; - /** 配餐频次 */ + /** + * 配餐频次 + */ @Excel(name = "配餐频次") private String frequency; - /** 用法 */ + /** + * 用法 + */ @Excel(name = "用法") - private Integer usage; + private Integer cateringUsage; - /** 是否代替正餐 */ + /** + * 是否代替正餐 + */ private Integer isReplace; - /** 作废标志 */ - private Integer flag; + /** + * 作废标志 + */ + private Boolean flag; - /** 更新日期 */ + /** + * 更新日期 + */ private Date updateAt; - /** 更新人 */ + /** + * 更新人 + */ @Excel(name = "更新人") private String updateBy; - /** 创建时间 */ - @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd") + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createAt; - /** 创建人 */ + /** + * 创建人 + */ private String createBy; - /** 描述 */ + /** + * 描述 + */ @Excel(name = "描述") - private String describe; + private String cateringDescribe; + + private String hospitalId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtConfigDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtConfigDao.java new file mode 100644 index 000000000..b9a50052e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtConfigDao.java @@ -0,0 +1,54 @@ +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_config + * + * @author ft + * @date 2020-12-07 + */ +@Data +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@Accessors(chain = true) +@TableName("ft_config") +public class FtConfigDao implements Serializable { + +private static final long serialVersionUID=1L; + + + /** $column.columnComment */ + @TableId(value = "id") + private Long id; + + /** $column.columnComment */ + @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()") + private Long corpId; + + /** $column.columnComment */ + @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()") + private String configKey; + + /** $column.columnComment */ + @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()") + private String configValue; + + /** $column.columnComment */ + @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()") + private Long flag; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtCateringDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtCateringDaoMapper.java index 2a2fc9dd7..d25f43827 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtCateringDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtCateringDaoMapper.java @@ -3,6 +3,8 @@ package com.ruoyi.system.fantang.mapper; import com.ruoyi.system.fantang.domain.FtCateringDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * 配餐功能Mapper接口 * @@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface FtCateringDaoMapper extends BaseMapper { + List listNewFormatter(FtCateringDao ftCateringDao); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtCateringDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtCateringDaoService.java index 864964de7..0a34689a3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtCateringDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtCateringDaoService.java @@ -1,7 +1,9 @@ package com.ruoyi.system.fantang.service; -import com.ruoyi.system.fantang.domain.FtCateringDao; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.system.fantang.domain.FtCateringDao; + +import java.util.List; /** * 配餐功能Service接口 @@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IFtCateringDaoService extends IService { + List listNewFormatter(FtCateringDao ftCateringDao); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtCateringDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtCateringDaoServiceImpl.java index 99b181da5..3b162dc45 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtCateringDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtCateringDaoServiceImpl.java @@ -1,10 +1,12 @@ 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.FtCateringDaoMapper; import com.ruoyi.system.fantang.domain.FtCateringDao; +import com.ruoyi.system.fantang.mapper.FtCateringDaoMapper; import com.ruoyi.system.fantang.service.IFtCateringDaoService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 配餐功能Service业务层处理 @@ -15,4 +17,8 @@ import com.ruoyi.system.fantang.service.IFtCateringDaoService; @Service public class FtCateringDaoServiceImpl extends ServiceImpl implements IFtCateringDaoService { + @Override + public List listNewFormatter(FtCateringDao ftCateringDao) { + return this.baseMapper.listNewFormatter(ftCateringDao); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java new file mode 100644 index 000000000..870f77fda --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java @@ -0,0 +1,30 @@ +package com.ruoyi.system.fantang.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FtCateringVo { + + @TableField(exist = false) + private String bedId; + + @TableField(exist = false) + private Long departId; + + @TableField(exist = false) + private List types; + + @TableField(exist = false) + private String departName; + + @TableField(exist = false) + private String name; + +} diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml index a32b815d7..669ddf84b 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml @@ -1,24 +1,32 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/ruoyi-ui/src/views/fantang/catering/index.vue b/ruoyi-ui/src/views/fantang/catering/index.vue index a90446e9e..22e3458f2 100644 --- a/ruoyi-ui/src/views/fantang/catering/index.vue +++ b/ruoyi-ui/src/views/fantang/catering/index.vue @@ -184,8 +184,8 @@ - - + +