From ce92663f2c4412d8fca1929ec5b1ce6dbc4dbccc Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Mon, 7 Dec 2020 14:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AF=E7=97=85?= =?UTF-8?q?=E6=82=A3=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=90=8E=E7=AB=AF=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtFoodDemandDaoController.java | 6 ++---- .../system/fantang/domain/FtFoodDemandDao.java | 3 ++- .../ruoyi/system/fantang/entity/BasePatient.java | 15 +++++++++++++++ .../fantang/mapper/FtFoodDemandDaoMapper.java | 3 +++ .../fantang/service/IFtFoodDemandDaoService.java | 4 ++++ .../service/impl/FtFoodDemandDaoServiceImpl.java | 6 ++++++ .../mapper/fantang/FtFoodDemandDaoMapper.xml | 6 +++++- ruoyi-ui/src/views/fantang/foodDemand/index.vue | 2 +- 8 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java 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 c5af0953b..242aa81ce 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 @@ -40,10 +40,8 @@ public class FtFoodDemandDaoController extends BaseController { public TableDataInfo list(FtFoodDemandDao ftFoodDemandDao) { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftFoodDemandDao); - if (ftFoodDemandDao.getFlag() != null) { - lqw.eq(FtFoodDemandDao::getFlag, ftFoodDemandDao.getFlag()); - } - List list = iFtFoodDemandDaoService.list(lqw); +// List list = iFtFoodDemandDaoService.list(lqw); + List list = iFtFoodDemandDaoService.listNewFormatter(ftFoodDemandDao); return getDataTable(list); } 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 bf56e3372..e459f24e1 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 @@ -4,6 +4,7 @@ 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.entity.BasePatient; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -25,7 +26,7 @@ import java.util.Date; @NoArgsConstructor @Accessors(chain = true) @TableName("ft_food_demand") -public class FtFoodDemandDao implements Serializable { +public class FtFoodDemandDao extends BasePatient implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java new file mode 100644 index 000000000..3f765205a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java @@ -0,0 +1,15 @@ +package com.ruoyi.system.fantang.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BasePatient { + public String hospitalId; + public String bedId; + public String name; + public String departName; +} 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 7f9769061..dd9d52631 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,5 +1,6 @@ package com.ruoyi.system.fantang.mapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import org.apache.ibatis.annotations.Insert; @@ -20,4 +21,6 @@ public interface FtFoodDemandDaoMapper extends BaseMapper { @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(); + + List listNewFormatter(FtFoodDemandDao ftFoodDemandDao); } 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 0e48aee4c..0ceec0a8c 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 @@ -1,8 +1,11 @@ package com.ruoyi.system.fantang.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * 病人报餐Service接口 * @@ -14,4 +17,5 @@ public interface IFtFoodDemandDaoService extends IService { public Integer GenerateOrderForNewPatient() ; + List listNewFormatter(FtFoodDemandDao ftFoodDemandDao); } 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 7226cf359..93630c556 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,5 +1,6 @@ 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; @@ -32,4 +33,9 @@ public class FtFoodDemandDaoServiceImpl extends ServiceImpl listNewFormatter(FtFoodDemandDao ftFoodDemandDao) { + return this.baseMapper.listNewFormatter(ftFoodDemandDao); + } } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml index a1476df64..ad95b99e4 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml @@ -22,5 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + \ 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 89f914de9..56c53d56f 100644 --- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue +++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue @@ -65,7 +65,7 @@ size="mini" @click="handleAdd" v-hasPermi="['fantang:foodDemand:add']" - >自动生成 + >导入新入院配置数据