From 5a2a31c552a8389639c90510c626a696bd125deb Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Fri, 4 Dec 2020 15:43:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E9=A1=B5=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=A1=A5=E8=B4=B4=E5=8F=91=E6=94=BE=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E5=B1=82=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E9=99=84=E5=B8=A6?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 7 -- .../controller/FtFoodDemandDaoController.java | 42 +++++----- .../controller/FtStaffInfoDaoController.java | 6 ++ .../system/fantang/domain/FtStaffInfoDao.java | 8 +- .../fantang/mapper/FtStaffInfoDaoMapper.java | 5 ++ .../service/IFtStaffInfoDaoService.java | 4 + .../impl/FtStaffInfoDaoServiceImpl.java | 7 ++ .../system/fantang/vo/FtStaffInfoVo.java | 12 +++ .../src/views/fantang/foodDemand/index.vue | 84 +++++++++++++++---- ruoyi-ui/src/views/fantang/settle/index.vue | 13 ++- ruoyi-ui/src/views/fantang/subsidy/index.vue | 47 +++++++++-- ruoyi-ui/vue.config.js | 2 +- 12 files changed, 172 insertions(+), 65 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 4d3a41b1e..adda3d705 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -17,13 +17,6 @@ - - - org.springframework.boot - spring-boot-devtools - true - - io.springfox 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 455ed4bf7..c5af0953b 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 @@ -21,13 +21,13 @@ import java.util.List; /** * 病人报餐Controller - * + * * @author ft * @date 2020-12-03 */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController -@RequestMapping("/fantang/foodDemand" ) +@RequestMapping("/fantang/foodDemand") public class FtFoodDemandDaoController extends BaseController { private final IFtFoodDemandDaoService iFtFoodDemandDaoService; @@ -37,12 +37,11 @@ public class FtFoodDemandDaoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('fantang:foodDemand:list')") @GetMapping("/list") - public TableDataInfo list(FtFoodDemandDao ftFoodDemandDao) - { + public TableDataInfo list(FtFoodDemandDao ftFoodDemandDao) { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftFoodDemandDao); - if (ftFoodDemandDao.getFlag() != null){ - lqw.eq(FtFoodDemandDao::getFlag ,ftFoodDemandDao.getFlag()); + if (ftFoodDemandDao.getFlag() != null) { + lqw.eq(FtFoodDemandDao::getFlag, ftFoodDemandDao.getFlag()); } List list = iFtFoodDemandDaoService.list(lqw); return getDataTable(list); @@ -51,40 +50,41 @@ public class FtFoodDemandDaoController extends BaseController { /** * 导出病人报餐列表 */ - @PreAuthorize("@ss.hasPermi('fantang:foodDemand:export')" ) - @Log(title = "病人报餐" , businessType = BusinessType.EXPORT) - @GetMapping("/export" ) + @PreAuthorize("@ss.hasPermi('fantang:foodDemand:export')") + @Log(title = "病人报餐", businessType = BusinessType.EXPORT) + @GetMapping("/export") public AjaxResult export(FtFoodDemandDao ftFoodDemandDao) { LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftFoodDemandDao); List list = iFtFoodDemandDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtFoodDemandDao. class); - return util.exportExcel(list, "foodDemand" ); + ExcelUtil util = new ExcelUtil(FtFoodDemandDao.class); + return util.exportExcel(list, "foodDemand"); } /** * 获取病人报餐详细信息 */ - @PreAuthorize("@ss.hasPermi('fantang:foodDemand:query')" ) - @GetMapping(value = "/{id}" ) - public AjaxResult getInfo(@PathVariable("id" ) Long id) { + @PreAuthorize("@ss.hasPermi('fantang:foodDemand:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(iFtFoodDemandDaoService.getById(id)); } /** * 新增病人报餐 */ - @PreAuthorize("@ss.hasPermi('fantang:foodDemand:add')" ) - @Log(title = "病人报餐" , businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('fantang:foodDemand:add')") + @Log(title = "病人报餐", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtFoodDemandDao ftFoodDemandDao) { + ftFoodDemandDao.setFlag(true); return toAjax(iFtFoodDemandDaoService.save(ftFoodDemandDao) ? 1 : 0); } /** * 修改病人报餐 */ - @PreAuthorize("@ss.hasPermi('fantang:foodDemand:edit')" ) - @Log(title = "病人报餐" , businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('fantang:foodDemand:edit')") + @Log(title = "病人报餐", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody FtFoodDemandDao ftFoodDemandDao) { ftFoodDemandDao.setUpdateAt(new Date()); @@ -94,9 +94,9 @@ public class FtFoodDemandDaoController extends BaseController { /** * 删除病人报餐 */ - @PreAuthorize("@ss.hasPermi('fantang:foodDemand:remove')" ) - @Log(title = "病人报餐" , businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}" ) + @PreAuthorize("@ss.hasPermi('fantang:foodDemand:remove')") + @Log(title = "病人报餐", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(iFtFoodDemandDaoService.removeByIds(Arrays.asList(ids)) ? 1 : 0); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java index 4584c34c2..7fb2851c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java @@ -57,6 +57,12 @@ public class FtStaffInfoDaoController extends BaseController { return getDataTable(list); } + @GetMapping("/staffListWithDepart") + public AjaxResult staffListWithDepart() { + + return AjaxResult.success(null); + } + /** * 查询护工管理列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java index 99cb7c665..f598a5855 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java @@ -1,16 +1,16 @@ package com.ruoyi.system.fantang.domain; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.system.fantang.vo.FtStaffInfoVo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.Accessors; + import java.math.BigDecimal; import java.util.Date; @@ -22,11 +22,11 @@ import java.util.Date; */ @Data @ToString -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) @NoArgsConstructor @Accessors(chain = true) @TableName("ft_staff_info") -public class FtStaffInfoDao { +public class FtStaffInfoDao extends FtStaffInfoVo { private static final long serialVersionUID = 1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java index b21637c2b..f9fb108cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java @@ -2,6 +2,9 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtStaffInfoDao; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 员工管理Mapper接口 @@ -11,4 +14,6 @@ import com.ruoyi.system.fantang.domain.FtStaffInfoDao; */ public interface FtStaffInfoDaoMapper extends BaseMapper { + @Select("") + List selectStaffInfoWithDepart(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java index c8a6174bd..f2b47f49a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java @@ -3,6 +3,8 @@ package com.ruoyi.system.fantang.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtStaffInfoDao; +import java.util.List; + /** * 员工管理Service接口 * @@ -11,4 +13,6 @@ import com.ruoyi.system.fantang.domain.FtStaffInfoDao; */ public interface IFtStaffInfoDaoService extends IService { + List selectStaffInfoWithDepart(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java index ed334de7d..a86bd22f4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java @@ -6,6 +6,8 @@ import com.ruoyi.system.fantang.mapper.FtStaffInfoDaoMapper; import com.ruoyi.system.fantang.service.IFtStaffInfoDaoService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 员工管理Service业务层处理 * @@ -15,4 +17,9 @@ import org.springframework.stereotype.Service; @Service public class FtStaffInfoDaoServiceImpl extends ServiceImpl implements IFtStaffInfoDaoService { + @Override + public List selectStaffInfoWithDepart() { + + return this.baseMapper.selectStaffInfoWithDepart(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java new file mode 100644 index 000000000..e4ebe7be9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java @@ -0,0 +1,12 @@ +package com.ruoyi.system.fantang.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FtStaffInfoVo { + private String departName; +} diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue index 3c6b6619b..922d7911b 100644 --- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue +++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue @@ -84,23 +84,23 @@ - + - + - + - - - - - - - - + + + + + + + +