From e940708d521bb16da285ee1c69566af95387ebb9 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Tue, 19 Jan 2021 14:33:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E5=85=BB=E9=85=8D=E9=A4=90=E6=9A=82?= =?UTF-8?q?=E5=81=9C=EF=BC=8C=E6=81=A2=E5=A4=8D=EF=BC=8C=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E7=B2=98=E8=B4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 6 +- .../controller/FtCateringDaoController.java | 36 +++-- .../service/IFtCateringDaoService.java | 5 + .../impl/FtCateringDaoServiceImpl.java | 105 +++++++++---- .../mapper/fantang/FtCateringDaoMapper.xml | 3 +- ruoyi-ui/src/api/fantang/catering.js | 9 ++ ruoyi-ui/src/views/fantang/catering/index.vue | 141 ++++++++++++++---- 7 files changed, 234 insertions(+), 71 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 58968a484..025238075 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://120.77.157.122:3306/fantang_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true - username: fantang_test - password: FcK2GcNhK54bLGM6 + url: jdbc:mysql://192.168.3.95:3306/fantang_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + username: root + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 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 d0c0d0563..40ef92890 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,6 +1,5 @@ package com.ruoyi.system.fantang.controller; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,9 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 配餐功能Controller @@ -134,12 +131,9 @@ public class FtCateringDaoController extends BaseController { public AjaxResult cancel(@PathVariable Long[] ids) { System.out.println(Arrays.toString(ids)); - // 根据病人 id 修改营养配餐启用标志 + // 根据病人 id 修改 营养配餐 启用标志 iFtCateringDaoService.cancelByPatientId(ids); - // 根据病人 id 修改报餐配置表营养餐启用标志 - iFtFoodDemandDaoService.cancelNutritionByPatientId(ids); - return AjaxResult.success("已暂停"); } @@ -153,12 +147,9 @@ public class FtCateringDaoController extends BaseController { System.out.println(Arrays.toString(ids)); // 根据病人 id 修改营养配餐启用标志 - iFtCateringDaoService.cancelByPatientId(ids); + iFtCateringDaoService.restoreByPatientId(ids); - // 根据病人 id 修改报餐配置表营养餐启用标志 - iFtFoodDemandDaoService.cancelNutritionByPatientId(ids); - - return AjaxResult.success("已暂停"); + return AjaxResult.success("已恢复"); } /** @@ -195,4 +186,23 @@ public class FtCateringDaoController extends BaseController { } return AjaxResult.success(); } + + @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/service/IFtCateringDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtCateringDaoService.java index 5a5f9d68f..64c016603 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 @@ -2,6 +2,7 @@ package com.ruoyi.system.fantang.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtCateringDao; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -26,4 +27,8 @@ public interface IFtCateringDaoService extends IService { List notInTable(FtCateringDao ftCateringDao); Integer copyAndAdd(Long patientId, List ftCateringDao); + + Integer restoreByPatientId(Long[] ids); + + void paste(Long id, List ftCateringDaoList); } 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 2e292e0c4..3f984f5ba 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 @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.fantang.domain.FtCateringDao; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.mapper.FtCateringDaoMapper; -import com.ruoyi.system.fantang.mapper.FtFoodDemandDaoMapper; import com.ruoyi.system.fantang.service.IFtCateringDaoService; import com.ruoyi.system.fantang.service.IFtFoodDemandDaoService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,28 +44,28 @@ public class FtCateringDaoServiceImpl extends ServiceImpl types = ftCateringDao.getTypes(); - for (int i = 1; i < 5; i++) { - FtCateringDao cateringDao = new FtCateringDao(); - cateringDao.setPatientId(ftCateringDao.getPatientId()); - cateringDao.setNumber(ftCateringDao.getNumber()); - cateringDao.setFrequency(ftCateringDao.getFrequency()); - cateringDao.setCateringUsage(ftCateringDao.getCateringUsage()); - cateringDao.setCreateAt(new Date()); - cateringDao.setType(i); + for (int i = 1; i < 5; i++) { + FtCateringDao cateringDao = new FtCateringDao(); + cateringDao.setPatientId(ftCateringDao.getPatientId()); + cateringDao.setNumber(ftCateringDao.getNumber()); + cateringDao.setFrequency(ftCateringDao.getFrequency()); + cateringDao.setCateringUsage(ftCateringDao.getCateringUsage()); + cateringDao.setCreateAt(new Date()); + cateringDao.setType(i); - for (Integer type : types) { - if (i == type) { - cateringDao.setFlag(true); - break; - } else { - cateringDao.setFlag(false); - } + for (Integer type : types) { + if (i == type) { + cateringDao.setFlag(true); + break; + } else { + cateringDao.setFlag(false); } - - this.baseMapper.insert(cateringDao); - list.add(cateringDao); } + this.baseMapper.insert(cateringDao); + list.add(cateringDao); + } + return list; } @@ -94,16 +93,18 @@ public class FtCateringDaoServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>(); wrapper.eq("patient_id", id); rows += this.baseMapper.update(ftCateringDao, wrapper); // 更新该病患的报餐配置记录 - FtFoodDemandDao foodDemandDao = new FtFoodDemandDao(); - foodDemandDao.setNutritionFoodFlag(false); - QueryWrapper wrapper1 = new QueryWrapper<>(); - foodDemandDaoService.update(foodDemandDao, wrapper1); + UpdateWrapper foodDemandWrapper = new UpdateWrapper<>(); + foodDemandWrapper.eq("patient_id", id); + foodDemandDaoService.update(foodDemandDao, foodDemandWrapper); } return rows; @@ -132,10 +133,11 @@ public class FtCateringDaoServiceImpl extends ServiceImpl ftCateringDao) { @@ -151,10 +153,61 @@ public class FtCateringDaoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("patient_id",patientId); - wrapper.eq("type",cateringDao.getType()); + wrapper.eq("patient_id", patientId); + wrapper.eq("type", cateringDao.getType()); foodDemandDaoService.update(foodDemandDao, wrapper); } return 1; } + + @Override + public Integer restoreByPatientId(Long[] ids) { + + int rows = 0; + + FtCateringDao ftCateringDao = new FtCateringDao(); + ftCateringDao.setUpdateAt(new Date()); + ftCateringDao.setSuspendFlag(true); + + for (Long id : ids) { + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("patient_id", id); + rows += this.baseMapper.update(ftCateringDao, wrapper); + } + + return rows; + } + + @Override + public void paste(Long id, List ftCateringDaoList) { + + for (int i = 0; i < 4; i++) { + + FtCateringDao ftCateringDao = ftCateringDaoList.get(i); + FtCateringDao cateringDao = new FtCateringDao(); + cateringDao.setCateringUsage(ftCateringDao.getCateringUsage()); + cateringDao.setFlag(ftCateringDao.getFlag()); + cateringDao.setFrequency(ftCateringDao.getFrequency()); + cateringDao.setNumber(ftCateringDao.getNumber()); + cateringDao.setSuspendFlag(ftCateringDao.getSuspendFlag()); + cateringDao.setUpdateAt(new Date()); + + // 更新该病患营养配餐信息 + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("patient_id", id); + wrapper.eq("type", i + 1); + this.baseMapper.update(cateringDao, wrapper); + + // 更新该病患默认配餐信息 + FtFoodDemandDao foodDemandDao = new FtFoodDemandDao(); + foodDemandDao.setNutritionFoodId(ftCateringDao.getNumber()); + foodDemandDao.setNutritionFoodFlag(ftCateringDao.getFlag()); + QueryWrapper foodDemandWrapper = new QueryWrapper<>(); + foodDemandWrapper.eq("patient_id", id); + foodDemandWrapper.eq("type", i + 1); + foodDemandDaoService.update(foodDemandDao, foodDemandWrapper); + + } + + } } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml index ca04665cb..e34dd8fd6 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml @@ -18,6 +18,7 @@ +