修复

CatmDogd-Mall-Front-test/src/api/model/AppletAddress.js

@@ -10,9 +10,9 @@ export function listAppletAddress(query) {
 }
 
 // 查询地址信息详细
-export function getAppletAddress(area) {
+export function getAppletAddress(id) {
   return request({
-    url: '/model/AppletAddress/' + area,
+    url: '/model/AppletAddress/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletAddress(data) {
 }
 
 // 删除地址信息
-export function delAppletAddress(area) {
+export function delAppletAddress(id) {
   return request({
-    url: '/model/AppletAddress/' + area,
+    url: '/model/AppletAddress/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletAmountLog.js

@@ -10,9 +10,9 @@ export function listAppletAmountLog(query) {
 }
 
 // 查询金额明细详细
-export function getAppletAmountLog(title) {
+export function getAppletAmountLog(id) {
   return request({
-    url: '/model/AppletAmountLog/' + title,
+    url: '/model/AppletAmountLog/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletAmountLog(data) {
 }
 
 // 删除金额明细
-export function delAppletAmountLog(title) {
+export function delAppletAmountLog(id) {
   return request({
-    url: '/model/AppletAmountLog/' + title,
+    url: '/model/AppletAmountLog/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletAnswer.js

@@ -10,9 +10,9 @@ export function listAppletAnswer(query) {
 }
 
 // 查询基本考核答案详细
-export function getAppletAnswer(title) {
+export function getAppletAnswer(id) {
   return request({
-    url: '/model/AppletAnswer/' + title,
+    url: '/model/AppletAnswer/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletAnswer(data) {
 }
 
 // 删除基本考核答案
-export function delAppletAnswer(title) {
+export function delAppletAnswer(id) {
   return request({
-    url: '/model/AppletAnswer/' + title,
+    url: '/model/AppletAnswer/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletQuestion.js

@@ -10,9 +10,9 @@ export function listAppletQuestion(query) {
 }
 
 // 查询考核题库详细
-export function getAppletQuestion(title) {
+export function getAppletQuestion(id) {
   return request({
-    url: '/model/AppletQuestion/' + title,
+    url: '/model/AppletQuestion/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletQuestion(data) {
 }
 
 // 删除考核题库
-export function delAppletQuestion(title) {
+export function delAppletQuestion(id) {
   return request({
-    url: '/model/AppletQuestion/' + title,
+    url: '/model/AppletQuestion/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletService.js

@@ -10,9 +10,9 @@ export function listAppletService(query) {
 }
 
 // 查询平台&服务介绍信息详细
-export function getAppletService(title) {
+export function getAppletService(id) {
   return request({
-    url: '/model/AppletService/' + title,
+    url: '/model/AppletService/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletService(data) {
 }
 
 // 删除平台&服务介绍信息
-export function delAppletService(title) {
+export function delAppletService(id) {
   return request({
-    url: '/model/AppletService/' + title,
+    url: '/model/AppletService/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletServiceDate.js

@@ -10,9 +10,9 @@ export function listAppletServiceDate(query) {
 }
 
 // 查询服务日期详细
-export function getAppletServiceDate(date) {
+export function getAppletServiceDate(id) {
   return request({
-    url: '/model/AppletServiceDate/' + date,
+    url: '/model/AppletServiceDate/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletServiceDate(data) {
 }
 
 // 删除服务日期
-export function delAppletServiceDate(date) {
+export function delAppletServiceDate(id) {
   return request({
-    url: '/model/AppletServiceDate/' + date,
+    url: '/model/AppletServiceDate/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletServiceLog.js

@@ -10,9 +10,9 @@ export function listAppletServiceLog(query) {
 }
 
 // 查询服务记录详细
-export function getAppletServiceLog(serviceType) {
+export function getAppletServiceLog(id) {
   return request({
-    url: '/model/AppletServiceLog/' + serviceType,
+    url: '/model/AppletServiceLog/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletServiceLog(data) {
 }
 
 // 删除服务记录
-export function delAppletServiceLog(serviceType) {
+export function delAppletServiceLog(id) {
   return request({
-    url: '/model/AppletServiceLog/' + serviceType,
+    url: '/model/AppletServiceLog/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletTrain.js

@@ -10,9 +10,9 @@ export function listAppletTrain(query) {
 }
 
 // 查询服务培训详细
-export function getAppletTrain(title) {
+export function getAppletTrain(id) {
   return request({
-    url: '/model/AppletTrain/' + title,
+    url: '/model/AppletTrain/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletTrain(data) {
 }
 
 // 删除服务培训
-export function delAppletTrain(title) {
+export function delAppletTrain(id) {
   return request({
-    url: '/model/AppletTrain/' + title,
+    url: '/model/AppletTrain/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletUser1.js

@@ -10,9 +10,9 @@ export function listAppletUser1(query) {
 }
 
 // 查询伴宠师信息详细
-export function getAppletUser1(name) {
+export function getAppletUser1(id) {
   return request({
-    url: '/model/AppletUser1/' + name,
+    url: '/model/AppletUser1/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletUser1(data) {
 }
 
 // 删除伴宠师信息
-export function delAppletUser1(name) {
+export function delAppletUser1(id) {
   return request({
-    url: '/model/AppletUser1/' + name,
+    url: '/model/AppletUser1/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/api/model/AppletUser2.js

@@ -10,9 +10,9 @@ export function listAppletUser2(query) {
 }
 
 // 查询用户服务信息详细
-export function getAppletUser2(headImage) {
+export function getAppletUser2(id) {
   return request({
-    url: '/model/AppletUser2/' + headImage,
+    url: '/model/AppletUser2/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletUser2(data) {
 }
 
 // 删除用户服务信息
-export function delAppletUser2(headImage) {
+export function delAppletUser2(id) {
   return request({
-    url: '/model/AppletUser2/' + headImage,
+    url: '/model/AppletUser2/' + id,
     method: 'delete'
   })
 }

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletAddress/index.vue

@@ -0,0 +1,369 @@
+<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="area">
+        <el-input
+          v-model="queryParams.area"
+          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 label="接单状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择接单状态" clearable size="small">
+        </el-select>
+      </el-form-item>
+      <el-form-item label="接单范围" prop="range">
+        <el-input
+          v-model="queryParams.range"
+          placeholder="请输入接单范围"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="${comment}" prop="outDate">
+        <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.outDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择${comment}">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="关联用户id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入关联用户id"
+          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:AppletAddress: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:AppletAddress: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:AppletAddress: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:AppletAddress:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletAddressList" @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="area" v-if="columns[0].visible"/>
+      <el-table-column label="详细地址" align="center" prop="address" v-if="columns[1].visible"/>
+      <el-table-column label="接单状态" align="center" prop="status" v-if="columns[2].visible"/>
+      <el-table-column label="接单范围" align="center" prop="range" v-if="columns[3].visible"/>
+      <el-table-column label="${comment}" align="center" prop="outDate" width="180" v-if="columns[4].visible">
+        <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.outDate, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联用户id" align="center" prop="userId" v-if="columns[5].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:AppletAddress:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletAddress: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="area">
+          <el-input v-model="form.area" placeholder="请输入接单地址" />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址" />
+        </el-form-item>
+        <el-form-item label="接单范围" prop="range">
+          <el-input v-model="form.range" placeholder="请输入接单范围" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="outDate">
+          <el-date-picker clearable size="small"
+                        v-model="form.outDate"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="关联用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入关联用户id" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletAddress, getAppletAddress, delAppletAddress, addAppletAddress, updateAppletAddress, exportAppletAddress } from "@/api/model/AppletAddress";
+
+export default {
+  name: "AppletAddress",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 地址信息表格数据
+      AppletAddressList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        area: null,
+
+        address: null,
+
+        status: null,
+
+        range: null,
+
+        outDate: null,
+
+        userId: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "接单地址", visible:  true  },
+    { key: 2, label: "详细地址", visible:  true  },
+    { key: 3, label: "接单状态", visible:  true  },
+    { key: 4, label: "接单范围", visible:  true  },
+    { key: 5, label: "$column.columnComment", visible:  true  },
+    { key: 6, label: "关联用户id", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询地址信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletAddress(this.queryParams).then(response => {
+        this.AppletAddressList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        area: null,
+
+        address: null,
+
+        status: "0",
+
+        range: null,
+
+        outDate: null,
+
+        userId: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletAddress(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) {
+            updateAppletAddress(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletAddress(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 delAppletAddress(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有地址信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletAddress(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletAmountLog/index.vue

@@ -0,0 +1,317 @@
+<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="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="金额" prop="amount">
+        <el-input
+          v-model="queryParams.amount"
+          placeholder="请输入金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
+        </el-select>
+      </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:AppletAmountLog: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:AppletAmountLog: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:AppletAmountLog: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:AppletAmountLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletAmountLogList" @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="title" v-if="columns[0].visible"/>
+      <el-table-column label="金额" align="center" prop="amount" v-if="columns[1].visible"/>
+      <el-table-column label="类型" align="center" prop="type" v-if="columns[2].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:AppletAmountLog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletAmountLog: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="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入金额" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletAmountLog, getAppletAmountLog, delAppletAmountLog, addAppletAmountLog, updateAppletAmountLog, exportAppletAmountLog } from "@/api/model/AppletAmountLog";
+
+export default {
+  name: "AppletAmountLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 金额明细表格数据
+      AppletAmountLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+
+        amount: null,
+
+        type: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+
+        amount: [
+          { required: true, message: "金额不能为空", trigger: "blur" }
+        ],
+
+        type: [
+          { required: true, message: "类型不能为空", trigger: "change" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "标题", visible:  true  },
+    { key: 2, label: "金额", visible:  true  },
+    { key: 3, label: "类型", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询金额明细列表 */
+    getList() {
+      this.loading = true;
+      listAppletAmountLog(this.queryParams).then(response => {
+        this.AppletAmountLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        title: null,
+
+        amount: null,
+
+        type: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletAmountLog(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) {
+            updateAppletAmountLog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletAmountLog(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 delAppletAmountLog(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有金额明细数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletAmountLog(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletAnswer/index.vue

@@ -0,0 +1,338 @@
+<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="isTrue">
+        <el-input
+          v-model="queryParams.isTrue"
+          placeholder="请输入是否正确答案"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排序编号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          placeholder="请输入排序编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="关联题目ID" prop="questionId">
+        <el-input
+          v-model="queryParams.questionId"
+          placeholder="请输入关联题目ID"
+          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:AppletAnswer: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:AppletAnswer: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:AppletAnswer: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:AppletAnswer:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletAnswerList" @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="title" v-if="columns[0].visible"/>
+      <el-table-column label="是否正确答案" align="center" prop="isTrue" v-if="columns[1].visible"/>
+      <el-table-column label="排序编号" align="center" prop="orderNo" v-if="columns[2].visible"/>
+      <el-table-column label="关联题目ID" align="center" prop="questionId" v-if="columns[3].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:AppletAnswer:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletAnswer: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="title">
+          <el-input v-model="form.title" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="是否正确答案" prop="isTrue">
+          <el-input v-model="form.isTrue" placeholder="请输入是否正确答案" />
+        </el-form-item>
+        <el-form-item label="排序编号" prop="orderNo">
+          <el-input v-model="form.orderNo" placeholder="请输入排序编号" />
+        </el-form-item>
+        <el-form-item label="关联题目ID" prop="questionId">
+          <el-input v-model="form.questionId" placeholder="请输入关联题目ID" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletAnswer, getAppletAnswer, delAppletAnswer, addAppletAnswer, updateAppletAnswer, exportAppletAnswer } from "@/api/model/AppletAnswer";
+
+export default {
+  name: "AppletAnswer",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 基本考核答案表格数据
+      AppletAnswerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+
+        isTrue: null,
+
+        orderNo: null,
+
+        questionId: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "答案内容不能为空", trigger: "blur" }
+        ],
+
+        isTrue: [
+          { required: true, message: "是否正确答案不能为空", trigger: "blur" }
+        ],
+
+        orderNo: [
+          { required: true, message: "排序编号不能为空", trigger: "blur" }
+        ],
+
+        questionId: [
+          { required: true, message: "关联题目ID不能为空", trigger: "blur" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "答案内容", visible:  true  },
+    { key: 2, label: "是否正确答案", visible:  true  },
+    { key: 3, label: "排序编号", visible:  true  },
+    { key: 4, label: "关联题目ID", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询基本考核答案列表 */
+    getList() {
+      this.loading = true;
+      listAppletAnswer(this.queryParams).then(response => {
+        this.AppletAnswerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        title: null,
+
+        isTrue: null,
+
+        orderNo: null,
+
+        questionId: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletAnswer(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) {
+            updateAppletAnswer(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletAnswer(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 delAppletAnswer(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有基本考核答案数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletAnswer(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletQuestion/index.vue

@@ -0,0 +1,317 @@
+<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="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入题目标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="题目类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择题目类型" clearable size="small">
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排序编号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          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:AppletQuestion: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:AppletQuestion: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:AppletQuestion: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:AppletQuestion:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletQuestionList" @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="title" v-if="columns[0].visible"/>
+      <el-table-column label="题目类型" align="center" prop="type" v-if="columns[1].visible"/>
+      <el-table-column label="排序编号" align="center" prop="orderNo" v-if="columns[2].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:AppletQuestion:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletQuestion: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="title">
+          <el-input v-model="form.title" placeholder="请输入题目标题" />
+        </el-form-item>
+        <el-form-item label="排序编号" prop="orderNo">
+          <el-input v-model="form.orderNo" placeholder="请输入排序编号" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletQuestion, getAppletQuestion, delAppletQuestion, addAppletQuestion, updateAppletQuestion, exportAppletQuestion } from "@/api/model/AppletQuestion";
+
+export default {
+  name: "AppletQuestion",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 考核题库表格数据
+      AppletQuestionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+
+        type: null,
+
+        orderNo: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "题目标题不能为空", trigger: "blur" }
+        ],
+
+        type: [
+          { required: true, message: "题目类型不能为空", trigger: "change" }
+        ],
+
+        orderNo: [
+          { required: true, message: "排序编号不能为空", trigger: "blur" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "题目标题", visible:  true  },
+    { key: 2, label: "题目类型", visible:  true  },
+    { key: 3, label: "排序编号", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询考核题库列表 */
+    getList() {
+      this.loading = true;
+      listAppletQuestion(this.queryParams).then(response => {
+        this.AppletQuestionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        title: null,
+
+        type: null,
+
+        orderNo: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletQuestion(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) {
+            updateAppletQuestion(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletQuestion(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 delAppletQuestion(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有考核题库数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletQuestion(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletService/index.vue

@@ -0,0 +1,299 @@
+<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="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="视频" prop="video">
+        <el-input
+          v-model="queryParams.video"
+          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:AppletService: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:AppletService: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:AppletService: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:AppletService:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletServiceList" @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="title" v-if="columns[0].visible"/>
+      <el-table-column label="视频" align="center" prop="video" v-if="columns[1].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:AppletService:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletService: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="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="视频" prop="video">
+          <el-input v-model="form.video" placeholder="请输入视频" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletService, getAppletService, delAppletService, addAppletService, updateAppletService, exportAppletService } from "@/api/model/AppletService";
+
+export default {
+  name: "AppletService",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 平台&服务介绍信息表格数据
+      AppletServiceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+
+        video: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "标题", visible:  true  },
+    { key: 2, label: "视频", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询平台&服务介绍信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletService(this.queryParams).then(response => {
+        this.AppletServiceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        title: null,
+
+        video: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletService(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) {
+            updateAppletService(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletService(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 delAppletService(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有平台&服务介绍信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletService(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletServiceDate/index.vue

@@ -0,0 +1,326 @@
+<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="date">
+        <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.date"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择服务日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="关联订单ID" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入关联订单ID"
+          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:AppletServiceDate: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:AppletServiceDate: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:AppletServiceDate: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:AppletServiceDate:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletServiceDateList" @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="date" width="180" v-if="columns[0].visible">
+        <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.date, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="服务内容" align="center" prop="details" v-if="columns[1].visible"/>
+      <el-table-column label="关联订单ID" align="center" prop="orderId" v-if="columns[2].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:AppletServiceDate:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletServiceDate: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="date">
+          <el-date-picker clearable size="small"
+                        v-model="form.date"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择服务日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="服务内容" prop="details">
+          <el-input v-model="form.details" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="关联订单ID" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入关联订单ID" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletServiceDate, getAppletServiceDate, delAppletServiceDate, addAppletServiceDate, updateAppletServiceDate, exportAppletServiceDate } from "@/api/model/AppletServiceDate";
+
+export default {
+  name: "AppletServiceDate",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务日期表格数据
+      AppletServiceDateList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        date: null,
+
+        details: null,
+
+        orderId: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        date: [
+          { required: true, message: "服务日期不能为空", trigger: "blur" }
+        ],
+
+        details: [
+          { required: true, message: "服务内容不能为空", trigger: "blur" }
+        ],
+
+        orderId: [
+          { required: true, message: "关联订单ID不能为空", trigger: "blur" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "服务日期", visible:  true  },
+    { key: 2, label: "服务内容", visible:  true  },
+    { key: 3, label: "关联订单ID", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询服务日期列表 */
+    getList() {
+      this.loading = true;
+      listAppletServiceDate(this.queryParams).then(response => {
+        this.AppletServiceDateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        date: null,
+
+        details: null,
+
+        orderId: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletServiceDate(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) {
+            updateAppletServiceDate(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletServiceDate(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 delAppletServiceDate(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有服务日期数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletServiceDate(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletServiceLog/index.vue

@@ -0,0 +1,345 @@
+<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="serviceType">
+        <el-select v-model="queryParams.serviceType" placeholder="请选择服务类型" clearable size="small">
+        </el-select>
+      </el-form-item>
+      <el-form-item label="服务时间" prop="serviceTime">
+        <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.serviceTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择服务时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="服务地点" prop="serviceSpot">
+        <el-input
+          v-model="queryParams.serviceSpot"
+          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:AppletServiceLog: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:AppletServiceLog: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:AppletServiceLog: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:AppletServiceLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletServiceLogList" @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="serviceType" v-if="columns[0].visible"/>
+      <el-table-column label="服务时间" align="center" prop="serviceTime" width="180" v-if="columns[1].visible">
+        <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.serviceTime, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="服务地点" align="center" prop="serviceSpot" v-if="columns[2].visible"/>
+      <el-table-column label="文字记录" align="center" prop="text" v-if="columns[3].visible"/>
+      <el-table-column label="图片记录" align="center" prop="image" v-if="columns[4].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:AppletServiceLog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletServiceLog: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="serviceTime">
+          <el-date-picker clearable size="small"
+                        v-model="form.serviceTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择服务时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="服务地点" prop="serviceSpot">
+          <el-input v-model="form.serviceSpot" placeholder="请输入服务地点" />
+        </el-form-item>
+        <el-form-item label="文字记录" prop="text">
+          <el-input v-model="form.text" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="图片记录">
+          <imageUpload v-model="form.image"/>
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletServiceLog, getAppletServiceLog, delAppletServiceLog, addAppletServiceLog, updateAppletServiceLog, exportAppletServiceLog } from "@/api/model/AppletServiceLog";
+
+export default {
+  name: "AppletServiceLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务记录表格数据
+      AppletServiceLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        serviceType: null,
+
+        serviceTime: null,
+
+        serviceSpot: null,
+
+        text: null,
+
+        image: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        serviceType: [
+          { required: true, message: "服务类型不能为空", trigger: "change" }
+        ],
+
+        serviceTime: [
+          { required: true, message: "服务时间不能为空", trigger: "blur" }
+        ],
+
+        serviceSpot: [
+          { required: true, message: "服务地点不能为空", trigger: "blur" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "服务类型", visible:  true  },
+    { key: 2, label: "服务时间", visible:  true  },
+    { key: 3, label: "服务地点", visible:  true  },
+    { key: 4, label: "文字记录", visible:  true  },
+    { key: 5, label: "图片记录", visible:  false  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询服务记录列表 */
+    getList() {
+      this.loading = true;
+      listAppletServiceLog(this.queryParams).then(response => {
+        this.AppletServiceLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        serviceType: null,
+
+        serviceTime: null,
+
+        serviceSpot: null,
+
+        text: null,
+
+        image: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletServiceLog(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) {
+            updateAppletServiceLog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletServiceLog(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 delAppletServiceLog(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有服务记录数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletServiceLog(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletTrain/index.vue

@@ -0,0 +1,294 @@
+<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="title">
+        <el-input
+          v-model="queryParams.title"
+          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:AppletTrain: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:AppletTrain: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:AppletTrain: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:AppletTrain:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletTrainList" @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="title" v-if="columns[0].visible"/>
+      <el-table-column label="培训内容" align="center" prop="content" v-if="columns[1].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:AppletTrain:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletTrain: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="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="培训内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletTrain, getAppletTrain, delAppletTrain, addAppletTrain, updateAppletTrain, exportAppletTrain } from "@/api/model/AppletTrain";
+
+export default {
+  name: "AppletTrain",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务培训表格数据
+      AppletTrainList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+
+        content: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+
+        content: [
+          { required: true, message: "培训内容不能为空", trigger: "blur" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "标题", visible:  true  },
+    { key: 2, label: "培训内容", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询服务培训列表 */
+    getList() {
+      this.loading = true;
+      listAppletTrain(this.queryParams).then(response => {
+        this.AppletTrainList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        title: null,
+
+        content: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletTrain(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) {
+            updateAppletTrain(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletTrain(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 delAppletTrain(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有服务培训数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletTrain(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppletUser1/index.vue → CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletUser1/index.vue

@@ -50,6 +50,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <template v-if="showMoreCondition">
       <el-form-item label="个人宠物类型" prop="petTypeId">
         <el-input
           v-model="queryParams.petTypeId"
@@ -179,6 +180,7 @@
 
     <el-table v-loading="loading" :data="AppletUser1List" @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="name" v-if="columns[0].visible"/>
       <el-table-column label="身份证号" align="center" prop="cerNo" v-if="columns[1].visible"/>
       <el-table-column label="性别" align="center" prop="sex" v-if="columns[2].visible"/>
@@ -222,7 +224,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -412,22 +414,22 @@ export default {
 
       },
       columns: [
-    { key: 0, label: "姓名", visible:  true  },
-    { key: 1, label: "身份证号", visible:  true  },
-    { key: 2, label: "性别", visible:  true  },
-    { key: 3, label: "年龄", visible:  true  },
-    { key: 4, label: "手机号", visible:  true  },
-    { key: 5, label: "养宠经验", visible:  true  },
-    { key: 6, label: "是否有专业执照", visible:  true  },
-    { key: 7, label: "专业执照图片", visible:  false  },
-    { 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: 1, label: "姓名", visible:  true  },
+    { key: 2, label: "身份证号", visible:  true  },
+    { key: 3, label: "性别", visible:  true  },
+    { key: 4, label: "年龄", visible:  true  },
+    { key: 5, label: "手机号", visible:  true  },
+    { key: 6, label: "养宠经验", visible:  true  },
+    { key: 7, label: "是否有专业执照", visible:  true  },
+    { key: 8, label: "专业执照图片", visible:  false  },
+    { 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  },
      ],
     };
   },
@@ -452,6 +454,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         name: null,
 
         cerNo: null,
@@ -499,7 +503,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.name)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -512,8 +516,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const name = row.name || this.ids
-      getAppletUser1(name).then(response => {
+      const id = row.id || this.ids
+      getAppletUser1(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改伴宠师信息";
@@ -523,7 +527,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.name != null) {
+          if (this.form.id != null) {
             updateAppletUser1(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -541,9 +545,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const names = row.name || this.ids;
-      this.$modal.confirm('是否确认删除伴宠师信息编号为"' + names + '"的数据项？').then(function() {
-        return delAppletUser1(names);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除伴宠师信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletUser1(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

CatmDogd-Mall-Front-test/src/views/model/AppCheckImageType/AppletUser2/index.vue

@@ -0,0 +1,381 @@
+<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="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
+        </el-select>
+      </el-form-item>
+      <el-form-item label="服务宠物类型" prop="petTypeId">
+        <el-input
+          v-model="queryParams.petTypeId"
+          placeholder="请输入服务宠物类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <template v-if="showMoreCondition">
+      <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:AppletUser2: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:AppletUser2: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:AppletUser2: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:AppletUser2:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletUser2List" @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="headImage" v-if="columns[0].visible"/>
+      <el-table-column label="昵称" align="center" prop="nickName" v-if="columns[1].visible"/>
+      <el-table-column label="手机号" align="center" prop="phone" v-if="columns[2].visible"/>
+      <el-table-column label="性别" align="center" prop="sex" v-if="columns[3].visible"/>
+      <el-table-column label="个人简介" align="center" prop="brief" v-if="columns[4].visible"/>
+      <el-table-column label="养宠经验" align="center" prop="experience" v-if="columns[5].visible"/>
+      <el-table-column label="服务宠物类型" align="center" prop="petTypeId" v-if="columns[6].visible"/>
+      <el-table-column label="基础服务" align="center" prop="serviceBase" v-if="columns[7].visible"/>
+      <el-table-column label="增值服务" align="center" prop="serviceIncrease" v-if="columns[8].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:AppletUser2:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletUser2: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="头像">
+          <imageUpload v-model="form.headImage"/>
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入昵称" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="个人简介" prop="brief">
+          <el-input v-model="form.brief" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="养宠经验" prop="experience">
+          <el-input v-model="form.experience" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="服务宠物类型" prop="petTypeId">
+          <el-input v-model="form.petTypeId" placeholder="请输入服务宠物类型" />
+        </el-form-item>
+        <el-form-item label="基础服务" prop="serviceBase">
+          <el-input v-model="form.serviceBase" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="增值服务" prop="serviceIncrease">
+          <el-input v-model="form.serviceIncrease" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" 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 { listAppletUser2, getAppletUser2, delAppletUser2, addAppletUser2, updateAppletUser2, exportAppletUser2 } from "@/api/model/AppletUser2";
+
+export default {
+  name: "AppletUser2",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户服务信息表格数据
+      AppletUser2List: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        headImage: null,
+
+        nickName: null,
+
+        phone: null,
+
+        sex: null,
+
+        brief: null,
+
+        experience: null,
+
+        petTypeId: null,
+
+        serviceBase: null,
+
+        serviceIncrease: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "昵称不能为空", trigger: "blur" }
+        ],
+
+        phone: [
+          { required: true, message: "手机号不能为空", trigger: "blur" }
+        ],
+
+        sex: [
+          { required: true, message: "性别不能为空", trigger: "change" }
+        ],
+
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "头像", visible:  false  },
+    { key: 2, label: "昵称", visible:  true  },
+    { key: 3, label: "手机号", visible:  true  },
+    { key: 4, label: "性别", visible:  true  },
+    { 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  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户服务信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletUser2(this.queryParams).then(response => {
+        this.AppletUser2List = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        headImage: null,
+
+        nickName: null,
+
+        phone: null,
+
+        sex: null,
+
+        brief: null,
+
+        experience: null,
+
+        petTypeId: null,
+
+        serviceBase: null,
+
+        serviceIncrease: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: 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
+      getAppletUser2(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) {
+            updateAppletUser2(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletUser2(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 delAppletUser2(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有用户服务信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletUser2(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "pet-admin",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletAddressController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 地址信息Controller
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @RestController
 @RequestMapping("/model/AppletAddress")
@@ -47,26 +46,27 @@ public class AppletAddressController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出地址信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('model:AppletAddress:export')")
-    @Log(title = "地址信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletAddress appletAddress) throws IOException {
-        List<AppletAddress> list = appletAddressService.selectAppletAddressList(appletAddress);
-        ExcelUtil<AppletAddress> util = new ExcelUtil<AppletAddress>(AppletAddress.class);
-        util.exportExcel(response, list, "地址信息数据");
-    }
+//    /**
+//     * 导出地址信息列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('model:AppletAddress:export')")
+//    @Log(title = "地址信息", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, AppletAddress appletAddress)
+//    {
+//        List<AppletAddress> list = appletAddressService.selectAppletAddressList(appletAddress);
+//        ExcelUtil<AppletAddress> util = new ExcelUtil<AppletAddress>(AppletAddress.class);
+//        util.exportExcel(response, list, "地址信息数据");
+//    }
 
     /**
      * 获取地址信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAddress:query')")
-    @GetMapping(value = "/{area}")
-    public AjaxResult getInfo(@PathVariable("area") String area)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletAddressService.selectAppletAddressByArea(area));
+        return success(appletAddressService.selectAppletAddressById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletAddressController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAddress:remove')")
     @Log(title = "地址信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{areas}")
-    public AjaxResult remove(@PathVariable String[] areas)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletAddressService.deleteAppletAddressByAreas(areas));
+        return toAjax(appletAddressService.deleteAppletAddressByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletAmountLogController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -53,20 +52,21 @@ public class AppletAmountLogController extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletAmountLog:export')")
     @Log(title = "金额明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletAmountLog appletAmountLog) throws IOException {
-        List<AppletAmountLog> list = appletAmountLogService.selectAppletAmountLogList(appletAmountLog);
-        ExcelUtil<AppletAmountLog> util = new ExcelUtil<AppletAmountLog>(AppletAmountLog.class);
-        util.exportExcel(response, list, "金额明细数据");
+    public void export(HttpServletResponse response, AppletAmountLog appletAmountLog)
+    {
+//        List<AppletAmountLog> list = appletAmountLogService.selectAppletAmountLogList(appletAmountLog);
+//        ExcelUtil<AppletAmountLog> util = new ExcelUtil<AppletAmountLog>(AppletAmountLog.class);
+//        util.exportExcel(response, list, "金额明细数据");
     }
 
     /**
      * 获取金额明细详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAmountLog:query')")
-    @GetMapping(value = "/{title}")
-    public AjaxResult getInfo(@PathVariable("title") String title)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletAmountLogService.selectAppletAmountLogByTitle(title));
+        return success(appletAmountLogService.selectAppletAmountLogById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletAmountLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAmountLog:remove')")
     @Log(title = "金额明细", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{titles}")
-    public AjaxResult remove(@PathVariable String[] titles)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletAmountLogService.deleteAppletAmountLogByTitles(titles));
+        return toAjax(appletAmountLogService.deleteAppletAmountLogByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletAnswerController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 基本考核答案Controller
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @RestController
 @RequestMapping("/model/AppletAnswer")
@@ -53,20 +52,21 @@ public class AppletAnswerController extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletAnswer:export')")
     @Log(title = "基本考核答案", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletAnswer appletAnswer) throws IOException {
-        List<AppletAnswer> list = appletAnswerService.selectAppletAnswerList(appletAnswer);
-        ExcelUtil<AppletAnswer> util = new ExcelUtil<AppletAnswer>(AppletAnswer.class);
-        util.exportExcel(response, list, "基本考核答案数据");
+    public void export(HttpServletResponse response, AppletAnswer appletAnswer)
+    {
+//        List<AppletAnswer> list = appletAnswerService.selectAppletAnswerList(appletAnswer);
+//        ExcelUtil<AppletAnswer> util = new ExcelUtil<AppletAnswer>(AppletAnswer.class);
+//        util.exportExcel(response, list, "基本考核答案数据");
     }
 
     /**
      * 获取基本考核答案详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAnswer:query')")
-    @GetMapping(value = "/{title}")
-    public AjaxResult getInfo(@PathVariable("title") String title)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletAnswerService.selectAppletAnswerByTitle(title));
+        return success(appletAnswerService.selectAppletAnswerById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletAnswerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAnswer:remove')")
     @Log(title = "基本考核答案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{titles}")
-    public AjaxResult remove(@PathVariable String[] titles)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletAnswerService.deleteAppletAnswerByTitles(titles));
+        return toAjax(appletAnswerService.deleteAppletAnswerByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletQuestionController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 考核题库Controller
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @RestController
 @RequestMapping("/model/AppletQuestion")
@@ -53,20 +52,21 @@ public class AppletQuestionController extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletQuestion:export')")
     @Log(title = "考核题库", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletQuestion appletQuestion) throws IOException {
-        List<AppletQuestion> list = appletQuestionService.selectAppletQuestionList(appletQuestion);
-        ExcelUtil<AppletQuestion> util = new ExcelUtil<AppletQuestion>(AppletQuestion.class);
-        util.exportExcel(response, list, "考核题库数据");
+    public void export(HttpServletResponse response, AppletQuestion appletQuestion)
+    {
+//        List<AppletQuestion> list = appletQuestionService.selectAppletQuestionList(appletQuestion);
+//        ExcelUtil<AppletQuestion> util = new ExcelUtil<AppletQuestion>(AppletQuestion.class);
+//        util.exportExcel(response, list, "考核题库数据");
     }
 
     /**
      * 获取考核题库详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletQuestion:query')")
-    @GetMapping(value = "/{title}")
-    public AjaxResult getInfo(@PathVariable("title") String title)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletQuestionService.selectAppletQuestionByTitle(title));
+        return success(appletQuestionService.selectAppletQuestionById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletQuestionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletQuestion:remove')")
     @Log(title = "考核题库", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{titles}")
-    public AjaxResult remove(@PathVariable String[] titles)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletQuestionService.deleteAppletQuestionByTitles(titles));
+        return toAjax(appletQuestionService.deleteAppletQuestionByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletServiceController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 平台&服务介绍信息Controller
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @RestController
 @RequestMapping("/model/AppletService")
@@ -53,20 +52,21 @@ public class AppletServiceController extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletService:export')")
     @Log(title = "平台&服务介绍信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletService appletService) throws IOException {
-        List<AppletService> list = appletServiceService.selectAppletServiceList(appletService);
-        ExcelUtil<AppletService> util = new ExcelUtil<AppletService>(AppletService.class);
-        util.exportExcel(response, list, "平台&服务介绍信息数据");
+    public void export(HttpServletResponse response, AppletService appletService)
+    {
+//        List<AppletService> list = appletServiceService.selectAppletServiceList(appletService);
+//        ExcelUtil<AppletService> util = new ExcelUtil<AppletService>(AppletService.class);
+//        util.exportExcel(response, list, "平台&服务介绍信息数据");
     }
 
     /**
      * 获取平台&服务介绍信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletService:query')")
-    @GetMapping(value = "/{title}")
-    public AjaxResult getInfo(@PathVariable("title") String title)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletServiceService.selectAppletServiceByTitle(title));
+        return success(appletServiceService.selectAppletServiceById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletServiceController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletService:remove')")
     @Log(title = "平台&服务介绍信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{titles}")
-    public AjaxResult remove(@PathVariable String[] titles)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletServiceService.deleteAppletServiceByTitles(titles));
+        return toAjax(appletServiceService.deleteAppletServiceByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletServiceDateController.java

@@ -1,7 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,20 +52,21 @@ public class AppletServiceDateController extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletServiceDate:export')")
     @Log(title = "服务日期", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletServiceDate appletServiceDate) throws IOException {
-        List<AppletServiceDate> list = appletServiceDateService.selectAppletServiceDateList(appletServiceDate);
-        ExcelUtil<AppletServiceDate> util = new ExcelUtil<AppletServiceDate>(AppletServiceDate.class);
-        util.exportExcel(response, list, "服务日期数据");
+    public void export(HttpServletResponse response, AppletServiceDate appletServiceDate)
+    {
+//        List<AppletServiceDate> list = appletServiceDateService.selectAppletServiceDateList(appletServiceDate);
+//        ExcelUtil<AppletServiceDate> util = new ExcelUtil<AppletServiceDate>(AppletServiceDate.class);
+//        util.exportExcel(response, list, "服务日期数据");
     }
 
     /**
      * 获取服务日期详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletServiceDate:query')")
-    @GetMapping(value = "/{date}")
-    public AjaxResult getInfo(@PathVariable("date") Date date)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletServiceDateService.selectAppletServiceDateByDate(date));
+        return success(appletServiceDateService.selectAppletServiceDateById(id));
     }
 
     /**
@@ -97,9 +96,9 @@ public class AppletServiceDateController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletServiceDate:remove')")
     @Log(title = "服务日期", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{dates}")
-    public AjaxResult remove(@PathVariable Date[] dates)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletServiceDateService.deleteAppletServiceDateByDates(dates));
+        return toAjax(appletServiceDateService.deleteAppletServiceDateByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletServiceLogController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 服务记录Controller
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @RestController
 @RequestMapping("/model/AppletServiceLog")
@@ -53,20 +52,21 @@ public class AppletServiceLogController extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletServiceLog:export')")
     @Log(title = "服务记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletServiceLog appletServiceLog) throws IOException {
-        List<AppletServiceLog> list = appletServiceLogService.selectAppletServiceLogList(appletServiceLog);
-        ExcelUtil<AppletServiceLog> util = new ExcelUtil<AppletServiceLog>(AppletServiceLog.class);
-        util.exportExcel(response, list, "服务记录数据");
+    public void export(HttpServletResponse response, AppletServiceLog appletServiceLog)
+    {
+//        List<AppletServiceLog> list = appletServiceLogService.selectAppletServiceLogList(appletServiceLog);
+//        ExcelUtil<AppletServiceLog> util = new ExcelUtil<AppletServiceLog>(AppletServiceLog.class);
+//        util.exportExcel(response, list, "服务记录数据");
     }
 
     /**
      * 获取服务记录详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletServiceLog:query')")
-    @GetMapping(value = "/{serviceType}")
-    public AjaxResult getInfo(@PathVariable("serviceType") String serviceType)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletServiceLogService.selectAppletServiceLogByServiceType(serviceType));
+        return success(appletServiceLogService.selectAppletServiceLogById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletServiceLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletServiceLog:remove')")
     @Log(title = "服务记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{serviceTypes}")
-    public AjaxResult remove(@PathVariable String[] serviceTypes)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletServiceLogService.deleteAppletServiceLogByServiceTypes(serviceTypes));
+        return toAjax(appletServiceLogService.deleteAppletServiceLogByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTrainController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.model.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.AppletTrain;
+import com.ruoyi.model.service.IAppletTrainService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 服务培训Controller
+ * 
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+@RestController
+@RequestMapping("/model/AppletTrain")
+public class AppletTrainController extends BaseController
+{
+    @Autowired
+    private IAppletTrainService appletTrainService;
+
+    /**
+     * 查询服务培训列表
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletTrain:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AppletTrain appletTrain)
+    {
+        startPage();
+        List<AppletTrain> list = appletTrainService.selectAppletTrainList(appletTrain);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出服务培训列表
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletTrain:export')")
+    @Log(title = "服务培训", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AppletTrain appletTrain)
+    {
+//        List<AppletTrain> list = appletTrainService.selectAppletTrainList(appletTrain);
+//        ExcelUtil<AppletTrain> util = new ExcelUtil<AppletTrain>(AppletTrain.class);
+//        util.exportExcel(response, list, "服务培训数据");
+    }
+
+    /**
+     * 获取服务培训详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletTrain:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(appletTrainService.selectAppletTrainById(id));
+    }
+
+    /**
+     * 新增服务培训
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletTrain:add')")
+    @Log(title = "服务培训", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AppletTrain appletTrain)
+    {
+        return toAjax(appletTrainService.insertAppletTrain(appletTrain));
+    }
+
+    /**
+     * 修改服务培训
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletTrain:edit')")
+    @Log(title = "服务培训", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AppletTrain appletTrain)
+    {
+        return toAjax(appletTrainService.updateAppletTrain(appletTrain));
+    }
+
+    /**
+     * 删除服务培训
+     */
+    @PreAuthorize("@ss.hasPermi('model:AppletTrain:remove')")
+    @Log(title = "服务培训", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(appletTrainService.deleteAppletTrainByIds(ids));
+    }
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUser1Controller.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -53,20 +52,21 @@ public class AppletUser1Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletUser1:export')")
     @Log(title = "伴宠师信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletUser1 appletUser1) throws IOException {
-        List<AppletUser1> list = appletUser1Service.selectAppletUser1List(appletUser1);
-        ExcelUtil<AppletUser1> util = new ExcelUtil<AppletUser1>(AppletUser1.class);
-        util.exportExcel(response, list, "伴宠师信息数据");
+    public void export(HttpServletResponse response, AppletUser1 appletUser1)
+    {
+//        List<AppletUser1> list = appletUser1Service.selectAppletUser1List(appletUser1);
+//        ExcelUtil<AppletUser1> util = new ExcelUtil<AppletUser1>(AppletUser1.class);
+//        util.exportExcel(response, list, "伴宠师信息数据");
     }
 
     /**
      * 获取伴宠师信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletUser1:query')")
-    @GetMapping(value = "/{name}")
-    public AjaxResult getInfo(@PathVariable("name") String name)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletUser1Service.selectAppletUser1ByName(name));
+        return success(appletUser1Service.selectAppletUser1ById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletUser1Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletUser1:remove')")
     @Log(title = "伴宠师信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{names}")
-    public AjaxResult remove(@PathVariable String[] names)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletUser1Service.deleteAppletUser1ByNames(names));
+        return toAjax(appletUser1Service.deleteAppletUser1ByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUser2Controller.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.controller;
 
-import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -53,20 +52,21 @@ public class AppletUser2Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('model:AppletUser2:export')")
     @Log(title = "用户服务信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AppletUser2 appletUser2) throws IOException {
-        List<AppletUser2> list = appletUser2Service.selectAppletUser2List(appletUser2);
-        ExcelUtil<AppletUser2> util = new ExcelUtil<AppletUser2>(AppletUser2.class);
-        util.exportExcel(response, list, "用户服务信息数据");
+    public void export(HttpServletResponse response, AppletUser2 appletUser2)
+    {
+//        List<AppletUser2> list = appletUser2Service.selectAppletUser2List(appletUser2);
+//        ExcelUtil<AppletUser2> util = new ExcelUtil<AppletUser2>(AppletUser2.class);
+//        util.exportExcel(response, list, "用户服务信息数据");
     }
 
     /**
      * 获取用户服务信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletUser2:query')")
-    @GetMapping(value = "/{headImage}")
-    public AjaxResult getInfo(@PathVariable("headImage") String headImage)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletUser2Service.selectAppletUser2ByHeadImage(headImage));
+        return success(appletUser2Service.selectAppletUser2ById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletUser2Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletUser2:remove')")
     @Log(title = "用户服务信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{headImages}")
-    public AjaxResult remove(@PathVariable String[] headImages)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletUser2Service.deleteAppletUser2ByHeadImages(headImages));
+        return toAjax(appletUser2Service.deleteAppletUser2ByIds(ids));
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAddress.java

@@ -1,7 +1,7 @@
 package com.ruoyi.model.domain;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,12 +11,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 地址信息对象 applet_address
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public class AppletAddress extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 接单地址 */
     @Excel(name = "接单地址")
     private String area;
@@ -41,6 +44,18 @@ public class AppletAddress extends BaseEntity
     @Excel(name = "关联用户id")
     private Long userId;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setArea(String area) 
     {
         this.area = area;
@@ -95,16 +110,31 @@ public class AppletAddress extends BaseEntity
     {
         return userId;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("area", getArea())
             .append("address", getAddress())
             .append("status", getStatus())
             .append("range", getRange())
             .append("outDate", getOutDate())
             .append("userId", getUserId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAmountLog.java

@@ -16,6 +16,9 @@ public class AppletAmountLog extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 标题 */
     @Excel(name = "标题")
     private String title;
@@ -28,6 +31,18 @@ public class AppletAmountLog extends BaseEntity
     @Excel(name = "类型")
     private String type;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setTitle(String title) 
     {
         this.title = title;
@@ -55,13 +70,28 @@ public class AppletAmountLog extends BaseEntity
     {
         return type;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("title", getTitle())
             .append("amount", getAmount())
             .append("type", getType())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAnswer.java

@@ -9,12 +9,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 基本考核答案对象 applet_answer
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public class AppletAnswer extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 答案内容 */
     @Excel(name = "答案内容")
     private String title;
@@ -31,6 +34,18 @@ public class AppletAnswer extends BaseEntity
     @Excel(name = "关联题目ID")
     private Long questionId;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setTitle(String title) 
     {
         this.title = title;
@@ -67,14 +82,29 @@ public class AppletAnswer extends BaseEntity
     {
         return questionId;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("title", getTitle())
             .append("isTrue", getIsTrue())
             .append("orderNo", getOrderNo())
             .append("questionId", getQuestionId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletQuestion.java

@@ -9,12 +9,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 考核题库对象 applet_question
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public class AppletQuestion extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 题目标题 */
     @Excel(name = "题目标题")
     private String title;
@@ -27,6 +30,18 @@ public class AppletQuestion extends BaseEntity
     @Excel(name = "排序编号")
     private Long orderNo;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setTitle(String title) 
     {
         this.title = title;
@@ -54,13 +69,28 @@ public class AppletQuestion extends BaseEntity
     {
         return orderNo;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("title", getTitle())
             .append("type", getType())
             .append("orderNo", getOrderNo())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletService.java

@@ -9,12 +9,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 平台&服务介绍信息对象 applet_service
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public class AppletService extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 标题 */
     @Excel(name = "标题")
     private String title;
@@ -23,6 +26,18 @@ public class AppletService extends BaseEntity
     @Excel(name = "视频")
     private String video;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setTitle(String title) 
     {
         this.title = title;
@@ -41,12 +56,27 @@ public class AppletService extends BaseEntity
     {
         return video;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("title", getTitle())
             .append("video", getVideo())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletServiceDate.java

@@ -17,6 +17,9 @@ public class AppletServiceDate extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 服务日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "服务日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -30,6 +33,18 @@ public class AppletServiceDate extends BaseEntity
     @Excel(name = "关联订单ID")
     private Long orderId;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setDate(Date date) 
     {
         this.date = date;
@@ -57,13 +72,28 @@ public class AppletServiceDate extends BaseEntity
     {
         return orderId;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("date", getDate())
             .append("details", getDetails())
             .append("orderId", getOrderId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletServiceLog.java

@@ -11,12 +11,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 服务记录对象 applet_service_log
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public class AppletServiceLog extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 服务类型 */
     @Excel(name = "服务类型")
     private String serviceType;
@@ -38,6 +41,18 @@ public class AppletServiceLog extends BaseEntity
     @Excel(name = "图片记录")
     private String image;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setServiceType(String serviceType) 
     {
         this.serviceType = serviceType;
@@ -83,15 +98,30 @@ public class AppletServiceLog extends BaseEntity
     {
         return image;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("serviceType", getServiceType())
             .append("serviceTime", getServiceTime())
             .append("serviceSpot", getServiceSpot())
             .append("text", getText())
             .append("image", getImage())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletTrain.java

@@ -15,6 +15,9 @@ public class AppletTrain extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 标题 */
     @Excel(name = "标题")
     private String title;
@@ -23,6 +26,18 @@ public class AppletTrain extends BaseEntity
     @Excel(name = "培训内容")
     private String content;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setTitle(String title) 
     {
         this.title = title;
@@ -41,12 +56,27 @@ public class AppletTrain extends BaseEntity
     {
         return content;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("title", getTitle())
             .append("content", getContent())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletUser1.java

@@ -17,6 +17,9 @@ public class AppletUser1 extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 姓名 */
     @Excel(name = "姓名")
     private String name;
@@ -83,6 +86,15 @@ public class AppletUser1 extends BaseEntity
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedAt;
 
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setName(String name) 
     {
         this.name = name;
@@ -231,6 +243,7 @@ public class AppletUser1 extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("name", getName())
             .append("cerNo", getCerNo())
             .append("sex", getSex())

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletUser2.java

@@ -15,6 +15,9 @@ public class AppletUser2 extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 头像 */
     @Excel(name = "头像")
     private String headImage;
@@ -51,6 +54,18 @@ public class AppletUser2 extends BaseEntity
     @Excel(name = "增值服务")
     private String serviceIncrease;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setHeadImage(String headImage) 
     {
         this.headImage = headImage;
@@ -132,10 +147,20 @@ public class AppletUser2 extends BaseEntity
     {
         return serviceIncrease;
     }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("headImage", getHeadImage())
             .append("nickName", getNickName())
             .append("phone", getPhone())
@@ -145,6 +170,11 @@ public class AppletUser2 extends BaseEntity
             .append("petTypeId", getPetTypeId())
             .append("serviceBase", getServiceBase())
             .append("serviceIncrease", getServiceIncrease())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAddressMapper.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAddress;
  * 地址信息Mapper接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface AppletAddressMapper 
 {
     /**
      * 查询地址信息
      * 
-     * @param area 地址信息主键
+     * @param id 地址信息主键
      * @return 地址信息
      */
-    public AppletAddress selectAppletAddressByArea(String area);
+    public AppletAddress selectAppletAddressById(Long id);
 
     /**
      * 查询地址信息列表
@@ -46,16 +46,16 @@ public interface AppletAddressMapper
     /**
      * 删除地址信息
      * 
-     * @param area 地址信息主键
+     * @param id 地址信息主键
      * @return 结果
      */
-    public int deleteAppletAddressByArea(String area);
+    public int deleteAppletAddressById(Long id);
 
     /**
      * 批量删除地址信息
      * 
-     * @param areas 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletAddressByAreas(String[] areas);
+    public int deleteAppletAddressByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAmountLogMapper.java

@@ -14,10 +14,10 @@ public interface AppletAmountLogMapper
     /**
      * 查询金额明细
      * 
-     * @param title 金额明细主键
+     * @param id 金额明细主键
      * @return 金额明细
      */
-    public AppletAmountLog selectAppletAmountLogByTitle(String title);
+    public AppletAmountLog selectAppletAmountLogById(Long id);
 
     /**
      * 查询金额明细列表
@@ -46,16 +46,16 @@ public interface AppletAmountLogMapper
     /**
      * 删除金额明细
      * 
-     * @param title 金额明细主键
+     * @param id 金额明细主键
      * @return 结果
      */
-    public int deleteAppletAmountLogByTitle(String title);
+    public int deleteAppletAmountLogById(Long id);
 
     /**
      * 批量删除金额明细
      * 
-     * @param titles 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletAmountLogByTitles(String[] titles);
+    public int deleteAppletAmountLogByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerMapper.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAnswer;
  * 基本考核答案Mapper接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface AppletAnswerMapper 
 {
     /**
      * 查询基本考核答案
      * 
-     * @param title 基本考核答案主键
+     * @param id 基本考核答案主键
      * @return 基本考核答案
      */
-    public AppletAnswer selectAppletAnswerByTitle(String title);
+    public AppletAnswer selectAppletAnswerById(Long id);
 
     /**
      * 查询基本考核答案列表
@@ -46,16 +46,16 @@ public interface AppletAnswerMapper
     /**
      * 删除基本考核答案
      * 
-     * @param title 基本考核答案主键
+     * @param id 基本考核答案主键
      * @return 结果
      */
-    public int deleteAppletAnswerByTitle(String title);
+    public int deleteAppletAnswerById(Long id);
 
     /**
      * 批量删除基本考核答案
      * 
-     * @param titles 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletAnswerByTitles(String[] titles);
+    public int deleteAppletAnswerByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletQuestionMapper.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletQuestion;
  * 考核题库Mapper接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface AppletQuestionMapper 
 {
     /**
      * 查询考核题库
      * 
-     * @param title 考核题库主键
+     * @param id 考核题库主键
      * @return 考核题库
      */
-    public AppletQuestion selectAppletQuestionByTitle(String title);
+    public AppletQuestion selectAppletQuestionById(Long id);
 
     /**
      * 查询考核题库列表
@@ -46,16 +46,16 @@ public interface AppletQuestionMapper
     /**
      * 删除考核题库
      * 
-     * @param title 考核题库主键
+     * @param id 考核题库主键
      * @return 结果
      */
-    public int deleteAppletQuestionByTitle(String title);
+    public int deleteAppletQuestionById(Long id);
 
     /**
      * 批量删除考核题库
      * 
-     * @param titles 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletQuestionByTitles(String[] titles);
+    public int deleteAppletQuestionByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletServiceDateMapper.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.mapper;
 
-import java.util.Date;
 import java.util.List;
 import com.ruoyi.model.domain.AppletServiceDate;
 
@@ -15,10 +14,10 @@ public interface AppletServiceDateMapper
     /**
      * 查询服务日期
      * 
-     * @param date 服务日期主键
+     * @param id 服务日期主键
      * @return 服务日期
      */
-    public AppletServiceDate selectAppletServiceDateByDate(Date date);
+    public AppletServiceDate selectAppletServiceDateById(Long id);
 
     /**
      * 查询服务日期列表
@@ -47,16 +46,16 @@ public interface AppletServiceDateMapper
     /**
      * 删除服务日期
      * 
-     * @param date 服务日期主键
+     * @param id 服务日期主键
      * @return 结果
      */
-    public int deleteAppletServiceDateByDate(Date date);
+    public int deleteAppletServiceDateById(Long id);
 
     /**
      * 批量删除服务日期
      * 
-     * @param dates 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletServiceDateByDates(Date[] dates);
+    public int deleteAppletServiceDateByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletServiceLogMapper.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletServiceLog;
  * 服务记录Mapper接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface AppletServiceLogMapper 
 {
     /**
      * 查询服务记录
      * 
-     * @param serviceType 服务记录主键
+     * @param id 服务记录主键
      * @return 服务记录
      */
-    public AppletServiceLog selectAppletServiceLogByServiceType(String serviceType);
+    public AppletServiceLog selectAppletServiceLogById(Long id);
 
     /**
      * 查询服务记录列表
@@ -46,16 +46,16 @@ public interface AppletServiceLogMapper
     /**
      * 删除服务记录
      * 
-     * @param serviceType 服务记录主键
+     * @param id 服务记录主键
      * @return 结果
      */
-    public int deleteAppletServiceLogByServiceType(String serviceType);
+    public int deleteAppletServiceLogById(Long id);
 
     /**
      * 批量删除服务记录
      * 
-     * @param serviceTypes 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletServiceLogByServiceTypes(String[] serviceTypes);
+    public int deleteAppletServiceLogByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletServiceMapper.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletService;
  * 平台&服务介绍信息Mapper接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface AppletServiceMapper 
 {
     /**
      * 查询平台&服务介绍信息
      * 
-     * @param title 平台&服务介绍信息主键
+     * @param id 平台&服务介绍信息主键
      * @return 平台&服务介绍信息
      */
-    public AppletService selectAppletServiceByTitle(String title);
+    public AppletService selectAppletServiceById(Long id);
 
     /**
      * 查询平台&服务介绍信息列表
@@ -46,16 +46,16 @@ public interface AppletServiceMapper
     /**
      * 删除平台&服务介绍信息
      * 
-     * @param title 平台&服务介绍信息主键
+     * @param id 平台&服务介绍信息主键
      * @return 结果
      */
-    public int deleteAppletServiceByTitle(String title);
+    public int deleteAppletServiceById(Long id);
 
     /**
      * 批量删除平台&服务介绍信息
      * 
-     * @param titles 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletServiceByTitles(String[] titles);
+    public int deleteAppletServiceByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletTrainMapper.java

@@ -14,10 +14,10 @@ public interface AppletTrainMapper
     /**
      * 查询服务培训
      * 
-     * @param title 服务培训主键
+     * @param id 服务培训主键
      * @return 服务培训
      */
-    public AppletTrain selectAppletTrainByTitle(String title);
+    public AppletTrain selectAppletTrainById(Long id);
 
     /**
      * 查询服务培训列表
@@ -46,16 +46,16 @@ public interface AppletTrainMapper
     /**
      * 删除服务培训
      * 
-     * @param title 服务培训主键
+     * @param id 服务培训主键
      * @return 结果
      */
-    public int deleteAppletTrainByTitle(String title);
+    public int deleteAppletTrainById(Long id);
 
     /**
      * 批量删除服务培训
      * 
-     * @param titles 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletTrainByTitles(String[] titles);
+    public int deleteAppletTrainByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletUser1Mapper.java

@@ -14,10 +14,10 @@ public interface AppletUser1Mapper
     /**
      * 查询伴宠师信息
      * 
-     * @param name 伴宠师信息主键
+     * @param id 伴宠师信息主键
      * @return 伴宠师信息
      */
-    public AppletUser1 selectAppletUser1ByName(String name);
+    public AppletUser1 selectAppletUser1ById(Long id);
 
     /**
      * 查询伴宠师信息列表
@@ -46,16 +46,16 @@ public interface AppletUser1Mapper
     /**
      * 删除伴宠师信息
      * 
-     * @param name 伴宠师信息主键
+     * @param id 伴宠师信息主键
      * @return 结果
      */
-    public int deleteAppletUser1ByName(String name);
+    public int deleteAppletUser1ById(Long id);
 
     /**
      * 批量删除伴宠师信息
      * 
-     * @param names 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletUser1ByNames(String[] names);
+    public int deleteAppletUser1ByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletUser2Mapper.java

@@ -14,10 +14,10 @@ public interface AppletUser2Mapper
     /**
      * 查询用户服务信息
      * 
-     * @param headImage 用户服务信息主键
+     * @param id 用户服务信息主键
      * @return 用户服务信息
      */
-    public AppletUser2 selectAppletUser2ByHeadImage(String headImage);
+    public AppletUser2 selectAppletUser2ById(Long id);
 
     /**
      * 查询用户服务信息列表
@@ -46,16 +46,16 @@ public interface AppletUser2Mapper
     /**
      * 删除用户服务信息
      * 
-     * @param headImage 用户服务信息主键
+     * @param id 用户服务信息主键
      * @return 结果
      */
-    public int deleteAppletUser2ByHeadImage(String headImage);
+    public int deleteAppletUser2ById(Long id);
 
     /**
      * 批量删除用户服务信息
      * 
-     * @param headImages 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletUser2ByHeadImages(String[] headImages);
+    public int deleteAppletUser2ByIds(Long[] ids);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAddressService.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAddress;
  * 地址信息Service接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface IAppletAddressService 
 {
     /**
      * 查询地址信息
      * 
-     * @param area 地址信息主键
+     * @param id 地址信息主键
      * @return 地址信息
      */
-    public AppletAddress selectAppletAddressByArea(String area);
+    public AppletAddress selectAppletAddressById(Long id);
 
     /**
      * 查询地址信息列表
@@ -46,16 +46,16 @@ public interface IAppletAddressService
     /**
      * 批量删除地址信息
      * 
-     * @param areas 需要删除的地址信息主键集合
+     * @param ids 需要删除的地址信息主键集合
      * @return 结果
      */
-    public int deleteAppletAddressByAreas(String[] areas);
+    public int deleteAppletAddressByIds(Long[] ids);
 
     /**
      * 删除地址信息信息
      * 
-     * @param area 地址信息主键
+     * @param id 地址信息主键
      * @return 结果
      */
-    public int deleteAppletAddressByArea(String area);
+    public int deleteAppletAddressById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAmountLogService.java

@@ -14,10 +14,10 @@ public interface IAppletAmountLogService
     /**
      * 查询金额明细
      * 
-     * @param title 金额明细主键
+     * @param id 金额明细主键
      * @return 金额明细
      */
-    public AppletAmountLog selectAppletAmountLogByTitle(String title);
+    public AppletAmountLog selectAppletAmountLogById(Long id);
 
     /**
      * 查询金额明细列表
@@ -46,16 +46,16 @@ public interface IAppletAmountLogService
     /**
      * 批量删除金额明细
      * 
-     * @param titles 需要删除的金额明细主键集合
+     * @param ids 需要删除的金额明细主键集合
      * @return 结果
      */
-    public int deleteAppletAmountLogByTitles(String[] titles);
+    public int deleteAppletAmountLogByIds(Long[] ids);
 
     /**
      * 删除金额明细信息
      * 
-     * @param title 金额明细主键
+     * @param id 金额明细主键
      * @return 结果
      */
-    public int deleteAppletAmountLogByTitle(String title);
+    public int deleteAppletAmountLogById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerService.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAnswer;
  * 基本考核答案Service接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface IAppletAnswerService 
 {
     /**
      * 查询基本考核答案
      * 
-     * @param title 基本考核答案主键
+     * @param id 基本考核答案主键
      * @return 基本考核答案
      */
-    public AppletAnswer selectAppletAnswerByTitle(String title);
+    public AppletAnswer selectAppletAnswerById(Long id);
 
     /**
      * 查询基本考核答案列表
@@ -46,16 +46,16 @@ public interface IAppletAnswerService
     /**
      * 批量删除基本考核答案
      * 
-     * @param titles 需要删除的基本考核答案主键集合
+     * @param ids 需要删除的基本考核答案主键集合
      * @return 结果
      */
-    public int deleteAppletAnswerByTitles(String[] titles);
+    public int deleteAppletAnswerByIds(Long[] ids);
 
     /**
      * 删除基本考核答案信息
      * 
-     * @param title 基本考核答案主键
+     * @param id 基本考核答案主键
      * @return 结果
      */
-    public int deleteAppletAnswerByTitle(String title);
+    public int deleteAppletAnswerById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletQuestionService.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletQuestion;
  * 考核题库Service接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface IAppletQuestionService 
 {
     /**
      * 查询考核题库
      * 
-     * @param title 考核题库主键
+     * @param id 考核题库主键
      * @return 考核题库
      */
-    public AppletQuestion selectAppletQuestionByTitle(String title);
+    public AppletQuestion selectAppletQuestionById(Long id);
 
     /**
      * 查询考核题库列表
@@ -46,16 +46,16 @@ public interface IAppletQuestionService
     /**
      * 批量删除考核题库
      * 
-     * @param titles 需要删除的考核题库主键集合
+     * @param ids 需要删除的考核题库主键集合
      * @return 结果
      */
-    public int deleteAppletQuestionByTitles(String[] titles);
+    public int deleteAppletQuestionByIds(Long[] ids);
 
     /**
      * 删除考核题库信息
      * 
-     * @param title 考核题库主键
+     * @param id 考核题库主键
      * @return 结果
      */
-    public int deleteAppletQuestionByTitle(String title);
+    public int deleteAppletQuestionById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletServiceDateService.java

@@ -1,6 +1,5 @@
 package com.ruoyi.model.service;
 
-import java.util.Date;
 import java.util.List;
 import com.ruoyi.model.domain.AppletServiceDate;
 
@@ -15,10 +14,10 @@ public interface IAppletServiceDateService
     /**
      * 查询服务日期
      * 
-     * @param date 服务日期主键
+     * @param id 服务日期主键
      * @return 服务日期
      */
-    public AppletServiceDate selectAppletServiceDateByDate(Date date);
+    public AppletServiceDate selectAppletServiceDateById(Long id);
 
     /**
      * 查询服务日期列表
@@ -47,16 +46,16 @@ public interface IAppletServiceDateService
     /**
      * 批量删除服务日期
      * 
-     * @param dates 需要删除的服务日期主键集合
+     * @param ids 需要删除的服务日期主键集合
      * @return 结果
      */
-    public int deleteAppletServiceDateByDates(Date[] dates);
+    public int deleteAppletServiceDateByIds(Long[] ids);
 
     /**
      * 删除服务日期信息
      * 
-     * @param date 服务日期主键
+     * @param id 服务日期主键
      * @return 结果
      */
-    public int deleteAppletServiceDateByDate(Date date);
+    public int deleteAppletServiceDateById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletServiceLogService.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletServiceLog;
  * 服务记录Service接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface IAppletServiceLogService 
 {
     /**
      * 查询服务记录
      * 
-     * @param serviceType 服务记录主键
+     * @param id 服务记录主键
      * @return 服务记录
      */
-    public AppletServiceLog selectAppletServiceLogByServiceType(String serviceType);
+    public AppletServiceLog selectAppletServiceLogById(Long id);
 
     /**
      * 查询服务记录列表
@@ -46,16 +46,16 @@ public interface IAppletServiceLogService
     /**
      * 批量删除服务记录
      * 
-     * @param serviceTypes 需要删除的服务记录主键集合
+     * @param ids 需要删除的服务记录主键集合
      * @return 结果
      */
-    public int deleteAppletServiceLogByServiceTypes(String[] serviceTypes);
+    public int deleteAppletServiceLogByIds(Long[] ids);
 
     /**
      * 删除服务记录信息
      * 
-     * @param serviceType 服务记录主键
+     * @param id 服务记录主键
      * @return 结果
      */
-    public int deleteAppletServiceLogByServiceType(String serviceType);
+    public int deleteAppletServiceLogById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletServiceService.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletService;
  * 平台&服务介绍信息Service接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface IAppletServiceService 
 {
     /**
      * 查询平台&服务介绍信息
      * 
-     * @param title 平台&服务介绍信息主键
+     * @param id 平台&服务介绍信息主键
      * @return 平台&服务介绍信息
      */
-    public AppletService selectAppletServiceByTitle(String title);
+    public AppletService selectAppletServiceById(Long id);
 
     /**
      * 查询平台&服务介绍信息列表
@@ -46,16 +46,16 @@ public interface IAppletServiceService
     /**
      * 批量删除平台&服务介绍信息
      * 
-     * @param titles 需要删除的平台&服务介绍信息主键集合
+     * @param ids 需要删除的平台&服务介绍信息主键集合
      * @return 结果
      */
-    public int deleteAppletServiceByTitles(String[] titles);
+    public int deleteAppletServiceByIds(Long[] ids);
 
     /**
      * 删除平台&服务介绍信息信息
      * 
-     * @param title 平台&服务介绍信息主键
+     * @param id 平台&服务介绍信息主键
      * @return 结果
      */
-    public int deleteAppletServiceByTitle(String title);
+    public int deleteAppletServiceById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletTrainService.java

@@ -14,10 +14,10 @@ public interface IAppletTrainService
     /**
      * 查询服务培训
      * 
-     * @param title 服务培训主键
+     * @param id 服务培训主键
      * @return 服务培训
      */
-    public AppletTrain selectAppletTrainByTitle(String title);
+    public AppletTrain selectAppletTrainById(Long id);
 
     /**
      * 查询服务培训列表
@@ -46,16 +46,16 @@ public interface IAppletTrainService
     /**
      * 批量删除服务培训
      * 
-     * @param titles 需要删除的服务培训主键集合
+     * @param ids 需要删除的服务培训主键集合
      * @return 结果
      */
-    public int deleteAppletTrainByTitles(String[] titles);
+    public int deleteAppletTrainByIds(Long[] ids);
 
     /**
      * 删除服务培训信息
      * 
-     * @param title 服务培训主键
+     * @param id 服务培训主键
      * @return 结果
      */
-    public int deleteAppletTrainByTitle(String title);
+    public int deleteAppletTrainById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletUser1Service.java

@@ -14,10 +14,10 @@ public interface IAppletUser1Service
     /**
      * 查询伴宠师信息
      * 
-     * @param name 伴宠师信息主键
+     * @param id 伴宠师信息主键
      * @return 伴宠师信息
      */
-    public AppletUser1 selectAppletUser1ByName(String name);
+    public AppletUser1 selectAppletUser1ById(Long id);
 
     /**
      * 查询伴宠师信息列表
@@ -46,16 +46,16 @@ public interface IAppletUser1Service
     /**
      * 批量删除伴宠师信息
      * 
-     * @param names 需要删除的伴宠师信息主键集合
+     * @param ids 需要删除的伴宠师信息主键集合
      * @return 结果
      */
-    public int deleteAppletUser1ByNames(String[] names);
+    public int deleteAppletUser1ByIds(Long[] ids);
 
     /**
      * 删除伴宠师信息信息
      * 
-     * @param name 伴宠师信息主键
+     * @param id 伴宠师信息主键
      * @return 结果
      */
-    public int deleteAppletUser1ByName(String name);
+    public int deleteAppletUser1ById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletUser2Service.java

@@ -14,10 +14,10 @@ public interface IAppletUser2Service
     /**
      * 查询用户服务信息
      * 
-     * @param headImage 用户服务信息主键
+     * @param id 用户服务信息主键
      * @return 用户服务信息
      */
-    public AppletUser2 selectAppletUser2ByHeadImage(String headImage);
+    public AppletUser2 selectAppletUser2ById(Long id);
 
     /**
      * 查询用户服务信息列表
@@ -46,16 +46,16 @@ public interface IAppletUser2Service
     /**
      * 批量删除用户服务信息
      * 
-     * @param headImages 需要删除的用户服务信息主键集合
+     * @param ids 需要删除的用户服务信息主键集合
      * @return 结果
      */
-    public int deleteAppletUser2ByHeadImages(String[] headImages);
+    public int deleteAppletUser2ByIds(Long[] ids);
 
     /**
      * 删除用户服务信息信息
      * 
-     * @param headImage 用户服务信息主键
+     * @param id 用户服务信息主键
      * @return 结果
      */
-    public int deleteAppletUser2ByHeadImage(String headImage);
+    public int deleteAppletUser2ById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAddressServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletAddressMapper;
@@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletAddressService;
  * 地址信息Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @Service
 public class AppletAddressServiceImpl implements IAppletAddressService 
@@ -22,13 +23,13 @@ public class AppletAddressServiceImpl implements IAppletAddressService
     /**
      * 查询地址信息
      * 
-     * @param area 地址信息主键
+     * @param id 地址信息主键
      * @return 地址信息
      */
     @Override
-    public AppletAddress selectAppletAddressByArea(String area)
+    public AppletAddress selectAppletAddressById(Long id)
     {
-        return appletAddressMapper.selectAppletAddressByArea(area);
+        return appletAddressMapper.selectAppletAddressById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletAddressServiceImpl implements IAppletAddressService
     @Override
     public int insertAppletAddress(AppletAddress appletAddress)
     {
+        appletAddress.setCreateTime(DateUtils.getNowDate());
         return appletAddressMapper.insertAppletAddress(appletAddress);
     }
 
@@ -64,30 +66,31 @@ public class AppletAddressServiceImpl implements IAppletAddressService
     @Override
     public int updateAppletAddress(AppletAddress appletAddress)
     {
+        appletAddress.setUpdateTime(DateUtils.getNowDate());
         return appletAddressMapper.updateAppletAddress(appletAddress);
     }
 
     /**
      * 批量删除地址信息
      * 
-     * @param areas 需要删除的地址信息主键
+     * @param ids 需要删除的地址信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAddressByAreas(String[] areas)
+    public int deleteAppletAddressByIds(Long[] ids)
     {
-        return appletAddressMapper.deleteAppletAddressByAreas(areas);
+        return appletAddressMapper.deleteAppletAddressByIds(ids);
     }
 
     /**
      * 删除地址信息信息
      * 
-     * @param area 地址信息主键
+     * @param id 地址信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAddressByArea(String area)
+    public int deleteAppletAddressById(Long id)
     {
-        return appletAddressMapper.deleteAppletAddressByArea(area);
+        return appletAddressMapper.deleteAppletAddressById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAmountLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletAmountLogMapper;
@@ -22,13 +23,13 @@ public class AppletAmountLogServiceImpl implements IAppletAmountLogService
     /**
      * 查询金额明细
      * 
-     * @param title 金额明细主键
+     * @param id 金额明细主键
      * @return 金额明细
      */
     @Override
-    public AppletAmountLog selectAppletAmountLogByTitle(String title)
+    public AppletAmountLog selectAppletAmountLogById(Long id)
     {
-        return appletAmountLogMapper.selectAppletAmountLogByTitle(title);
+        return appletAmountLogMapper.selectAppletAmountLogById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletAmountLogServiceImpl implements IAppletAmountLogService
     @Override
     public int insertAppletAmountLog(AppletAmountLog appletAmountLog)
     {
+        appletAmountLog.setCreateTime(DateUtils.getNowDate());
         return appletAmountLogMapper.insertAppletAmountLog(appletAmountLog);
     }
 
@@ -64,30 +66,31 @@ public class AppletAmountLogServiceImpl implements IAppletAmountLogService
     @Override
     public int updateAppletAmountLog(AppletAmountLog appletAmountLog)
     {
+        appletAmountLog.setUpdateTime(DateUtils.getNowDate());
         return appletAmountLogMapper.updateAppletAmountLog(appletAmountLog);
     }
 
     /**
      * 批量删除金额明细
      * 
-     * @param titles 需要删除的金额明细主键
+     * @param ids 需要删除的金额明细主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAmountLogByTitles(String[] titles)
+    public int deleteAppletAmountLogByIds(Long[] ids)
     {
-        return appletAmountLogMapper.deleteAppletAmountLogByTitles(titles);
+        return appletAmountLogMapper.deleteAppletAmountLogByIds(ids);
     }
 
     /**
      * 删除金额明细信息
      * 
-     * @param title 金额明细主键
+     * @param id 金额明细主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAmountLogByTitle(String title)
+    public int deleteAppletAmountLogById(Long id)
     {
-        return appletAmountLogMapper.deleteAppletAmountLogByTitle(title);
+        return appletAmountLogMapper.deleteAppletAmountLogById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletAnswerMapper;
@@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletAnswerService;
  * 基本考核答案Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @Service
 public class AppletAnswerServiceImpl implements IAppletAnswerService 
@@ -22,13 +23,13 @@ public class AppletAnswerServiceImpl implements IAppletAnswerService
     /**
      * 查询基本考核答案
      * 
-     * @param title 基本考核答案主键
+     * @param id 基本考核答案主键
      * @return 基本考核答案
      */
     @Override
-    public AppletAnswer selectAppletAnswerByTitle(String title)
+    public AppletAnswer selectAppletAnswerById(Long id)
     {
-        return appletAnswerMapper.selectAppletAnswerByTitle(title);
+        return appletAnswerMapper.selectAppletAnswerById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletAnswerServiceImpl implements IAppletAnswerService
     @Override
     public int insertAppletAnswer(AppletAnswer appletAnswer)
     {
+        appletAnswer.setCreateTime(DateUtils.getNowDate());
         return appletAnswerMapper.insertAppletAnswer(appletAnswer);
     }
 
@@ -64,30 +66,31 @@ public class AppletAnswerServiceImpl implements IAppletAnswerService
     @Override
     public int updateAppletAnswer(AppletAnswer appletAnswer)
     {
+        appletAnswer.setUpdateTime(DateUtils.getNowDate());
         return appletAnswerMapper.updateAppletAnswer(appletAnswer);
     }
 
     /**
      * 批量删除基本考核答案
      * 
-     * @param titles 需要删除的基本考核答案主键
+     * @param ids 需要删除的基本考核答案主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAnswerByTitles(String[] titles)
+    public int deleteAppletAnswerByIds(Long[] ids)
     {
-        return appletAnswerMapper.deleteAppletAnswerByTitles(titles);
+        return appletAnswerMapper.deleteAppletAnswerByIds(ids);
     }
 
     /**
      * 删除基本考核答案信息
      * 
-     * @param title 基本考核答案主键
+     * @param id 基本考核答案主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAnswerByTitle(String title)
+    public int deleteAppletAnswerById(Long id)
     {
-        return appletAnswerMapper.deleteAppletAnswerByTitle(title);
+        return appletAnswerMapper.deleteAppletAnswerById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletQuestionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletQuestionMapper;
@@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletQuestionService;
  * 考核题库Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @Service
 public class AppletQuestionServiceImpl implements IAppletQuestionService 
@@ -22,13 +23,13 @@ public class AppletQuestionServiceImpl implements IAppletQuestionService
     /**
      * 查询考核题库
      * 
-     * @param title 考核题库主键
+     * @param id 考核题库主键
      * @return 考核题库
      */
     @Override
-    public AppletQuestion selectAppletQuestionByTitle(String title)
+    public AppletQuestion selectAppletQuestionById(Long id)
     {
-        return appletQuestionMapper.selectAppletQuestionByTitle(title);
+        return appletQuestionMapper.selectAppletQuestionById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletQuestionServiceImpl implements IAppletQuestionService
     @Override
     public int insertAppletQuestion(AppletQuestion appletQuestion)
     {
+        appletQuestion.setCreateTime(DateUtils.getNowDate());
         return appletQuestionMapper.insertAppletQuestion(appletQuestion);
     }
 
@@ -64,30 +66,31 @@ public class AppletQuestionServiceImpl implements IAppletQuestionService
     @Override
     public int updateAppletQuestion(AppletQuestion appletQuestion)
     {
+        appletQuestion.setUpdateTime(DateUtils.getNowDate());
         return appletQuestionMapper.updateAppletQuestion(appletQuestion);
     }
 
     /**
      * 批量删除考核题库
      * 
-     * @param titles 需要删除的考核题库主键
+     * @param ids 需要删除的考核题库主键
      * @return 结果
      */
     @Override
-    public int deleteAppletQuestionByTitles(String[] titles)
+    public int deleteAppletQuestionByIds(Long[] ids)
     {
-        return appletQuestionMapper.deleteAppletQuestionByTitles(titles);
+        return appletQuestionMapper.deleteAppletQuestionByIds(ids);
     }
 
     /**
      * 删除考核题库信息
      * 
-     * @param title 考核题库主键
+     * @param id 考核题库主键
      * @return 结果
      */
     @Override
-    public int deleteAppletQuestionByTitle(String title)
+    public int deleteAppletQuestionById(Long id)
     {
-        return appletQuestionMapper.deleteAppletQuestionByTitle(title);
+        return appletQuestionMapper.deleteAppletQuestionById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletServiceDateServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ruoyi.model.service.impl;
 
-import java.util.Date;
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletServiceDateMapper;
@@ -23,13 +23,13 @@ public class AppletServiceDateServiceImpl implements IAppletServiceDateService
     /**
      * 查询服务日期
      * 
-     * @param date 服务日期主键
+     * @param id 服务日期主键
      * @return 服务日期
      */
     @Override
-    public AppletServiceDate selectAppletServiceDateByDate(Date date)
+    public AppletServiceDate selectAppletServiceDateById(Long id)
     {
-        return appletServiceDateMapper.selectAppletServiceDateByDate(date);
+        return appletServiceDateMapper.selectAppletServiceDateById(id);
     }
 
     /**
@@ -53,6 +53,7 @@ public class AppletServiceDateServiceImpl implements IAppletServiceDateService
     @Override
     public int insertAppletServiceDate(AppletServiceDate appletServiceDate)
     {
+        appletServiceDate.setCreateTime(DateUtils.getNowDate());
         return appletServiceDateMapper.insertAppletServiceDate(appletServiceDate);
     }
 
@@ -65,30 +66,31 @@ public class AppletServiceDateServiceImpl implements IAppletServiceDateService
     @Override
     public int updateAppletServiceDate(AppletServiceDate appletServiceDate)
     {
+        appletServiceDate.setUpdateTime(DateUtils.getNowDate());
         return appletServiceDateMapper.updateAppletServiceDate(appletServiceDate);
     }
 
     /**
      * 批量删除服务日期
      * 
-     * @param dates 需要删除的服务日期主键
+     * @param ids 需要删除的服务日期主键
      * @return 结果
      */
     @Override
-    public int deleteAppletServiceDateByDates(Date[] dates)
+    public int deleteAppletServiceDateByIds(Long[] ids)
     {
-        return appletServiceDateMapper.deleteAppletServiceDateByDates(dates);
+        return appletServiceDateMapper.deleteAppletServiceDateByIds(ids);
     }
 
     /**
      * 删除服务日期信息
      * 
-     * @param date 服务日期主键
+     * @param id 服务日期主键
      * @return 结果
      */
     @Override
-    public int deleteAppletServiceDateByDate(Date date)
+    public int deleteAppletServiceDateById(Long id)
     {
-        return appletServiceDateMapper.deleteAppletServiceDateByDate(date);
+        return appletServiceDateMapper.deleteAppletServiceDateById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletServiceLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletServiceLogMapper;
@@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletServiceLogService;
  * 服务记录Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @Service
 public class AppletServiceLogServiceImpl implements IAppletServiceLogService 
@@ -22,13 +23,13 @@ public class AppletServiceLogServiceImpl implements IAppletServiceLogService
     /**
      * 查询服务记录
      * 
-     * @param serviceType 服务记录主键
+     * @param id 服务记录主键
      * @return 服务记录
      */
     @Override
-    public AppletServiceLog selectAppletServiceLogByServiceType(String serviceType)
+    public AppletServiceLog selectAppletServiceLogById(Long id)
     {
-        return appletServiceLogMapper.selectAppletServiceLogByServiceType(serviceType);
+        return appletServiceLogMapper.selectAppletServiceLogById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletServiceLogServiceImpl implements IAppletServiceLogService
     @Override
     public int insertAppletServiceLog(AppletServiceLog appletServiceLog)
     {
+        appletServiceLog.setCreateTime(DateUtils.getNowDate());
         return appletServiceLogMapper.insertAppletServiceLog(appletServiceLog);
     }
 
@@ -64,30 +66,31 @@ public class AppletServiceLogServiceImpl implements IAppletServiceLogService
     @Override
     public int updateAppletServiceLog(AppletServiceLog appletServiceLog)
     {
+        appletServiceLog.setUpdateTime(DateUtils.getNowDate());
         return appletServiceLogMapper.updateAppletServiceLog(appletServiceLog);
     }
 
     /**
      * 批量删除服务记录
      * 
-     * @param serviceTypes 需要删除的服务记录主键
+     * @param ids 需要删除的服务记录主键
      * @return 结果
      */
     @Override
-    public int deleteAppletServiceLogByServiceTypes(String[] serviceTypes)
+    public int deleteAppletServiceLogByIds(Long[] ids)
     {
-        return appletServiceLogMapper.deleteAppletServiceLogByServiceTypes(serviceTypes);
+        return appletServiceLogMapper.deleteAppletServiceLogByIds(ids);
     }
 
     /**
      * 删除服务记录信息
      * 
-     * @param serviceType 服务记录主键
+     * @param id 服务记录主键
      * @return 结果
      */
     @Override
-    public int deleteAppletServiceLogByServiceType(String serviceType)
+    public int deleteAppletServiceLogById(Long id)
     {
-        return appletServiceLogMapper.deleteAppletServiceLogByServiceType(serviceType);
+        return appletServiceLogMapper.deleteAppletServiceLogById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletServiceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletServiceMapper;
@@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletServiceService;
  * 平台&服务介绍信息Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @Service
 public class AppletServiceServiceImpl implements IAppletServiceService 
@@ -22,13 +23,13 @@ public class AppletServiceServiceImpl implements IAppletServiceService
     /**
      * 查询平台&服务介绍信息
      * 
-     * @param title 平台&服务介绍信息主键
+     * @param id 平台&服务介绍信息主键
      * @return 平台&服务介绍信息
      */
     @Override
-    public AppletService selectAppletServiceByTitle(String title)
+    public AppletService selectAppletServiceById(Long id)
     {
-        return appletServiceMapper.selectAppletServiceByTitle(title);
+        return appletServiceMapper.selectAppletServiceById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletServiceServiceImpl implements IAppletServiceService
     @Override
     public int insertAppletService(AppletService appletService)
     {
+        appletService.setCreateTime(DateUtils.getNowDate());
         return appletServiceMapper.insertAppletService(appletService);
     }
 
@@ -64,30 +66,31 @@ public class AppletServiceServiceImpl implements IAppletServiceService
     @Override
     public int updateAppletService(AppletService appletService)
     {
+        appletService.setUpdateTime(DateUtils.getNowDate());
         return appletServiceMapper.updateAppletService(appletService);
     }
 
     /**
      * 批量删除平台&服务介绍信息
      * 
-     * @param titles 需要删除的平台&服务介绍信息主键
+     * @param ids 需要删除的平台&服务介绍信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletServiceByTitles(String[] titles)
+    public int deleteAppletServiceByIds(Long[] ids)
     {
-        return appletServiceMapper.deleteAppletServiceByTitles(titles);
+        return appletServiceMapper.deleteAppletServiceByIds(ids);
     }
 
     /**
      * 删除平台&服务介绍信息信息
      * 
-     * @param title 平台&服务介绍信息主键
+     * @param id 平台&服务介绍信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletServiceByTitle(String title)
+    public int deleteAppletServiceById(Long id)
     {
-        return appletServiceMapper.deleteAppletServiceByTitle(title);
+        return appletServiceMapper.deleteAppletServiceById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletTrainServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletTrainMapper;
@@ -22,13 +23,13 @@ public class AppletTrainServiceImpl implements IAppletTrainService
     /**
      * 查询服务培训
      * 
-     * @param title 服务培训主键
+     * @param id 服务培训主键
      * @return 服务培训
      */
     @Override
-    public AppletTrain selectAppletTrainByTitle(String title)
+    public AppletTrain selectAppletTrainById(Long id)
     {
-        return appletTrainMapper.selectAppletTrainByTitle(title);
+        return appletTrainMapper.selectAppletTrainById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletTrainServiceImpl implements IAppletTrainService
     @Override
     public int insertAppletTrain(AppletTrain appletTrain)
     {
+        appletTrain.setCreateTime(DateUtils.getNowDate());
         return appletTrainMapper.insertAppletTrain(appletTrain);
     }
 
@@ -64,30 +66,31 @@ public class AppletTrainServiceImpl implements IAppletTrainService
     @Override
     public int updateAppletTrain(AppletTrain appletTrain)
     {
+        appletTrain.setUpdateTime(DateUtils.getNowDate());
         return appletTrainMapper.updateAppletTrain(appletTrain);
     }
 
     /**
      * 批量删除服务培训
      * 
-     * @param titles 需要删除的服务培训主键
+     * @param ids 需要删除的服务培训主键
      * @return 结果
      */
     @Override
-    public int deleteAppletTrainByTitles(String[] titles)
+    public int deleteAppletTrainByIds(Long[] ids)
     {
-        return appletTrainMapper.deleteAppletTrainByTitles(titles);
+        return appletTrainMapper.deleteAppletTrainByIds(ids);
     }
 
     /**
      * 删除服务培训信息
      * 
-     * @param title 服务培训主键
+     * @param id 服务培训主键
      * @return 结果
      */
     @Override
-    public int deleteAppletTrainByTitle(String title)
+    public int deleteAppletTrainById(Long id)
     {
-        return appletTrainMapper.deleteAppletTrainByTitle(title);
+        return appletTrainMapper.deleteAppletTrainById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUser1ServiceImpl.java

@@ -22,13 +22,13 @@ public class AppletUser1ServiceImpl implements IAppletUser1Service
     /**
      * 查询伴宠师信息
      * 
-     * @param name 伴宠师信息主键
+     * @param id 伴宠师信息主键
      * @return 伴宠师信息
      */
     @Override
-    public AppletUser1 selectAppletUser1ByName(String name)
+    public AppletUser1 selectAppletUser1ById(Long id)
     {
-        return appletUser1Mapper.selectAppletUser1ByName(name);
+        return appletUser1Mapper.selectAppletUser1ById(id);
     }
 
     /**
@@ -70,24 +70,24 @@ public class AppletUser1ServiceImpl implements IAppletUser1Service
     /**
      * 批量删除伴宠师信息
      * 
-     * @param names 需要删除的伴宠师信息主键
+     * @param ids 需要删除的伴宠师信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletUser1ByNames(String[] names)
+    public int deleteAppletUser1ByIds(Long[] ids)
     {
-        return appletUser1Mapper.deleteAppletUser1ByNames(names);
+        return appletUser1Mapper.deleteAppletUser1ByIds(ids);
     }
 
     /**
      * 删除伴宠师信息信息
      * 
-     * @param name 伴宠师信息主键
+     * @param id 伴宠师信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletUser1ByName(String name)
+    public int deleteAppletUser1ById(Long id)
     {
-        return appletUser1Mapper.deleteAppletUser1ByName(name);
+        return appletUser1Mapper.deleteAppletUser1ById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUser2ServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletUser2Mapper;
@@ -22,13 +23,13 @@ public class AppletUser2ServiceImpl implements IAppletUser2Service
     /**
      * 查询用户服务信息
      * 
-     * @param headImage 用户服务信息主键
+     * @param id 用户服务信息主键
      * @return 用户服务信息
      */
     @Override
-    public AppletUser2 selectAppletUser2ByHeadImage(String headImage)
+    public AppletUser2 selectAppletUser2ById(Long id)
     {
-        return appletUser2Mapper.selectAppletUser2ByHeadImage(headImage);
+        return appletUser2Mapper.selectAppletUser2ById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletUser2ServiceImpl implements IAppletUser2Service
     @Override
     public int insertAppletUser2(AppletUser2 appletUser2)
     {
+        appletUser2.setCreateTime(DateUtils.getNowDate());
         return appletUser2Mapper.insertAppletUser2(appletUser2);
     }
 
@@ -64,30 +66,31 @@ public class AppletUser2ServiceImpl implements IAppletUser2Service
     @Override
     public int updateAppletUser2(AppletUser2 appletUser2)
     {
+        appletUser2.setUpdateTime(DateUtils.getNowDate());
         return appletUser2Mapper.updateAppletUser2(appletUser2);
     }
 
     /**
      * 批量删除用户服务信息
      * 
-     * @param headImages 需要删除的用户服务信息主键
+     * @param ids 需要删除的用户服务信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletUser2ByHeadImages(String[] headImages)
+    public int deleteAppletUser2ByIds(Long[] ids)
     {
-        return appletUser2Mapper.deleteAppletUser2ByHeadImages(headImages);
+        return appletUser2Mapper.deleteAppletUser2ByIds(ids);
     }
 
     /**
      * 删除用户服务信息信息
      * 
-     * @param headImage 用户服务信息主键
+     * @param id 用户服务信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletUser2ByHeadImage(String headImage)
+    public int deleteAppletUser2ById(Long id)
     {
-        return appletUser2Mapper.deleteAppletUser2ByHeadImage(headImage);
+        return appletUser2Mapper.deleteAppletUser2ById(id);
     }
 }

ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml

@@ -3,95 +3,66 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.model.mapper.AppletConfigMapper">
-    
+
     <resultMap type="AppletConfig" id="AppletConfigResult">
-        <result property="id"    column="id"    />
         <result property="paramCode"    column="param_code"    />
-        <result property="paramValue"    column="param_value"    />
         <result property="paramValueText"    column="param_value_text"    />
         <result property="paramValueImage"    column="param_value_image"    />
         <result property="paramValueArea"    column="param_value_area"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectAppletConfigVo">
-        select id, param_code, param_value_text, param_value_image, param_value_area, del_flag, create_by, create_time, update_by, update_time from applet_config
+        select param_code, param_value_text, param_value_image, param_value_area from applet_config
     </sql>
-
     <select id="selectAppletConfigList" parameterType="AppletConfig" resultMap="AppletConfigResult">
         <include refid="selectAppletConfigVo"/>
-        <where>  
+        <where>
             <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</if>
-            <if test="paramValue != null  and paramCode != ''"> and param_value = #{paramValue}</if>
-
             <if test="paramValueText != null  and paramValueText != ''"> and param_value_text = #{paramValueText}</if>
             <if test="paramValueImage != null  and paramValueImage != ''"> and param_value_image = #{paramValueImage}</if>
             <if test="paramValueArea != null  and paramValueArea != ''"> and param_value_area = #{paramValueArea}</if>
         </where>
     </select>
-    
-    <select id="selectAppletConfigById" parameterType="Long" resultMap="AppletConfigResult">
+
+    <select id="selectAppletConfigByParamCode" parameterType="String" resultMap="AppletConfigResult">
         <include refid="selectAppletConfigVo"/>
-        where id = #{id}
+        where param_code = #{paramCode}
     </select>
 
-    <insert id="insertAppletConfig" parameterType="AppletConfig" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertAppletConfig" parameterType="AppletConfig">
         insert into applet_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="paramCode != null">param_code,</if>
-            <if test="paramValue != null">param_value,</if>
             <if test="paramValueText != null">param_value_text,</if>
             <if test="paramValueImage != null">param_value_image,</if>
             <if test="paramValueArea != null">param_value_area,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paramCode != null">#{paramCode},</if>
-            <if test="paramValue != null">#{paramValue},</if>
             <if test="paramValueText != null">#{paramValueText},</if>
             <if test="paramValueImage != null">#{paramValueImage},</if>
             <if test="paramValueArea != null">#{paramValueArea},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
          </trim>
     </insert>
 
     <update id="updateAppletConfig" parameterType="AppletConfig">
         update applet_config
         <trim prefix="SET" suffixOverrides=",">
-            <if test="paramCode != null">param_code = #{paramCode},</if>
-            <if test="paramValue != null">param_value = #{paramValue},</if>
             <if test="paramValueText != null">param_value_text = #{paramValueText},</if>
             <if test="paramValueImage != null">param_value_image = #{paramValueImage},</if>
             <if test="paramValueArea != null">param_value_area = #{paramValueArea},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where param_code = #{paramCode}
     </update>
 
-    <delete id="deleteAppletConfigById" parameterType="Long">
-        delete from applet_config where id = #{id}
+    <delete id="deleteAppletConfigByParamCode" parameterType="String">
+        delete from applet_config where param_code = #{paramCode}
     </delete>
 
-    <delete id="deleteAppletConfigByIds" parameterType="String">
-        delete from applet_config where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
+    <delete id="deleteAppletConfigByParamCodes" parameterType="String">
+        delete from applet_config where param_code in
+        <foreach item="paramCode" collection="array" open="(" separator="," close=")">
+            #{paramCode}
         </foreach>
     </delete>
 </mapper>