From d0f5c425b223f7add6708b05152ab45704cfd320 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Tue, 19 Jan 2021 17:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=82=A3=E9=BB=98=E8=AE=A4=E9=85=8D?=
 =?UTF-8?q?=E9=A4=90=E9=85=8D=E7=BD=AE=E8=A1=A8=EF=BC=8C=E6=8A=A5=E9=A4=90?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=90=A5=E5=85=BB=E9=85=8D=E9=A4=90?=
 =?UTF-8?q?=E5=BC=80=E9=80=9A=E6=A0=87=E5=BF=97=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/FtCateringDaoController.java |  5 -----
 .../system/fantang/domain/FtFoodDemandDao.java      |  2 ++
 .../system/fantang/domain/FtReportMealsDao.java     |  2 ++
 .../service/impl/FtCateringDaoServiceImpl.java      | 13 +++++++++++++
 .../service/impl/FtFoodDemandDaoServiceImpl.java    |  1 +
 .../mapper/fantang/FtFoodDemandDaoMapper.xml        |  1 +
 .../mapper/fantang/FtReportMealsDaoMapper.xml       |  1 +
 7 files changed, 20 insertions(+), 5 deletions(-)

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<Long> ids = params.getJSONArray("ids").toJavaList(Long.class);
-        
         List<FtCateringDao> 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<FtCateringDaoMapper, F
 
         FtFoodDemandDao foodDemandDao = new FtFoodDemandDao();
         foodDemandDao.setNutritionFoodFlag(false);
+        foodDemandDao.setOpenFlag(false);
 
         for (Long id : ids) {
             UpdateWrapper<FtCateringDao> wrapper = new UpdateWrapper<>();
@@ -152,6 +153,7 @@ public class FtCateringDaoServiceImpl extends ServiceImpl<FtCateringDaoMapper, F
             FtFoodDemandDao foodDemandDao = new FtFoodDemandDao();
             foodDemandDao.setNutritionFoodId(cateringDao.getNumber());
             foodDemandDao.setNutritionFoodFlag(true);
+            foodDemandDao.setOpenFlag(true);
             QueryWrapper<FtFoodDemandDao> wrapper = new QueryWrapper<>();
             wrapper.eq("patient_id", patientId);
             wrapper.eq("type", cateringDao.getType());
@@ -169,10 +171,20 @@ public class FtCateringDaoServiceImpl extends ServiceImpl<FtCateringDaoMapper, F
         ftCateringDao.setUpdateAt(new Date());
         ftCateringDao.setSuspendFlag(true);
 
+        FtFoodDemandDao ftFoodDemandDao = new FtFoodDemandDao();
+        ftFoodDemandDao.setOpenFlag(true);
+        ftFoodDemandDao.setUpdateAt(new Date());
+
+
         for (Long id : ids) {
             UpdateWrapper<FtCateringDao> wrapper = new UpdateWrapper<>();
             wrapper.eq("patient_id", id);
             rows += this.baseMapper.update(ftCateringDao, wrapper);
+
+            // 更新该病患的报餐配置记录
+            UpdateWrapper<FtFoodDemandDao> foodDemandWrapper = new UpdateWrapper<>();
+            foodDemandWrapper.eq("patient_id", id);
+            foodDemandDaoService.update(ftFoodDemandDao, foodDemandWrapper);
         }
 
         return rows;
@@ -202,6 +214,7 @@ public class FtCateringDaoServiceImpl extends ServiceImpl<FtCateringDaoMapper, F
             FtFoodDemandDao foodDemandDao = new FtFoodDemandDao();
             foodDemandDao.setNutritionFoodId(ftCateringDao.getNumber());
             foodDemandDao.setNutritionFoodFlag(ftCateringDao.getFlag());
+            foodDemandDao.setOpenFlag(ftCateringDao.getSuspendFlag());
             QueryWrapper<FtFoodDemandDao> 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<FtFoodDemandDaoMappe
             FtFoodDemandDao foodDemand = foodDemandList.get(i);
             foodDemand.setNutritionFoodId(ftCateringList.get(i).getNumber());
             foodDemand.setNutritionFoodFlag(ftCateringList.get(i).getFlag());
+            foodDemand.setOpenFlag(true);
             foodDemand.setUpdateAt(new Date());
             rows += this.baseMapper.updateById(foodDemand);
         }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
index 36ff94da4..913ff0f8c 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
@@ -22,6 +22,7 @@
         <result property="flag" column="flag"/>
         <result property="nutritionFoodId" column="nutrition_food_id"/>
         <result property="nutritionFoodFlag" column="nutrition_food_flag"/>
+        <result property="openFlag" column="open_flag"/>
     </resultMap>
 
     <select id="listNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtFoodDemandDao">
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
index 46ff48780..a655f304a 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
@@ -25,6 +25,7 @@
         <result property="meat" column="meat"/>
         <result property="rice" column="rice"/>
         <result property="egg" column="egg"/>
+        <result property="openFlag" column="open_flag"/>
     </resultMap>
 
     <select id="listMealsWithInSettle" resultType="com.ruoyi.system.fantang.domain.FtReportMealsDao">