From 000f94049bdac3cdb970defe645f57765ea972f7 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Thu, 26 Nov 2020 15:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8A=A5?=
 =?UTF-8?q?=E9=A4=90=E8=A1=A8=E6=80=BB=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FtFoodDefaultDaoController.java           |  13 +
 .../fantang/domain/FtFoodDefaultDao.java      |   4 +
 .../mapper/fantang/FtFoodDefaultDaoMapper.xml |  21 +-
 ruoyi-ui/src/api/fantang/demand.js            |  53 ---
 ruoyi-ui/src/views/fantang/demand/index.vue   | 324 ------------------
 .../src/views/fantang/foodDefault/index.vue   |  19 +-
 6 files changed, 38 insertions(+), 396 deletions(-)
 delete mode 100644 ruoyi-ui/src/api/fantang/demand.js
 delete mode 100644 ruoyi-ui/src/views/fantang/demand/index.vue

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java
index ea8b94f93..75d28facc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java
@@ -9,12 +9,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.fantang.domain.FtFoodDefaultDao;
+import com.ruoyi.system.fantang.service.IFtFoodDaoService;
 import com.ruoyi.system.fantang.service.IFtFoodDefaultDaoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -32,6 +34,8 @@ public class FtFoodDefaultDaoController extends BaseController {
 
     private final IFtFoodDefaultDaoService iFtFoodDefaultDaoService;
 
+    private final IFtFoodDaoService iFtFoodDaoService;
+
     /**
      * 查询默认报餐管理列表
      */
@@ -87,6 +91,15 @@ public class FtFoodDefaultDaoController extends BaseController {
     @Log(title = "默认报餐管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FtFoodDefaultDao ftFoodDefaultDao) {
+        String foodList = ftFoodDefaultDao.getFoodList();
+        String[] temp = foodList.split(",");
+        BigDecimal totalPrice = new BigDecimal(0);
+        for (String foodId : temp) {
+            BigDecimal price = iFtFoodDaoService.getById(Long.parseLong(foodId)).getPrice();
+            totalPrice = totalPrice.add(price);
+        }
+        ftFoodDefaultDao.setPrice(totalPrice);
+
         ftFoodDefaultDao.setUpdatedAt(new Date());
         return toAjax(iFtFoodDefaultDaoService.updateById(ftFoodDefaultDao) ? 1 : 0);
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java
index c467299db..f1e859655 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java
@@ -58,4 +58,8 @@ private static final long serialVersionUID=1L;
 
     /** 更新人 */
     private Long updatedBy;
+
+    /** 总价格 */
+    @Excel(name = "总价格")
+    private BigDecimal price;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDefaultDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDefaultDaoMapper.xml
index 7813c5c19..d76a396ed 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDefaultDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDefaultDaoMapper.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.fantang.mapper.FtFoodDefaultDaoMapper">
-    
+
     <resultMap type="FtFoodDefaultDao" id="FtFoodDefaultDaoResult">
-        <result property="id"    column="id"    />
-        <result property="type"    column="type"    />
-        <result property="foodList"    column="food_list"    />
-        <result property="createdAt"    column="created_at"    />
-        <result property="createdBy"    column="created_by"    />
-        <result property="updatedAt"    column="updated_at"    />
-        <result property="updatedBy"    column="updated_by"    />
+        <result property="id" column="id"/>
+        <result property="type" column="type"/>
+        <result property="foodList" column="food_list"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="updatedAt" column="updated_at"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="price" column="price"/>
     </resultMap>
 
 
diff --git a/ruoyi-ui/src/api/fantang/demand.js b/ruoyi-ui/src/api/fantang/demand.js
deleted file mode 100644
index 2b08f7dcc..000000000
--- a/ruoyi-ui/src/api/fantang/demand.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-// 查询特殊用餐管理列表
-export function listDemand(query) {
-  return request({
-    url: '/fantang/demand/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询特殊用餐管理详细
-export function getDemand(id) {
-  return request({
-    url: '/fantang/demand/' + id,
-    method: 'get'
-  })
-}
-
-// 新增特殊用餐管理
-export function addDemand(data) {
-  return request({
-    url: '/fantang/demand',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改特殊用餐管理
-export function updateDemand(data) {
-  return request({
-    url: '/fantang/demand',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除特殊用餐管理
-export function delDemand(id) {
-  return request({
-    url: '/fantang/demand/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出特殊用餐管理
-export function exportDemand(query) {
-  return request({
-    url: '/fantang/demand/export',
-    method: 'get',
-    params: query
-  })
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/fantang/demand/index.vue b/ruoyi-ui/src/views/fantang/demand/index.vue
deleted file mode 100644
index a9a79c2bf..000000000
--- a/ruoyi-ui/src/views/fantang/demand/index.vue
+++ /dev/null
@@ -1,324 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用餐类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择用餐类型" clearable size="small">
-          <el-option label="请选择字典生成" value=""/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createAt">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.createAt"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入总价"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="有效期" prop="term">
-        <el-input
-          v-model="queryParams.term"
-          placeholder="请输入有效期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['fantang:demand:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['fantang:demand:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['fantang:demand:remove']"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['fantang:demand:export']"
-        >导出
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="demandList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="订单详情" align="center" prop="foods"/>
-      <el-table-column label="用餐类型" align="center" prop="type"/>
-      <el-table-column label="创建时间" align="center" prop="createAt" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createAt, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="总价" align="center" prop="price"/>
-      <el-table-column label="有效期" align="center" prop="term"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['fantang:demand:edit']"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['fantang:demand:remove']"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改特殊用餐管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="订单详情" prop="foods">
-          <el-input v-model="form.foods" placeholder="请输入订单详情"/>
-        </el-form-item>
-        <el-form-item label="用餐类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择用餐类型">
-            <el-option label="请选择字典生成" value=""/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="总价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入总价"/>
-        </el-form-item>
-        <el-form-item label="有效期" prop="term">
-          <el-input v-model="form.term" placeholder="请输入有效期"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {addDemand, delDemand, exportDemand, getDemand, listDemand, updateDemand} from "@/api/fantang/demand";
-
-export default {
-  name: "Demand",
-  components: {},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 特殊用餐管理表格数据
-      demandList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        type: null,
-        createAt: null,
-        price: null,
-        term: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        foods: [
-          {required: true, message: "订单详情不能为空", trigger: "blur"}
-        ],
-        type: [
-          {required: true, message: "用餐类型不能为空", trigger: "change"}
-        ],
-        price: [
-          {required: true, message: "总价不能为空", trigger: "blur"}
-        ],
-        term: [
-          {required: true, message: "有效期不能为空", trigger: "blur"}
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询特殊用餐管理列表 */
-    getList() {
-      this.loading = true;
-      listDemand(this.queryParams).then(response => {
-        this.demandList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        patientId: null,
-        foods: null,
-        type: null,
-        createAt: null,
-        createBy: null,
-        price: null,
-        term: null,
-        updateAt: null,
-        updateBy: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加特殊用餐管理";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getDemand(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改特殊用餐管理";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateDemand(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDemand(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除特殊用餐管理编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return delDemand(ids);
-      }).then(() => {
-        this.getList();
-        this.msgSuccess("删除成功");
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有特殊用餐管理数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return exportDemand(queryParams);
-      }).then(response => {
-        this.download(response.msg);
-      })
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/fantang/foodDefault/index.vue b/ruoyi-ui/src/views/fantang/foodDefault/index.vue
index cfd2c0020..236e96910 100644
--- a/ruoyi-ui/src/views/fantang/foodDefault/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDefault/index.vue
@@ -50,15 +50,15 @@
       <!--        >删除-->
       <!--        </el-button>-->
       <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <el-button
-        type="warning"
-        icon="el-icon-download"
-        size="mini"
-        @click="handleExport"
-        v-hasPermi="['fantang:foodDefault:export']"
-      >导出
-      </el-button>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['fantang:foodDefault:export']"
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -67,6 +67,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
       <el-table-column label="报餐类型" align="center" prop="type" :formatter="typeFormat"/>
+      <el-table-column label="总价格" align="center" prop="price"/>
       <el-table-column label="更新日期" align="center" prop="updatedAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>