添加默认报餐表总价格

This commit is contained in:
ryoeiken 2020-11-26 15:45:18 +08:00
parent 02229ed732
commit 000f94049b
6 changed files with 38 additions and 396 deletions

View File

@ -9,12 +9,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.fantang.domain.FtFoodDefaultDao; import com.ruoyi.system.fantang.domain.FtFoodDefaultDao;
import com.ruoyi.system.fantang.service.IFtFoodDaoService;
import com.ruoyi.system.fantang.service.IFtFoodDefaultDaoService; import com.ruoyi.system.fantang.service.IFtFoodDefaultDaoService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -32,6 +34,8 @@ public class FtFoodDefaultDaoController extends BaseController {
private final IFtFoodDefaultDaoService iFtFoodDefaultDaoService; private final IFtFoodDefaultDaoService iFtFoodDefaultDaoService;
private final IFtFoodDaoService iFtFoodDaoService;
/** /**
* 查询默认报餐管理列表 * 查询默认报餐管理列表
*/ */
@ -87,6 +91,15 @@ public class FtFoodDefaultDaoController extends BaseController {
@Log(title = "默认报餐管理", businessType = BusinessType.UPDATE) @Log(title = "默认报餐管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody FtFoodDefaultDao ftFoodDefaultDao) { 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()); ftFoodDefaultDao.setUpdatedAt(new Date());
return toAjax(iFtFoodDefaultDaoService.updateById(ftFoodDefaultDao) ? 1 : 0); return toAjax(iFtFoodDefaultDaoService.updateById(ftFoodDefaultDao) ? 1 : 0);
} }

View File

@ -58,4 +58,8 @@ private static final long serialVersionUID=1L;
/** 更新人 */ /** 更新人 */
private Long updatedBy; private Long updatedBy;
/** 总价格 */
@Excel(name = "总价格")
private BigDecimal price;
} }

View File

@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.fantang.mapper.FtFoodDefaultDaoMapper"> <mapper namespace="com.ruoyi.system.fantang.mapper.FtFoodDefaultDaoMapper">
<resultMap type="FtFoodDefaultDao" id="FtFoodDefaultDaoResult"> <resultMap type="FtFoodDefaultDao" id="FtFoodDefaultDaoResult">
<result property="id" column="id" /> <result property="id" column="id"/>
<result property="type" column="type" /> <result property="type" column="type"/>
<result property="foodList" column="food_list" /> <result property="foodList" column="food_list"/>
<result property="createdAt" column="created_at" /> <result property="createdAt" column="created_at"/>
<result property="createdBy" column="created_by" /> <result property="createdBy" column="created_by"/>
<result property="updatedAt" column="updated_at" /> <result property="updatedAt" column="updated_at"/>
<result property="updatedBy" column="updated_by" /> <result property="updatedBy" column="updated_by"/>
<result property="price" column="price"/>
</resultMap> </resultMap>

View File

@ -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
})
}

View File

@ -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>

View File

@ -50,15 +50,15 @@
<!-- >删除--> <!-- >删除-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['fantang:foodDefault:export']" v-hasPermi="['fantang:foodDefault:export']"
>导出 >导出
</el-button> </el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -67,6 +67,7 @@
<el-table-column type="selection" width="55" align="center"/> <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="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="type" :formatter="typeFormat"/>
<el-table-column label="总价格" align="center" prop="price"/>
<el-table-column label="更新日期" align="center" prop="updatedAt" width="180"> <el-table-column label="更新日期" align="center" prop="updatedAt" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>