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 40ef92890..b485cb3f3 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 @@ -190,17 +190,12 @@ public class FtCateringDaoController extends BaseController { @PutMapping("/paste") public AjaxResult paste(@RequestBody JSONObject params) { - System.out.println(params); - List ids = params.getJSONArray("ids").toJavaList(Long.class); - List ftCateringDaoList = params.getJSONArray("copyItem").toJavaList(FtCateringDao.class); - for (Long id : ids) { iFtCateringDaoService.paste(id,ftCateringDaoList); } - return AjaxResult.success("已修改"); } 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 69f01de6b..f09ef3142 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 @@ -132,4 +132,6 @@ public class FtFoodDemandDao extends BasePatient implements Serializable { */ @TableField(exist = false) private String nutritionFood; + + private Boolean openFlag; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java index 65ed93847..b61d63f67 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java @@ -136,4 +136,6 @@ public class FtReportMealsDao implements Serializable { @TableField(exist = false) private Integer total; + + private Boolean openFlag; } 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 3f984f5ba..6a2be2816 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 @@ -95,6 +95,7 @@ public class FtCateringDaoServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>(); @@ -152,6 +153,7 @@ public class FtCateringDaoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("patient_id", patientId); wrapper.eq("type", cateringDao.getType()); @@ -169,10 +171,20 @@ public class FtCateringDaoServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>(); wrapper.eq("patient_id", id); rows += this.baseMapper.update(ftCateringDao, wrapper); + + // 更新该病患的报餐配置记录 + UpdateWrapper foodDemandWrapper = new UpdateWrapper<>(); + foodDemandWrapper.eq("patient_id", id); + foodDemandDaoService.update(ftFoodDemandDao, foodDemandWrapper); } return rows; @@ -202,6 +214,7 @@ public class FtCateringDaoServiceImpl extends ServiceImpl foodDemandWrapper = new QueryWrapper<>(); foodDemandWrapper.eq("patient_id", id); foodDemandWrapper.eq("type", i + 1); 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 50bea16cc..5893bd15a 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 @@ -88,6 +88,7 @@ public class FtFoodDemandDaoServiceImpl extends ServiceImpl +