Browse Source

修复代码

master
主管理员 1 month ago
parent
commit
ae10c10f50
17 changed files with 1954 additions and 2 deletions
  1. +2
    -2
      CatmDogd-Mall-Front-test/.env.development
  2. +53
    -0
      CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDate.js
  3. +53
    -0
      CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDateLog.js
  4. +357
    -0
      CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDate/index.vue
  5. +390
    -0
      CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDateLog/index.vue
  6. +96
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateController.java
  7. +96
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateLogController.java
  8. +54
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDate.java
  9. +94
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDateLog.java
  10. +67
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateLogMapper.java
  11. +67
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateMapper.java
  12. +59
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateLogService.java
  13. +59
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateService.java
  14. +87
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateLogServiceImpl.java
  15. +87
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateServiceImpl.java
  16. +194
    -0
      ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml
  17. +139
    -0
      ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml

+ 2
- 2
CatmDogd-Mall-Front-test/.env.development View File

@ -5,8 +5,8 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
ENV = 'development'
# 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api
VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/prod-api'
# VUE_APP_BASE_API = 'http://localhost:8001/prod-api'
# VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/prod-api'
VUE_APP_BASE_API = 'http://localhost:8001/prod-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true


+ 53
- 0
CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDate.js View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询订单信息表列表
export function listAppletOrderItemDate(query) {
return request({
url: '/model/AppletOrderItemDate/list',
method: 'get',
params: query
})
}
// 查询订单信息表详细
export function getAppletOrderItemDate(id) {
return request({
url: '/model/AppletOrderItemDate/' + id,
method: 'get'
})
}
// 新增订单信息表
export function addAppletOrderItemDate(data) {
return request({
url: '/model/AppletOrderItemDate',
method: 'post',
data: data
})
}
// 修改订单信息表
export function updateAppletOrderItemDate(data) {
return request({
url: '/model/AppletOrderItemDate',
method: 'put',
data: data
})
}
// 删除订单信息表
export function delAppletOrderItemDate(id) {
return request({
url: '/model/AppletOrderItemDate/' + id,
method: 'delete'
})
}
// 导出订单信息表
export function exportAppletOrderItemDate(query) {
return request({
url: '/model/AppletOrderItemDate/export',
method: 'get',
params: query
})
}

+ 53
- 0
CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDateLog.js View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询订单信息表列表
export function listAppletOrderItemDateLog(query) {
return request({
url: '/model/AppletOrderItemDateLog/list',
method: 'get',
params: query
})
}
// 查询订单信息表详细
export function getAppletOrderItemDateLog(id) {
return request({
url: '/model/AppletOrderItemDateLog/' + id,
method: 'get'
})
}
// 新增订单信息表
export function addAppletOrderItemDateLog(data) {
return request({
url: '/model/AppletOrderItemDateLog',
method: 'post',
data: data
})
}
// 修改订单信息表
export function updateAppletOrderItemDateLog(data) {
return request({
url: '/model/AppletOrderItemDateLog',
method: 'put',
data: data
})
}
// 删除订单信息表
export function delAppletOrderItemDateLog(id) {
return request({
url: '/model/AppletOrderItemDateLog/' + id,
method: 'delete'
})
}
// 导出订单信息表
export function exportAppletOrderItemDateLog(query) {
return request({
url: '/model/AppletOrderItemDateLog/export',
method: 'get',
params: query
})
}

+ 357
- 0
CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDate/index.vue View File

@ -0,0 +1,357 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
<el-form-item label="服务日期" prop="serviceDate">
<el-input
v-model="queryParams.serviceDate"
placeholder="请输入服务日期"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="等待上门0已完成1" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择等待上门0已完成1" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="主订单标识" prop="appletOrderId">
<el-input
v-model="queryParams.appletOrderId"
placeholder="请输入主订单标识"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="下单小程序订单标识" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入下单小程序订单标识"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="下单小程序订单编码" prop="orderSn">
<el-input
v-model="queryParams.orderSn"
placeholder="请输入下单小程序订单编码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="服务地址" prop="cityAddress">
<el-input
v-model="queryParams.cityAddress"
placeholder="请输入服务地址"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="服务地址详情" prop="address">
<el-input
v-model="queryParams.address"
placeholder="请输入服务地址详情"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item class="flex_one tr">
<el-button type="primary" 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"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['model:appletOrderItemDate:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['model:appletOrderItemDate:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['model:appletOrderItemDate:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['model:appletOrderItemDate:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="appletOrderItemDateList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="唯一标识" align="center" prop="id" />
<el-table-column label="服务日期" align="center" prop="serviceDate" v-if="columns[0].visible"/>
<el-table-column label="等待上门0已完成1" align="center" prop="status" v-if="columns[1].visible"/>
<el-table-column label="主订单标识" align="center" prop="appletOrderId" v-if="columns[2].visible"/>
<el-table-column label="下单小程序订单标识" align="center" prop="orderId" v-if="columns[3].visible"/>
<el-table-column label="下单小程序订单编码" align="center" prop="orderSn" v-if="columns[4].visible"/>
<el-table-column label="服务地址" align="center" prop="cityAddress" v-if="columns[5].visible"/>
<el-table-column label="服务地址详情" align="center" prop="address" v-if="columns[6].visible"/>
<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="['model:appletOrderItemDate:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['model:appletOrderItemDate: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="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
<el-form-item label="服务日期" prop="serviceDate">
<el-input v-model="form.serviceDate" placeholder="请输入服务日期" />
</el-form-item>
<el-form-item label="等待上门0已完成1">
<el-radio-group v-model="form.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="主订单标识" prop="appletOrderId">
<el-input v-model="form.appletOrderId" placeholder="请输入主订单标识" />
</el-form-item>
<el-form-item label="下单小程序订单标识" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入下单小程序订单标识" />
</el-form-item>
<el-form-item label="下单小程序订单编码" prop="orderSn">
<el-input v-model="form.orderSn" placeholder="请输入下单小程序订单编码" />
</el-form-item>
<el-form-item label="服务地址" prop="cityAddress">
<el-input v-model="form.cityAddress" placeholder="请输入服务地址" />
</el-form-item>
<el-form-item label="服务地址详情" prop="address">
<el-input v-model="form.address" 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 { listAppletOrderItemDate, getAppletOrderItemDate, delAppletOrderItemDate,
addAppletOrderItemDate, updateAppletOrderItemDate, exportAppletOrderItemDate }
from "@/api/model/AppletOrderItemDate";
export default {
name: "AppletOrderItemDate",
data() {
return {
//
loading: true,
//
exportLoading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
appletOrderItemDateList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
serviceDate: null,
status: null,
appletOrderId: null,
orderId: null,
orderSn: null,
cityAddress: null,
address: null
},
//
form: {},
//
rules: {
},
columns: [
{ key: 5, label: "服务日期", visible: true },
{ key: 6, label: "等待上门0已完成1", visible: true },
{ key: 7, label: "主订单标识", visible: true },
{ key: 8, label: "下单小程序订单标识", visible: true },
{ key: 9, label: "下单小程序订单编码", visible: true },
{ key: 10, label: "服务地址", visible: false },
{ key: 11, label: "服务地址详情", visible: false },
],
};
},
created() {
this.getList();
},
methods: {
/** 查询订单信息表列表 */
getList() {
this.loading = true;
listAppletOrderItemDate(this.queryParams).then(response => {
this.appletOrderItemDateList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
createTime: null,
createBy: null,
updateTime: null,
updateBy: null,
serviceDate: null,
status: 0,
appletOrderId: null,
orderId: null,
orderSn: null,
cityAddress: null,
address: 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
getAppletOrderItemDate(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) {
updateAppletOrderItemDate(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAppletOrderItemDate(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单信息表编号为"' + ids + '"的数据项?').then(function() {
return delAppletOrderItemDate(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$modal.confirm('是否确认导出所有订单信息表数据项?').then(() => {
this.exportLoading = true;
return exportAppletOrderItemDate(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>

+ 390
- 0
CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDateLog/index.vue View File

@ -0,0 +1,390 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
<template v-if="showMoreCondition">
<el-form-item label="日订单标识" prop="itemDateId">
<el-input
v-model="queryParams.itemDateId"
placeholder="请输入日订单标识"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总订单标识" prop="itemOrderId">
<el-input
v-model="queryParams.itemOrderId"
placeholder="请输入总订单标识"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单标识" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入订单标识"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</template>
<el-form-item class="flex_one tr">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['model:appletOrderItemDateLog:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['model:appletOrderItemDateLog:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['model:appletOrderItemDateLog:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['model:appletOrderItemDateLog:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="appletOrderItemDateLogList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="唯一标识" align="center" prop="id" />
<el-table-column label="手套照片" align="center" prop="glovePhoto" v-if="columns[0].visible"/>
<el-table-column label="鞋套照片" align="center" prop="shoeCoverPhoto" v-if="columns[1].visible"/>
<el-table-column label="宠物照片" align="center" prop="petPhoto" v-if="columns[2].visible"/>
<el-table-column label="伴宠师照片" align="center" prop="teacherPhoto" v-if="columns[3].visible"/>
<el-table-column label="粮碗前后对比-前" align="center" prop="grainBowlFront" v-if="columns[4].visible"/>
<el-table-column label="粮碗前后对比-后" align="center" prop="grainBowlAfter" v-if="columns[5].visible"/>
<el-table-column label="水碗前后对比-前" align="center" prop="waterBowlFront" v-if="columns[6].visible"/>
<el-table-column label="水碗前后对比-后" align="center" prop="waterBowlAfter" v-if="columns[7].visible"/>
<el-table-column label="盆/尿垫前后对比-前" align="center" prop="basinFront" v-if="columns[8].visible"/>
<el-table-column label="盆/尿垫前后对比-后" align="center" prop="basinAfter" v-if="columns[9].visible"/>
<el-table-column label="溜狗" align="center" prop="workDogImage" v-if="columns[10].visible"/>
<el-table-column label="陪玩" align="center" prop="workPalyImage" v-if="columns[11].visible"/>
<el-table-column label="备注" align="center" prop="notes" v-if="columns[12].visible"/>
<el-table-column label="日订单标识" align="center" prop="itemDateId" v-if="columns[13].visible"/>
<el-table-column label="总订单标识" align="center" prop="itemOrderId" v-if="columns[14].visible"/>
<el-table-column label="订单标识" align="center" prop="orderId" v-if="columns[15].visible"/>
<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="['model:appletOrderItemDateLog:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['model:appletOrderItemDateLog: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="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
<el-form-item label="手套照片" prop="glovePhoto">
<el-input v-model="form.glovePhoto" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="鞋套照片" prop="shoeCoverPhoto">
<el-input v-model="form.shoeCoverPhoto" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="宠物照片" prop="petPhoto">
<el-input v-model="form.petPhoto" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="伴宠师照片" prop="teacherPhoto">
<el-input v-model="form.teacherPhoto" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="粮碗前后对比-前" prop="grainBowlFront">
<el-input v-model="form.grainBowlFront" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="粮碗前后对比-后" prop="grainBowlAfter">
<el-input v-model="form.grainBowlAfter" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="水碗前后对比-前" prop="waterBowlFront">
<el-input v-model="form.waterBowlFront" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="水碗前后对比-后" prop="waterBowlAfter">
<el-input v-model="form.waterBowlAfter" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="盆/尿垫前后对比-前" prop="basinFront">
<el-input v-model="form.basinFront" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="盆/尿垫前后对比-后" prop="basinAfter">
<el-input v-model="form.basinAfter" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="溜狗">
<imageUpload v-model="form.workDogImage"/>
</el-form-item>
<el-form-item label="陪玩">
<imageUpload v-model="form.workPalyImage"/>
</el-form-item>
<el-form-item label="备注" prop="notes">
<el-input v-model="form.notes" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="日订单标识" prop="itemDateId">
<el-input v-model="form.itemDateId" placeholder="请输入日订单标识" />
</el-form-item>
<el-form-item label="总订单标识" prop="itemOrderId">
<el-input v-model="form.itemOrderId" placeholder="请输入总订单标识" />
</el-form-item>
<el-form-item label="订单标识" prop="orderId">
<el-input v-model="form.orderId" 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 { listAppletOrderItemDateLog, getAppletOrderItemDateLog,
delAppletOrderItemDateLog, addAppletOrderItemDateLog,
updateAppletOrderItemDateLog, exportAppletOrderItemDateLog } from "@/api/model/AppletOrderItemDateLog";
export default {
name: "AppletOrderItemDateLog",
data() {
return {
//
loading: true,
//
exportLoading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
appletOrderItemDateLogList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
glovePhoto: null,
shoeCoverPhoto: null,
petPhoto: null,
teacherPhoto: null,
grainBowlFront: null,
grainBowlAfter: null,
waterBowlFront: null,
waterBowlAfter: null,
basinFront: null,
basinAfter: null,
workDogImage: null,
workPalyImage: null,
notes: null,
itemDateId: null,
itemOrderId: null,
orderId: null
},
//
form: {},
//
rules: {
},
columns: [
{ key: 5, label: "手套照片", visible: true },
{ key: 6, label: "鞋套照片", visible: true },
{ key: 7, label: "宠物照片", visible: true },
{ key: 8, label: "伴宠师照片", visible: true },
{ key: 9, label: "粮碗前后对比-前", visible: true },
{ key: 10, label: "粮碗前后对比-后", visible: false },
{ key: 11, label: "水碗前后对比-前", visible: false },
{ key: 12, label: "水碗前后对比-后", visible: false },
{ key: 13, label: "盆/尿垫前后对比-前", visible: false },
{ key: 14, label: "盆/尿垫前后对比-后", visible: false },
{ key: 15, label: "溜狗", visible: false },
{ key: 16, label: "陪玩", visible: false },
{ key: 17, label: "备注", visible: false },
{ key: 18, label: "日订单标识", visible: false },
{ key: 19, label: "总订单标识", visible: false },
{ key: 20, label: "订单标识", visible: false },
],
showMoreCondition: false
};
},
created() {
this.getList();
},
methods: {
/** 查询订单信息表列表 */
getList() {
this.loading = true;
listAppletOrderItemDateLog(this.queryParams).then(response => {
this.appletOrderItemDateLogList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
createTime: null,
createBy: null,
updateTime: null,
updateBy: null,
glovePhoto: null,
shoeCoverPhoto: null,
petPhoto: null,
teacherPhoto: null,
grainBowlFront: null,
grainBowlAfter: null,
waterBowlFront: null,
waterBowlAfter: null,
basinFront: null,
basinAfter: null,
workDogImage: null,
workPalyImage: null,
notes: null,
itemDateId: null,
itemOrderId: null,
orderId: 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
getAppletOrderItemDateLog(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) {
updateAppletOrderItemDateLog(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAppletOrderItemDateLog(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单信息表编号为"' + ids + '"的数据项?').then(function() {
return delAppletOrderItemDateLog(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$modal.confirm('是否确认导出所有订单信息表数据项?').then(() => {
this.exportLoading = true;
return exportAppletOrderItemDateLog(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>

+ 96
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateController.java View File

@ -0,0 +1,96 @@
package com.ruoyi.model.controller;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.model.domain.AppletOrderItemDate;
import com.ruoyi.model.service.IAppletOrderItemDateService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 订单信息表Controller
*
* @author daixiande
* @date 2025-04-14
*/
@RestController
@RequestMapping("/model/AppletOrderItemDate")
public class AppletOrderItemDateController extends BaseController {
@Autowired
private IAppletOrderItemDateService appletOrderItemDateService;
/**
* 查询订单信息表列表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:list')")
@GetMapping("/list")
public TableDataInfo list(AppletOrderItemDate appletOrderItemDate) {
startPage();
List<AppletOrderItemDate> list = appletOrderItemDateService.selectAppletOrderItemDateList(appletOrderItemDate);
return getDataTable(list);
}
/**
* 导出订单信息表列表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:export')")
@Log(title = "订单信息表", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(AppletOrderItemDate appletOrderItemDate) {
List<AppletOrderItemDate> list = appletOrderItemDateService.selectAppletOrderItemDateList(appletOrderItemDate);
ExcelUtil<AppletOrderItemDate> util = new ExcelUtil<AppletOrderItemDate>(AppletOrderItemDate.class);
return util.exportExcel(list, "订单信息表数据");
}
/**
* 获取订单信息表详细信息
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(appletOrderItemDateService.selectAppletOrderItemDateById(id));
}
/**
* 新增订单信息表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:add')")
@Log(title = "订单信息表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppletOrderItemDate appletOrderItemDate) {
return toAjax(appletOrderItemDateService.insertAppletOrderItemDate(appletOrderItemDate));
}
/**
* 修改订单信息表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:edit')")
@Log(title = "订单信息表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppletOrderItemDate appletOrderItemDate) {
return toAjax(appletOrderItemDateService.updateAppletOrderItemDate(appletOrderItemDate));
}
/**
* 删除订单信息表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:remove')")
@Log(title = "订单信息表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(appletOrderItemDateService.deleteAppletOrderItemDateByIds(ids));
}
}

+ 96
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateLogController.java View File

@ -0,0 +1,96 @@
package com.ruoyi.model.controller;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.model.domain.AppletOrderItemDateLog;
import com.ruoyi.model.service.IAppletOrderItemDateLogService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 订单信息表Controller
*
* @author daixiande
* @date 2025-04-14
*/
@RestController
@RequestMapping("/model/AppletOrderItemDateLog")
public class AppletOrderItemDateLogController extends BaseController {
@Autowired
private IAppletOrderItemDateLogService appletOrderItemDateLogService;
/**
* 查询订单信息表列表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:list')")
@GetMapping("/list")
public TableDataInfo list(AppletOrderItemDateLog appletOrderItemDateLog) {
startPage();
List<AppletOrderItemDateLog> list = appletOrderItemDateLogService.selectAppletOrderItemDateLogList(appletOrderItemDateLog);
return getDataTable(list);
}
/**
* 导出订单信息表列表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:export')")
@Log(title = "订单信息表", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(AppletOrderItemDateLog appletOrderItemDateLog) {
List<AppletOrderItemDateLog> list = appletOrderItemDateLogService.selectAppletOrderItemDateLogList(appletOrderItemDateLog);
ExcelUtil<AppletOrderItemDateLog> util = new ExcelUtil<AppletOrderItemDateLog>(AppletOrderItemDateLog.class);
return util.exportExcel(list, "订单信息表数据");
}
/**
* 获取订单信息表详细信息
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(appletOrderItemDateLogService.selectAppletOrderItemDateLogById(id));
}
/**
* 新增订单信息表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:add')")
@Log(title = "订单信息表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppletOrderItemDateLog appletOrderItemDateLog) {
return toAjax(appletOrderItemDateLogService.insertAppletOrderItemDateLog(appletOrderItemDateLog));
}
/**
* 修改订单信息表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:edit')")
@Log(title = "订单信息表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppletOrderItemDateLog appletOrderItemDateLog) {
return toAjax(appletOrderItemDateLogService.updateAppletOrderItemDateLog(appletOrderItemDateLog));
}
/**
* 删除订单信息表
*/
@PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:remove')")
@Log(title = "订单信息表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(appletOrderItemDateLogService.deleteAppletOrderItemDateLogByIds(ids));
}
}

+ 54
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDate.java View File

@ -0,0 +1,54 @@
package com.ruoyi.model.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
@Data
public class AppletOrderItemDate {
private static final long serialVersionUID = 1L;
/** 唯一标识 */
private Long id;
/** 创建时间 */
private String createTime;
/** 创建者 */
private Integer createBy;
/** 修改时间 */
private String updateTime;
/** 修改者 */
private Integer updateBy;
/** 服务日期 */
@Excel(name = "服务日期")
private String serviceDate;
/** 等待上门0已完成1 */
@Excel(name = "等待上门0已完成1")
private Integer status;
/** 主订单标识 */
@Excel(name = "主订单标识")
private Long appletOrderId;
/** 下单小程序订单标识 */
@Excel(name = "下单小程序订单标识")
private Long orderId;
/** 下单小程序订单编码 */
@Excel(name = "下单小程序订单编码")
private String orderSn;
/** 服务地址 */
@Excel(name = "服务地址")
private String cityAddress;
/** 服务地址详情 */
@Excel(name = "服务地址详情")
private String address;
}

+ 94
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDateLog.java View File

@ -0,0 +1,94 @@
package com.ruoyi.model.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
/**
* 订单信息表对象 applet_order_item_date_log
*
* @author daixiande
*/
@Data
public class AppletOrderItemDateLog {
private static final long serialVersionUID = 1L;
/** 唯一标识 */
private Long id;
/** 创建时间 */
private String createTime;
/** 创建者 */
private Integer createBy;
/** 修改时间 */
private String updateTime;
/** 修改者 */
private Integer updateBy;
/** 手套照片 */
@Excel(name = "手套照片")
private String glovePhoto;
/** 鞋套照片 */
@Excel(name = "鞋套照片")
private String shoeCoverPhoto;
/** 宠物照片 */
@Excel(name = "宠物照片")
private String petPhoto;
/** 伴宠师照片 */
@Excel(name = "伴宠师照片")
private String teacherPhoto;
/** 粮碗前后对比-前 */
@Excel(name = "粮碗前后对比-前")
private String grainBowlFront;
/** 粮碗前后对比-后 */
@Excel(name = "粮碗前后对比-后")
private String grainBowlAfter;
/** 水碗前后对比-前 */
@Excel(name = "水碗前后对比-前")
private String waterBowlFront;
/** 水碗前后对比-后 */
@Excel(name = "水碗前后对比-后")
private String waterBowlAfter;
/** 盆/尿垫前后对比-前 */
@Excel(name = "盆/尿垫前后对比-前")
private String basinFront;
/** 盆/尿垫前后对比-后 */
@Excel(name = "盆/尿垫前后对比-后")
private String basinAfter;
/** 溜狗 */
@Excel(name = "溜狗")
private String workDogImage;
/** 陪玩 */
@Excel(name = "陪玩")
private String workPalyImage;
/** 备注 */
@Excel(name = "备注")
private String notes;
/** 日订单标识 */
@Excel(name = "日订单标识")
private Long itemDateId;
/** 总订单标识 */
@Excel(name = "总订单标识")
private Long itemOrderId;
/** 订单标识 */
@Excel(name = "订单标识")
private Long orderId;
}

+ 67
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateLogMapper.java View File

@ -0,0 +1,67 @@
package com.ruoyi.model.mapper;
import java.util.List;
import com.ruoyi.model.domain.AppletOrderItemDateLog;
/**
* 订单信息表Mapper接口
*
* @author daixiande
*/
public interface AppletOrderItemDateLogMapper {
/**
* 查询订单信息表
*
* @param id 订单信息表主键
* @return 订单信息表
*/
AppletOrderItemDateLog selectById(Long id);
/**
* 查询订单信息表列表
*
* @param appletOrderItemDateLog 订单信息表
* @return 订单信息表集合
*/
List<AppletOrderItemDateLog> selectList(AppletOrderItemDateLog appletOrderItemDateLog);
/**
* 新增订单信息表
*
* @param appletOrderItemDateLog 订单信息表
* @return 结果
*/
int insert(AppletOrderItemDateLog appletOrderItemDateLog);
/**
* 修改订单信息表
*
* @param appletOrderItemDateLog 订单信息表
* @return 结果
*/
int update(AppletOrderItemDateLog appletOrderItemDateLog);
/**
* 删除订单信息表
*
* @param id 订单信息表主键
* @return 结果
*/
int deleteById(Long id);
/**
* 批量删除订单信息表
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
int deleteByIds(Long[] ids);
/**
* 更新或插入订单信息表
*
* @param appletOrderItemDateLog 订单信息表
* @return 结果
*/
int insertOrUpdate(AppletOrderItemDateLog appletOrderItemDateLog);
}

+ 67
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateMapper.java View File

@ -0,0 +1,67 @@
package com.ruoyi.model.mapper;
import java.util.List;
import com.ruoyi.model.domain.AppletOrderItemDate;
/**
* 订单信息表Mapper接口
*
* @author daixiande
*/
public interface AppletOrderItemDateMapper {
/**
* 查询订单信息表
*
* @param id 订单信息表主键
* @return 订单信息表
*/
AppletOrderItemDate selectById(Long id);
/**
* 查询订单信息表列表
*
* @param appletOrderItemDate 订单信息表
* @return 订单信息表集合
*/
List<AppletOrderItemDate> selectList(AppletOrderItemDate appletOrderItemDate);
/**
* 新增订单信息表
*
* @param appletOrderItemDate 订单信息表
* @return 结果
*/
int insert(AppletOrderItemDate appletOrderItemDate);
/**
* 修改订单信息表
*
* @param appletOrderItemDate 订单信息表
* @return 结果
*/
int update(AppletOrderItemDate appletOrderItemDate);
/**
* 删除订单信息表
*
* @param id 订单信息表主键
* @return 结果
*/
int deleteById(Long id);
/**
* 批量删除订单信息表
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
int deleteByIds(Long[] ids);
/**
* 更新或插入订单信息表
*
* @param appletOrderItemDate 订单信息表
* @return 结果
*/
int insertOrUpdate(AppletOrderItemDate appletOrderItemDate);
}

+ 59
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateLogService.java View File

@ -0,0 +1,59 @@
package com.ruoyi.model.service;
import java.util.List;
import com.ruoyi.model.domain.AppletOrderItemDateLog;
/**
* 订单信息表Service接口
*
* @author daixiande
*/
public interface IAppletOrderItemDateLogService {
/**
* 查询订单信息表
*
* @param id 订单信息表主键
* @return 订单信息表
*/
AppletOrderItemDateLog selectAppletOrderItemDateLogById(Long id);
/**
* 查询订单信息表列表
*
* @param appletOrderItemDateLog 订单信息表
* @return 订单信息表集合
*/
List<AppletOrderItemDateLog> selectAppletOrderItemDateLogList(AppletOrderItemDateLog appletOrderItemDateLog);
/**
* 新增订单信息表
*
* @param appletOrderItemDateLog 订单信息表
* @return 结果
*/
int insertAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog);
/**
* 修改订单信息表
*
* @param appletOrderItemDateLog 订单信息表
* @return 结果
*/
int updateAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog);
/**
* 批量删除订单信息表
*
* @param ids 需要删除的订单信息表主键集合
* @return 结果
*/
int deleteAppletOrderItemDateLogByIds(Long[] ids);
/**
* 删除订单信息表信息
*
* @param id 订单信息表主键
* @return 结果
*/
int deleteAppletOrderItemDateLogById(Long id);
}

+ 59
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateService.java View File

@ -0,0 +1,59 @@
package com.ruoyi.model.service;
import java.util.List;
import com.ruoyi.model.domain.AppletOrderItemDate;
/**
* 订单信息表Service接口
*
* @author daixiande
*/
public interface IAppletOrderItemDateService {
/**
* 查询订单信息表
*
* @param id 订单信息表主键
* @return 订单信息表
*/
AppletOrderItemDate selectAppletOrderItemDateById(Long id);
/**
* 查询订单信息表列表
*
* @param appletOrderItemDate 订单信息表
* @return 订单信息表集合
*/
List<AppletOrderItemDate> selectAppletOrderItemDateList(AppletOrderItemDate appletOrderItemDate);
/**
* 新增订单信息表
*
* @param appletOrderItemDate 订单信息表
* @return 结果
*/
int insertAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate);
/**
* 修改订单信息表
*
* @param appletOrderItemDate 订单信息表
* @return 结果
*/
int updateAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate);
/**
* 批量删除订单信息表
*
* @param ids 需要删除的订单信息表主键集合
* @return 结果
*/
int deleteAppletOrderItemDateByIds(Long[] ids);
/**
* 删除订单信息表信息
*
* @param id 订单信息表主键
* @return 结果
*/
int deleteAppletOrderItemDateById(Long id);
}

+ 87
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateLogServiceImpl.java View File

@ -0,0 +1,87 @@
package com.ruoyi.model.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.model.mapper.AppletOrderItemDateLogMapper;
import com.ruoyi.model.domain.AppletOrderItemDateLog;
import com.ruoyi.model.service.IAppletOrderItemDateLogService;
/**
* 订单信息表Service业务层处理
*
* @author daixiande
*/
@Service
public class AppletOrderItemDateLogServiceImpl implements IAppletOrderItemDateLogService {
@Autowired
private AppletOrderItemDateLogMapper appletOrderItemDateLogMapper;
/**
* 查询订单信息表
*
* @param id 订单信息表主键
* @return 订单信息表
*/
@Override
public AppletOrderItemDateLog selectAppletOrderItemDateLogById(Long id) {
return appletOrderItemDateLogMapper.selectById(id);
}
/**
* 查询订单信息表列表
*
* @param appletOrderItemDateLog 订单信息表
* @return 订单信息表
*/
@Override
public List<AppletOrderItemDateLog> selectAppletOrderItemDateLogList(AppletOrderItemDateLog appletOrderItemDateLog) {
return appletOrderItemDateLogMapper.selectList(appletOrderItemDateLog);
}
/**
* 新增订单信息表
*
* @param appletOrderItemDateLog 订单信息表
* @return 结果
*/
@Override
public int insertAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog) {
// appletOrderItemDateLog.setCreateTime(String.now());
return appletOrderItemDateLogMapper.insert(appletOrderItemDateLog);
}
/**
* 修改订单信息表
*
* @param appletOrderItemDateLog 订单信息表
* @return 结果
*/
@Override
public int updateAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog) {
// appletOrderItemDateLog.setUpdateTime(DateUtils.getNowDate());
return appletOrderItemDateLogMapper.update(appletOrderItemDateLog);
}
/**
* 批量删除订单信息表
*
* @param ids 需要删除的订单信息表主键
* @return 结果
*/
@Override
public int deleteAppletOrderItemDateLogByIds(Long[] ids) {
return appletOrderItemDateLogMapper.deleteByIds(ids);
}
/**
* 删除订单信息表信息
*
* @param id 订单信息表主键
* @return 结果
*/
@Override
public int deleteAppletOrderItemDateLogById(Long id) {
return appletOrderItemDateLogMapper.deleteById(id);
}
}

+ 87
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateServiceImpl.java View File

@ -0,0 +1,87 @@
package com.ruoyi.model.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.model.mapper.AppletOrderItemDateMapper;
import com.ruoyi.model.domain.AppletOrderItemDate;
import com.ruoyi.model.service.IAppletOrderItemDateService;
/**
* 订单信息表Service业务层处理
*
* @author daixiande
*/
@Service
public class AppletOrderItemDateServiceImpl implements IAppletOrderItemDateService {
@Autowired
private AppletOrderItemDateMapper appletOrderItemDateMapper;
/**
* 查询订单信息表
*
* @param id 订单信息表主键
* @return 订单信息表
*/
@Override
public AppletOrderItemDate selectAppletOrderItemDateById(Long id) {
return appletOrderItemDateMapper.selectById(id);
}
/**
* 查询订单信息表列表
*
* @param appletOrderItemDate 订单信息表
* @return 订单信息表
*/
@Override
public List<AppletOrderItemDate> selectAppletOrderItemDateList(AppletOrderItemDate appletOrderItemDate) {
return appletOrderItemDateMapper.selectList(appletOrderItemDate);
}
/**
* 新增订单信息表
*
* @param appletOrderItemDate 订单信息表
* @return 结果
*/
@Override
public int insertAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate) {
// appletOrderItemDate.setCreateTime(String.now());
return appletOrderItemDateMapper.insert(appletOrderItemDate);
}
/**
* 修改订单信息表
*
* @param appletOrderItemDate 订单信息表
* @return 结果
*/
@Override
public int updateAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate) {
// appletOrderItemDate.setUpdateTime(DateUtils.getNowDate());
return appletOrderItemDateMapper.update(appletOrderItemDate);
}
/**
* 批量删除订单信息表
*
* @param ids 需要删除的订单信息表主键
* @return 结果
*/
@Override
public int deleteAppletOrderItemDateByIds(Long[] ids) {
return appletOrderItemDateMapper.deleteByIds(ids);
}
/**
* 删除订单信息表信息
*
* @param id 订单信息表主键
* @return 结果
*/
@Override
public int deleteAppletOrderItemDateById(Long id) {
return appletOrderItemDateMapper.deleteById(id);
}
}

+ 194
- 0
ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml View File

@ -0,0 +1,194 @@
<?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">
<mapper namespace="com.ruoyi.model.mapper.AppletOrderItemDateLogMapper">
<resultMap type="AppletOrderItemDateLog" id="AppletOrderItemDateLogResult">
<result property="id" column="id"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="glovePhoto" column="glove_photo"/>
<result property="shoeCoverPhoto" column="shoe_cover_photo"/>
<result property="petPhoto" column="pet_photo"/>
<result property="teacherPhoto" column="teacher_photo"/>
<result property="grainBowlFront" column="grain_bowl_front"/>
<result property="grainBowlAfter" column="grain_bowl_after"/>
<result property="waterBowlFront" column="water_bowl_front"/>
<result property="waterBowlAfter" column="water_bowl_after"/>
<result property="basinFront" column="basin_front"/>
<result property="basinAfter" column="basin_after"/>
<result property="workDogImage" column="work_dog_image"/>
<result property="workPalyImage" column="work_paly_image"/>
<result property="notes" column="notes"/>
<result property="itemDateId" column="item_date_id"/>
<result property="itemOrderId" column="item_order_id"/>
<result property="orderId" column="order_id"/>
</resultMap>
<sql id="selectAppletOrderItemDateLogVo">
select id, create_time, create_by, update_time, update_by, glove_photo, shoe_cover_photo, pet_photo, teacher_photo, grain_bowl_front, grain_bowl_after, water_bowl_front, water_bowl_after, basin_front, basin_after, work_dog_image, work_paly_image, notes, item_date_id, item_order_id, order_id from applet_order_item_date_log
</sql>
<select id="selectList" parameterType="AppletOrderItemDateLog" resultMap="AppletOrderItemDateLogResult">
<include refid="selectAppletOrderItemDateLogVo"/>
<where>
<if test="glovePhoto != null and glovePhoto != ''"> and glove_photo = #{glovePhoto}</if>
<if test="shoeCoverPhoto != null and shoeCoverPhoto != ''"> and shoe_cover_photo = #{shoeCoverPhoto}</if>
<if test="petPhoto != null and petPhoto != ''"> and pet_photo = #{petPhoto}</if>
<if test="teacherPhoto != null and teacherPhoto != ''"> and teacher_photo = #{teacherPhoto}</if>
<if test="grainBowlFront != null and grainBowlFront != ''"> and grain_bowl_front = #{grainBowlFront}</if>
<if test="grainBowlAfter != null and grainBowlAfter != ''"> and grain_bowl_after = #{grainBowlAfter}</if>
<if test="waterBowlFront != null and waterBowlFront != ''"> and water_bowl_front = #{waterBowlFront}</if>
<if test="waterBowlAfter != null and waterBowlAfter != ''"> and water_bowl_after = #{waterBowlAfter}</if>
<if test="basinFront != null and basinFront != ''"> and basin_front = #{basinFront}</if>
<if test="basinAfter != null and basinAfter != ''"> and basin_after = #{basinAfter}</if>
<if test="workDogImage != null and workDogImage != ''"> and work_dog_image = #{workDogImage}</if>
<if test="workPalyImage != null and workPalyImage != ''"> and work_paly_image = #{workPalyImage}</if>
<if test="notes != null and notes != ''"> and notes = #{notes}</if>
<if test="itemDateId != null "> and item_date_id = #{itemDateId}</if>
<if test="itemOrderId != null "> and item_order_id = #{itemOrderId}</if>
<if test="orderId != null "> and order_id = #{orderId}</if>
</where>
</select>
<select id="selectById" parameterType="Long" resultMap="AppletOrderItemDateLogResult">
<include refid="selectAppletOrderItemDateLogVo"/>
where id = #{id}
</select>
<insert id="insert" parameterType="AppletOrderItemDateLog" useGeneratedKeys="true" keyProperty="id">
insert into applet_order_item_date_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="glovePhoto != null">glove_photo,</if>
<if test="shoeCoverPhoto != null">shoe_cover_photo,</if>
<if test="petPhoto != null">pet_photo,</if>
<if test="teacherPhoto != null">teacher_photo,</if>
<if test="grainBowlFront != null">grain_bowl_front,</if>
<if test="grainBowlAfter != null">grain_bowl_after,</if>
<if test="waterBowlFront != null">water_bowl_front,</if>
<if test="waterBowlAfter != null">water_bowl_after,</if>
<if test="basinFront != null">basin_front,</if>
<if test="basinAfter != null">basin_after,</if>
<if test="workDogImage != null">work_dog_image,</if>
<if test="workPalyImage != null">work_paly_image,</if>
<if test="notes != null">notes,</if>
<if test="itemDateId != null">item_date_id,</if>
<if test="itemOrderId != null">item_order_id,</if>
<if test="orderId != null">order_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="glovePhoto != null">#{glovePhoto},</if>
<if test="shoeCoverPhoto != null">#{shoeCoverPhoto},</if>
<if test="petPhoto != null">#{petPhoto},</if>
<if test="teacherPhoto != null">#{teacherPhoto},</if>
<if test="grainBowlFront != null">#{grainBowlFront},</if>
<if test="grainBowlAfter != null">#{grainBowlAfter},</if>
<if test="waterBowlFront != null">#{waterBowlFront},</if>
<if test="waterBowlAfter != null">#{waterBowlAfter},</if>
<if test="basinFront != null">#{basinFront},</if>
<if test="basinAfter != null">#{basinAfter},</if>
<if test="workDogImage != null">#{workDogImage},</if>
<if test="workPalyImage != null">#{workPalyImage},</if>
<if test="notes != null">#{notes},</if>
<if test="itemDateId != null">#{itemDateId},</if>
<if test="itemOrderId != null">#{itemOrderId},</if>
<if test="orderId != null">#{orderId},</if>
</trim>
</insert>
<update id="update" parameterType="AppletOrderItemDateLog">
update applet_order_item_date_log
<trim prefix="SET" suffixOverrides=",">
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="glovePhoto != null">glove_photo = #{glovePhoto},</if>
<if test="shoeCoverPhoto != null">shoe_cover_photo = #{shoeCoverPhoto},</if>
<if test="petPhoto != null">pet_photo = #{petPhoto},</if>
<if test="teacherPhoto != null">teacher_photo = #{teacherPhoto},</if>
<if test="grainBowlFront != null">grain_bowl_front = #{grainBowlFront},</if>
<if test="grainBowlAfter != null">grain_bowl_after = #{grainBowlAfter},</if>
<if test="waterBowlFront != null">water_bowl_front = #{waterBowlFront},</if>
<if test="waterBowlAfter != null">water_bowl_after = #{waterBowlAfter},</if>
<if test="basinFront != null">basin_front = #{basinFront},</if>
<if test="basinAfter != null">basin_after = #{basinAfter},</if>
<if test="workDogImage != null">work_dog_image = #{workDogImage},</if>
<if test="workPalyImage != null">work_paly_image = #{workPalyImage},</if>
<if test="notes != null">notes = #{notes},</if>
<if test="itemDateId != null">item_date_id = #{itemDateId},</if>
<if test="itemOrderId != null">item_order_id = #{itemOrderId},</if>
<if test="orderId != null">order_id = #{orderId},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteById" parameterType="Long">
delete from applet_order_item_date_log where id = #{id}
</delete>
<delete id="deleteByIds" parameterType="String">
delete from applet_order_item_date_log where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<insert id="insertOrUpdate" parameterType="AppletOrderItemDateLog" useGeneratedKeys="true" keyProperty="id">
insert into applet_order_item_date_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
create_time, create_by, update_time, update_by, glove_photo, shoe_cover_photo, pet_photo, teacher_photo, grain_bowl_front, grain_bowl_after, water_bowl_front, water_bowl_after, basin_front, basin_after, work_dog_image, work_paly_image, notes, item_date_id, item_order_id, order_id,
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id, jdbcType=BIGINT},
</if>
#{createTime, jdbcType=TIMESTAMP},#{createBy, jdbcType=INTEGER},#{updateTime, jdbcType=TIMESTAMP},#{updateBy, jdbcType=INTEGER},#{glovePhoto, jdbcType=VARCHAR},#{shoeCoverPhoto, jdbcType=VARCHAR},#{petPhoto, jdbcType=VARCHAR},#{teacherPhoto, jdbcType=VARCHAR},#{grainBowlFront, jdbcType=VARCHAR},#{grainBowlAfter, jdbcType=VARCHAR},#{waterBowlFront, jdbcType=VARCHAR},#{waterBowlAfter, jdbcType=VARCHAR},#{basinFront, jdbcType=VARCHAR},#{basinAfter, jdbcType=VARCHAR},#{workDogImage, jdbcType=VARCHAR},#{workPalyImage, jdbcType=VARCHAR},#{notes, jdbcType=VARCHAR},#{itemDateId, jdbcType=BIGINT},#{itemOrderId, jdbcType=BIGINT},#{orderId, jdbcType=BIGINT},
</trim>
on duplicate key update
<trim suffixOverrides=",">
<if test="id != null">
id = #{id,jdbcType=BIGINT},
</if>
create_time = #{createTime, jdbcType=TIMESTAMP},
create_by = #{createBy, jdbcType=INTEGER},
update_time = #{updateTime, jdbcType=TIMESTAMP},
update_by = #{updateBy, jdbcType=INTEGER},
glove_photo = #{glovePhoto, jdbcType=VARCHAR},
shoe_cover_photo = #{shoeCoverPhoto, jdbcType=VARCHAR},
pet_photo = #{petPhoto, jdbcType=VARCHAR},
teacher_photo = #{teacherPhoto, jdbcType=VARCHAR},
grain_bowl_front = #{grainBowlFront, jdbcType=VARCHAR},
grain_bowl_after = #{grainBowlAfter, jdbcType=VARCHAR},
water_bowl_front = #{waterBowlFront, jdbcType=VARCHAR},
water_bowl_after = #{waterBowlAfter, jdbcType=VARCHAR},
basin_front = #{basinFront, jdbcType=VARCHAR},
basin_after = #{basinAfter, jdbcType=VARCHAR},
work_dog_image = #{workDogImage, jdbcType=VARCHAR},
work_paly_image = #{workPalyImage, jdbcType=VARCHAR},
notes = #{notes, jdbcType=VARCHAR},
item_date_id = #{itemDateId, jdbcType=BIGINT},
item_order_id = #{itemOrderId, jdbcType=BIGINT},
order_id = #{orderId, jdbcType=BIGINT},
</trim>
</insert>
</mapper>

+ 139
- 0
ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml View File

@ -0,0 +1,139 @@
<?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">
<mapper namespace="com.ruoyi.model.mapper.AppletOrderItemDateMapper">
<resultMap type="AppletOrderItemDate" id="AppletOrderItemDateResult">
<result property="id" column="id"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="serviceDate" column="service_date"/>
<result property="status" column="status"/>
<result property="appletOrderId" column="applet_order_id"/>
<result property="orderId" column="order_id"/>
<result property="orderSn" column="order_sn"/>
<result property="cityAddress" column="city_address"/>
<result property="address" column="address"/>
</resultMap>
<sql id="selectAppletOrderItemDateVo">
select id, create_time, create_by, update_time, update_by, service_date, status, applet_order_id, order_id, order_sn, city_address, address from applet_order_item_date
</sql>
<select id="selectList" parameterType="AppletOrderItemDate" resultMap="AppletOrderItemDateResult">
<include refid="selectAppletOrderItemDateVo"/>
<where>
<if test="serviceDate != null and serviceDate != ''"> and service_date = #{serviceDate}</if>
<if test="status != null "> and status = #{status}</if>
<if test="appletOrderId != null "> and applet_order_id = #{appletOrderId}</if>
<if test="orderId != null "> and order_id = #{orderId}</if>
<if test="orderSn != null and orderSn != ''"> and order_sn = #{orderSn}</if>
<if test="cityAddress != null and cityAddress != ''"> and city_address = #{cityAddress}</if>
<if test="address != null and address != ''"> and address = #{address}</if>
</where>
</select>
<select id="selectById" parameterType="Long" resultMap="AppletOrderItemDateResult">
<include refid="selectAppletOrderItemDateVo"/>
where id = #{id}
</select>
<insert id="insert" parameterType="AppletOrderItemDate" useGeneratedKeys="true" keyProperty="id">
insert into applet_order_item_date
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="serviceDate != null">service_date,</if>
<if test="status != null">status,</if>
<if test="appletOrderId != null">applet_order_id,</if>
<if test="orderId != null">order_id,</if>
<if test="orderSn != null">order_sn,</if>
<if test="cityAddress != null">city_address,</if>
<if test="address != null">address,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="serviceDate != null">#{serviceDate},</if>
<if test="status != null">#{status},</if>
<if test="appletOrderId != null">#{appletOrderId},</if>
<if test="orderId != null">#{orderId},</if>
<if test="orderSn != null">#{orderSn},</if>
<if test="cityAddress != null">#{cityAddress},</if>
<if test="address != null">#{address},</if>
</trim>
</insert>
<update id="update" parameterType="AppletOrderItemDate">
update applet_order_item_date
<trim prefix="SET" suffixOverrides=",">
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="serviceDate != null">service_date = #{serviceDate},</if>
<if test="status != null">status = #{status},</if>
<if test="appletOrderId != null">applet_order_id = #{appletOrderId},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="orderSn != null">order_sn = #{orderSn},</if>
<if test="cityAddress != null">city_address = #{cityAddress},</if>
<if test="address != null">address = #{address},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteById" parameterType="Long">
delete from applet_order_item_date where id = #{id}
</delete>
<delete id="deleteByIds" parameterType="String">
delete from applet_order_item_date where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<insert id="insertOrUpdate" parameterType="AppletOrderItemDate" useGeneratedKeys="true" keyProperty="id">
insert into applet_order_item_date
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
create_time, create_by, update_time, update_by, service_date, status, applet_order_id, order_id, order_sn, city_address, address,
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id, jdbcType=BIGINT},
</if>
#{createTime, jdbcType=TIMESTAMP},#{createBy, jdbcType=INTEGER},#{updateTime, jdbcType=TIMESTAMP},#{updateBy, jdbcType=INTEGER},#{serviceDate, jdbcType=VARCHAR},#{status, jdbcType=INTEGER},#{appletOrderId, jdbcType=BIGINT},#{orderId, jdbcType=BIGINT},#{orderSn, jdbcType=VARCHAR},#{cityAddress, jdbcType=VARCHAR},#{address, jdbcType=VARCHAR},
</trim>
on duplicate key update
<trim suffixOverrides=",">
<if test="id != null">
id = #{id,jdbcType=BIGINT},
</if>
create_time = #{createTime, jdbcType=TIMESTAMP},
create_by = #{createBy, jdbcType=INTEGER},
update_time = #{updateTime, jdbcType=TIMESTAMP},
update_by = #{updateBy, jdbcType=INTEGER},
service_date = #{serviceDate, jdbcType=VARCHAR},
status = #{status, jdbcType=INTEGER},
applet_order_id = #{appletOrderId, jdbcType=BIGINT},
order_id = #{orderId, jdbcType=BIGINT},
order_sn = #{orderSn, jdbcType=VARCHAR},
city_address = #{cityAddress, jdbcType=VARCHAR},
address = #{address, jdbcType=VARCHAR},
</trim>
</insert>
</mapper>

Loading…
Cancel
Save