Merge branch 'master' of http://175.178.51.79:3000/Augcl/pet-admin

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

@@ -10,9 +10,9 @@ export function listAppletAnswerBase(query) {
 }
 
 // 查询用户基本考核答案详细
-export function getAppletAnswerBase(questionId) {
+export function getAppletAnswerBase(id) {
   return request({
-    url: '/model/AppletAnswerBase/' + questionId,
+    url: '/model/AppletAnswerBase/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletAnswerBase(data) {
 }
 
 // 删除用户基本考核答案
-export function delAppletAnswerBase(questionId) {
+export function delAppletAnswerBase(id) {
   return request({
-    url: '/model/AppletAnswerBase/' + questionId,
+    url: '/model/AppletAnswerBase/' + id,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listAppletAnswerTrain(query) {
 }
 
 // 查询用户培训考核答案详细
-export function getAppletAnswerTrain(questionId) {
+export function getAppletAnswerTrain(id) {
   return request({
-    url: '/model/AppletAnswerTrain/' + questionId,
+    url: '/model/AppletAnswerTrain/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletAnswerTrain(data) {
 }
 
 // 删除用户培训考核答案
-export function delAppletAnswerTrain(questionId) {
+export function delAppletAnswerTrain(id) {
   return request({
-    url: '/model/AppletAnswerTrain/' + questionId,
+    url: '/model/AppletAnswerTrain/' + id,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listAppletComment(query) {
 }
 
 // 查询用户评价详细
-export function getAppletComment(comment) {
+export function getAppletComment(id) {
   return request({
-    url: '/model/AppletComment/' + comment,
+    url: '/model/AppletComment/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletComment(data) {
 }
 
 // 删除用户评价
-export function delAppletComment(comment) {
+export function delAppletComment(id) {
   return request({
-    url: '/model/AppletComment/' + comment,
+    url: '/model/AppletComment/' + id,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listAppletIncrease(query) {
 }
 
 // 查询增值服务详细
-export function getAppletIncrease(title) {
+export function getAppletIncrease(id) {
   return request({
-    url: '/model/AppletIncrease/' + title,
+    url: '/model/AppletIncrease/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletIncrease(data) {
 }
 
 // 删除增值服务
-export function delAppletIncrease(title) {
+export function delAppletIncrease(id) {
   return request({
-    url: '/model/AppletIncrease/' + title,
+    url: '/model/AppletIncrease/' + id,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listAppletLicense(query) {
 }
 
 // 查询专业执照信息详细
-export function getAppletLicense(title) {
+export function getAppletLicense(id) {
   return request({
-    url: '/model/AppletLicense/' + title,
+    url: '/model/AppletLicense/' + id,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppletLicense(data) {
 }
 
 // 删除专业执照信息
-export function delAppletLicense(title) {
+export function delAppletLicense(id) {
   return request({
-    url: '/model/AppletLicense/' + title,
+    url: '/model/AppletLicense/' + id,
     method: 'delete'
   })
 }

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

@@ -83,6 +83,7 @@
 
     <el-table v-loading="loading" :data="AppletAnswerBaseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="唯一标识" align="center" prop="id" />
       <el-table-column label="关联题目ID" align="center" prop="questionId" v-if="columns[0].visible"/>
       <el-table-column label="关联答案ID" align="center" prop="answerId" v-if="columns[1].visible"/>
       <el-table-column label="关联用户ID" align="center" prop="userId" v-if="columns[2].visible"/>
@@ -126,6 +127,9 @@
         <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>
@@ -189,11 +193,15 @@ export default {
           { required: true, message: "关联用户ID不能为空", trigger: "blur" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "关联题目ID", visible:  true  },
-    { key: 1, label: "关联答案ID", visible:  true  },
-    { key: 2, label: "关联用户ID", visible:  true  },
+    { key: 1, label: "关联题目ID", visible:  true  },
+    { key: 2, label: "关联答案ID", visible:  true  },
+    { key: 3, label: "关联用户ID", visible:  true  },
      ],
     };
   },
@@ -218,12 +226,24 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         questionId: null,
 
         answerId: null,
 
         userId: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -239,7 +259,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.questionId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -252,8 +272,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const questionId = row.questionId || this.ids
-      getAppletAnswerBase(questionId).then(response => {
+      const id = row.id || this.ids
+      getAppletAnswerBase(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改用户基本考核答案";
@@ -263,7 +283,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.questionId != null) {
+          if (this.form.id != null) {
             updateAppletAnswerBase(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -281,9 +301,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const questionIds = row.questionId || this.ids;
-      this.$modal.confirm('是否确认删除用户基本考核答案编号为"' + questionIds + '"的数据项？').then(function() {
-        return delAppletAnswerBase(questionIds);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户基本考核答案编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletAnswerBase(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -74,6 +74,7 @@
 
     <el-table v-loading="loading" :data="AppletAnswerTrainList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="唯一标识" align="center" prop="id" />
       <el-table-column label="关联题目ID" align="center" prop="questionId" v-if="columns[0].visible"/>
       <el-table-column label="关联用户ID" align="center" prop="userId" v-if="columns[1].visible"/>
       <el-table-column label="答案内容" align="center" prop="answer" v-if="columns[2].visible"/>
@@ -121,6 +122,9 @@
         <el-form-item label="审核备注" prop="remark">
           <el-input v-model="form.remark" 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>
@@ -184,12 +188,16 @@ export default {
           { required: true, message: "答案内容不能为空", trigger: "blur" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "关联题目ID", visible:  true  },
-    { key: 1, label: "关联用户ID", visible:  true  },
-    { key: 2, label: "答案内容", visible:  true  },
-    { key: 3, label: "审核备注", visible:  true  },
+    { key: 1, label: "关联题目ID", visible:  true  },
+    { key: 2, label: "关联用户ID", visible:  true  },
+    { key: 3, label: "答案内容", visible:  true  },
+    { key: 4, label: "审核备注", visible:  true  },
      ],
     };
   },
@@ -214,6 +222,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         questionId: null,
 
         userId: null,
@@ -222,6 +232,16 @@ export default {
 
         remark: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -237,7 +257,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.questionId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -250,8 +270,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const questionId = row.questionId || this.ids
-      getAppletAnswerTrain(questionId).then(response => {
+      const id = row.id || this.ids
+      getAppletAnswerTrain(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改用户培训考核答案";
@@ -261,7 +281,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.questionId != null) {
+          if (this.form.id != null) {
             updateAppletAnswerTrain(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -279,9 +299,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const questionIds = row.questionId || this.ids;
-      this.$modal.confirm('是否确认删除用户培训考核答案编号为"' + questionIds + '"的数据项？').then(function() {
-        return delAppletAnswerTrain(questionIds);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户培训考核答案编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletAnswerTrain(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -83,6 +83,7 @@
 
     <el-table v-loading="loading" :data="AppletCommentList" @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="comment" v-if="columns[0].visible"/>
       <el-table-column label="满意度" align="center" prop="satisfaction" v-if="columns[1].visible"/>
       <el-table-column label="关联评价人员ID" align="center" prop="user1Id" v-if="columns[2].visible"/>
@@ -130,6 +131,9 @@
         <el-form-item label="关联服务人员ID" prop="user2Id">
           <el-input v-model="form.user2Id" 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>
@@ -199,12 +203,16 @@ export default {
           { required: true, message: "关联服务人员ID不能为空", trigger: "blur" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "评价内容", visible:  true  },
-    { key: 1, label: "满意度", visible:  true  },
-    { key: 2, label: "关联评价人员ID", visible:  true  },
-    { key: 3, label: "关联服务人员ID", visible:  true  },
+    { key: 1, label: "评价内容", visible:  true  },
+    { key: 2, label: "满意度", visible:  true  },
+    { key: 3, label: "关联评价人员ID", visible:  true  },
+    { key: 4, label: "关联服务人员ID", visible:  true  },
      ],
     };
   },
@@ -229,6 +237,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         comment: null,
 
         satisfaction: null,
@@ -237,6 +247,16 @@ export default {
 
         user2Id: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -252,7 +272,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.comment)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -265,8 +285,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const comment = row.comment || this.ids
-      getAppletComment(comment).then(response => {
+      const id = row.id || this.ids
+      getAppletComment(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改用户评价";
@@ -276,7 +296,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.comment != null) {
+          if (this.form.id != null) {
             updateAppletComment(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -294,9 +314,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const comments = row.comment || this.ids;
-      this.$modal.confirm('是否确认删除用户评价编号为"' + comments + '"的数据项？').then(function() {
-        return delAppletComment(comments);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户评价编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletComment(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -0,0 +1,290 @@
+<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:AppletIncrease: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:AppletIncrease: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:AppletIncrease: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:AppletIncrease:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletIncreaseList" @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="detail" 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:AppletIncrease:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletIncrease: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="detail">
+          <el-input v-model="form.detail" 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 { listAppletIncrease, getAppletIncrease, delAppletIncrease, addAppletIncrease, updateAppletIncrease, exportAppletIncrease } from "@/api/model/AppletIncrease";
+
+export default {
+  name: "AppletIncrease",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 增值服务表格数据
+      AppletIncreaseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+
+        detail: 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;
+      listAppletIncrease(this.queryParams).then(response => {
+        this.AppletIncreaseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        title: null,
+
+        detail: 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
+      getAppletIncrease(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) {
+            updateAppletIncrease(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletIncrease(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 delAppletIncrease(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有增值服务数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletIncrease(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

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

@@ -65,6 +65,7 @@
 
     <el-table v-loading="loading" :data="AppletLicenseList" @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="image" v-if="columns[1].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -104,6 +105,9 @@
         <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>
@@ -157,10 +161,14 @@ export default {
           { required: true, message: "标题不能为空", trigger: "blur" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "标题", visible:  true  },
-    { key: 1, label: "图片", visible:  false  },
+    { key: 1, label: "标题", visible:  true  },
+    { key: 2, label: "图片", visible:  false  },
      ],
     };
   },
@@ -185,10 +193,22 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         title: null,
 
         image: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -204,7 +224,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.title)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -217,8 +237,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const title = row.title || this.ids
-      getAppletLicense(title).then(response => {
+      const id = row.id || this.ids
+      getAppletLicense(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改专业执照信息";
@@ -228,7 +248,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.title != null) {
+          if (this.form.id != null) {
             updateAppletLicense(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -246,9 +266,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const titles = row.title || this.ids;
-      this.$modal.confirm('是否确认删除专业执照信息编号为"' + titles + '"的数据项？').then(function() {
-        return delAppletLicense(titles);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除专业执照信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletLicense(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -66,8 +66,18 @@
     <el-table v-loading="loading" :data="AppletPetTypeList" @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="image" v-if="columns[1].visible"/>
+      <el-table-column label="标题" align="center" prop="title"/>
+<!--      <el-table-column label="图片" align="center" prop="image" v-if="columns[1].visible"/>-->
+
+
+      <el-table-column label="图片" align="center" prop="image">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.image" :src="row.image" :preview-src-list="[row.image]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+
+
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -87,7 +97,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -103,7 +113,8 @@
           <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
         <el-form-item label="图片">
-          <imageUpload v-model="form.image"/>
+<!--          <imageUpload v-model="form.image"/>-->
+          <oss-image-upload v-model="form.image" :limit="1"></oss-image-upload>
         </el-form-item>
         <el-form-item label="删除标识" prop="delFlag">
           <el-input v-model="form.delFlag" placeholder="请输入删除标识" />

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

@@ -26,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 用户基本考核答案Controller
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @RestController
 @RequestMapping("/model/AppletAnswerBase")
@@ -63,10 +63,10 @@ public class AppletAnswerBaseController extends BaseController
      * 获取用户基本考核答案详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAnswerBase:query')")
-    @GetMapping(value = "/{questionId}")
-    public AjaxResult getInfo(@PathVariable("questionId") Long questionId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletAnswerBaseService.selectAppletAnswerBaseByQuestionId(questionId));
+        return success(appletAnswerBaseService.selectAppletAnswerBaseById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletAnswerBaseController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAnswerBase:remove')")
     @Log(title = "用户基本考核答案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{questionIds}")
-    public AjaxResult remove(@PathVariable Long[] questionIds)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletAnswerBaseService.deleteAppletAnswerBaseByQuestionIds(questionIds));
+        return toAjax(appletAnswerBaseService.deleteAppletAnswerBaseByIds(ids));
     }
 }

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

@@ -26,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 用户培训考核答案Controller
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @RestController
 @RequestMapping("/model/AppletAnswerTrain")
@@ -63,10 +63,10 @@ public class AppletAnswerTrainController extends BaseController
      * 获取用户培训考核答案详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAnswerTrain:query')")
-    @GetMapping(value = "/{questionId}")
-    public AjaxResult getInfo(@PathVariable("questionId") Long questionId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletAnswerTrainService.selectAppletAnswerTrainByQuestionId(questionId));
+        return success(appletAnswerTrainService.selectAppletAnswerTrainById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletAnswerTrainController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletAnswerTrain:remove')")
     @Log(title = "用户培训考核答案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{questionIds}")
-    public AjaxResult remove(@PathVariable Long[] questionIds)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletAnswerTrainService.deleteAppletAnswerTrainByQuestionIds(questionIds));
+        return toAjax(appletAnswerTrainService.deleteAppletAnswerTrainByIds(ids));
     }
 }

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

@@ -63,10 +63,10 @@ public class AppletCommentController extends BaseController
      * 获取用户评价详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletComment:query')")
-    @GetMapping(value = "/{comment}")
-    public AjaxResult getInfo(@PathVariable("comment") String comment)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletCommentService.selectAppletCommentByComment(comment));
+        return success(appletCommentService.selectAppletCommentById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletCommentController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletComment:remove')")
     @Log(title = "用户评价", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{comments}")
-    public AjaxResult remove(@PathVariable String[] comments)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletCommentService.deleteAppletCommentByComments(comments));
+        return toAjax(appletCommentService.deleteAppletCommentByIds(ids));
     }
 }

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

@@ -63,10 +63,10 @@ public class AppletIncreaseController extends BaseController
      * 获取增值服务详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletIncrease:query')")
-    @GetMapping(value = "/{title}")
-    public AjaxResult getInfo(@PathVariable("title") String title)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletIncreaseService.selectAppletIncreaseByTitle(title));
+        return success(appletIncreaseService.selectAppletIncreaseById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletIncreaseController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletIncrease:remove')")
     @Log(title = "增值服务", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{titles}")
-    public AjaxResult remove(@PathVariable String[] titles)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletIncreaseService.deleteAppletIncreaseByTitles(titles));
+        return toAjax(appletIncreaseService.deleteAppletIncreaseByIds(ids));
     }
 }

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

@@ -63,10 +63,10 @@ public class AppletLicenseController extends BaseController
      * 获取专业执照信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('model:AppletLicense:query')")
-    @GetMapping(value = "/{title}")
-    public AjaxResult getInfo(@PathVariable("title") String title)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(appletLicenseService.selectAppletLicenseByTitle(title));
+        return success(appletLicenseService.selectAppletLicenseById(id));
     }
 
     /**
@@ -96,9 +96,9 @@ public class AppletLicenseController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('model:AppletLicense:remove')")
     @Log(title = "专业执照信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{titles}")
-    public AjaxResult remove(@PathVariable String[] titles)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(appletLicenseService.deleteAppletLicenseByTitles(titles));
+        return toAjax(appletLicenseService.deleteAppletLicenseByIds(ids));
     }
 }

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

@@ -9,12 +9,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 用户基本考核答案对象 applet_answer_base
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public class AppletAnswerBase extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 关联题目ID */
     @Excel(name = "关联题目ID")
     private Long questionId;
@@ -27,6 +30,18 @@ public class AppletAnswerBase 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 setQuestionId(Long questionId) 
     {
         this.questionId = questionId;
@@ -54,13 +69,28 @@ public class AppletAnswerBase 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("questionId", getQuestionId())
             .append("answerId", getAnswerId())
             .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/AppletAnswerTrain.java

@@ -9,12 +9,15 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 用户培训考核答案对象 applet_answer_train
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public class AppletAnswerTrain extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 关联题目ID */
     @Excel(name = "关联题目ID")
     private Long questionId;
@@ -27,6 +30,18 @@ public class AppletAnswerTrain extends BaseEntity
     @Excel(name = "答案内容")
     private String answer;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setQuestionId(Long questionId) 
     {
         this.questionId = questionId;
@@ -54,14 +69,29 @@ public class AppletAnswerTrain extends BaseEntity
     {
         return answer;
     }
+    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("questionId", getQuestionId())
             .append("userId", getUserId())
             .append("answer", getAnswer())
             .append("remark", getRemark())
+            .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/AppletComment.java

@@ -15,6 +15,9 @@ public class AppletComment extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 评价内容 */
     @Excel(name = "评价内容")
     private String comment;
@@ -31,6 +34,18 @@ public class AppletComment extends BaseEntity
     @Excel(name = "关联服务人员ID")
     private Long user2Id;
 
+    /** 删除标识 */
+    private Integer delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
     public void setComment(String comment) 
     {
         this.comment = comment;
@@ -67,14 +82,29 @@ public class AppletComment extends BaseEntity
     {
         return user2Id;
     }
+    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("comment", getComment())
             .append("satisfaction", getSatisfaction())
             .append("user1Id", getUser1Id())
             .append("user2Id", getUser2Id())
+            .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/AppletIncrease.java

@@ -15,6 +15,9 @@ public class AppletIncrease extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 标题 */
     @Excel(name = "标题")
     private String title;
@@ -23,6 +26,18 @@ public class AppletIncrease extends BaseEntity
     @Excel(name = "详情")
     private String detail;
 
+    /** 删除标识 */
+    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 AppletIncrease extends BaseEntity
     {
         return detail;
     }
+    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("detail", getDetail())
+            .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/AppletLicense.java

@@ -15,6 +15,9 @@ public class AppletLicense extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 唯一标识 */
+    private Long id;
+
     /** 标题 */
     @Excel(name = "标题")
     private String title;
@@ -23,6 +26,18 @@ public class AppletLicense 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 setTitle(String title) 
     {
         this.title = title;
@@ -41,12 +56,27 @@ public class AppletLicense 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("title", getTitle())
             .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/mapper/AppletAnswerBaseMapper.java

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAnswerBase;
  * 用户基本考核答案Mapper接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface AppletAnswerBaseMapper 
 {
     /**
      * 查询用户基本考核答案
      * 
-     * @param questionId 用户基本考核答案主键
+     * @param id 用户基本考核答案主键
      * @return 用户基本考核答案
      */
-    public AppletAnswerBase selectAppletAnswerBaseByQuestionId(Long questionId);
+    public AppletAnswerBase selectAppletAnswerBaseById(Long id);
 
     /**
      * 查询用户基本考核答案列表
@@ -46,16 +46,16 @@ public interface AppletAnswerBaseMapper
     /**
      * 删除用户基本考核答案
      * 
-     * @param questionId 用户基本考核答案主键
+     * @param id 用户基本考核答案主键
      * @return 结果
      */
-    public int deleteAppletAnswerBaseByQuestionId(Long questionId);
+    public int deleteAppletAnswerBaseById(Long id);
 
     /**
      * 批量删除用户基本考核答案
      * 
-     * @param questionIds 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletAnswerBaseByQuestionIds(Long[] questionIds);
+    public int deleteAppletAnswerBaseByIds(Long[] ids);
 }

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

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAnswerTrain;
  * 用户培训考核答案Mapper接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface AppletAnswerTrainMapper 
 {
     /**
      * 查询用户培训考核答案
      * 
-     * @param questionId 用户培训考核答案主键
+     * @param id 用户培训考核答案主键
      * @return 用户培训考核答案
      */
-    public AppletAnswerTrain selectAppletAnswerTrainByQuestionId(Long questionId);
+    public AppletAnswerTrain selectAppletAnswerTrainById(Long id);
 
     /**
      * 查询用户培训考核答案列表
@@ -46,16 +46,16 @@ public interface AppletAnswerTrainMapper
     /**
      * 删除用户培训考核答案
      * 
-     * @param questionId 用户培训考核答案主键
+     * @param id 用户培训考核答案主键
      * @return 结果
      */
-    public int deleteAppletAnswerTrainByQuestionId(Long questionId);
+    public int deleteAppletAnswerTrainById(Long id);
 
     /**
      * 批量删除用户培训考核答案
      * 
-     * @param questionIds 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletAnswerTrainByQuestionIds(Long[] questionIds);
+    public int deleteAppletAnswerTrainByIds(Long[] ids);
 }

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

@@ -14,10 +14,10 @@ public interface AppletCommentMapper
     /**
      * 查询用户评价
      * 
-     * @param comment 用户评价主键
+     * @param id 用户评价主键
      * @return 用户评价
      */
-    public AppletComment selectAppletCommentByComment(String comment);
+    public AppletComment selectAppletCommentById(Long id);
 
     /**
      * 查询用户评价列表
@@ -46,16 +46,16 @@ public interface AppletCommentMapper
     /**
      * 删除用户评价
      * 
-     * @param comment 用户评价主键
+     * @param id 用户评价主键
      * @return 结果
      */
-    public int deleteAppletCommentByComment(String comment);
+    public int deleteAppletCommentById(Long id);
 
     /**
      * 批量删除用户评价
      * 
-     * @param comments 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletCommentByComments(String[] comments);
+    public int deleteAppletCommentByIds(Long[] ids);
 }

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

@@ -14,10 +14,10 @@ public interface AppletIncreaseMapper
     /**
      * 查询增值服务
      * 
-     * @param title 增值服务主键
+     * @param id 增值服务主键
      * @return 增值服务
      */
-    public AppletIncrease selectAppletIncreaseByTitle(String title);
+    public AppletIncrease selectAppletIncreaseById(Long id);
 
     /**
      * 查询增值服务列表
@@ -46,16 +46,16 @@ public interface AppletIncreaseMapper
     /**
      * 删除增值服务
      * 
-     * @param title 增值服务主键
+     * @param id 增值服务主键
      * @return 结果
      */
-    public int deleteAppletIncreaseByTitle(String title);
+    public int deleteAppletIncreaseById(Long id);
 
     /**
      * 批量删除增值服务
      * 
-     * @param titles 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletIncreaseByTitles(String[] titles);
+    public int deleteAppletIncreaseByIds(Long[] ids);
 }

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

@@ -14,10 +14,10 @@ public interface AppletLicenseMapper
     /**
      * 查询专业执照信息
      * 
-     * @param title 专业执照信息主键
+     * @param id 专业执照信息主键
      * @return 专业执照信息
      */
-    public AppletLicense selectAppletLicenseByTitle(String title);
+    public AppletLicense selectAppletLicenseById(Long id);
 
     /**
      * 查询专业执照信息列表
@@ -46,16 +46,16 @@ public interface AppletLicenseMapper
     /**
      * 删除专业执照信息
      * 
-     * @param title 专业执照信息主键
+     * @param id 专业执照信息主键
      * @return 结果
      */
-    public int deleteAppletLicenseByTitle(String title);
+    public int deleteAppletLicenseById(Long id);
 
     /**
      * 批量删除专业执照信息
      * 
-     * @param titles 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAppletLicenseByTitles(String[] titles);
+    public int deleteAppletLicenseByIds(Long[] ids);
 }

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

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAnswerBase;
  * 用户基本考核答案Service接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface IAppletAnswerBaseService 
 {
     /**
      * 查询用户基本考核答案
      * 
-     * @param questionId 用户基本考核答案主键
+     * @param id 用户基本考核答案主键
      * @return 用户基本考核答案
      */
-    public AppletAnswerBase selectAppletAnswerBaseByQuestionId(Long questionId);
+    public AppletAnswerBase selectAppletAnswerBaseById(Long id);
 
     /**
      * 查询用户基本考核答案列表
@@ -46,16 +46,16 @@ public interface IAppletAnswerBaseService
     /**
      * 批量删除用户基本考核答案
      * 
-     * @param questionIds 需要删除的用户基本考核答案主键集合
+     * @param ids 需要删除的用户基本考核答案主键集合
      * @return 结果
      */
-    public int deleteAppletAnswerBaseByQuestionIds(Long[] questionIds);
+    public int deleteAppletAnswerBaseByIds(Long[] ids);
 
     /**
      * 删除用户基本考核答案信息
      * 
-     * @param questionId 用户基本考核答案主键
+     * @param id 用户基本考核答案主键
      * @return 结果
      */
-    public int deleteAppletAnswerBaseByQuestionId(Long questionId);
+    public int deleteAppletAnswerBaseById(Long id);
 }

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

@@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletAnswerTrain;
  * 用户培训考核答案Service接口
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 public interface IAppletAnswerTrainService 
 {
     /**
      * 查询用户培训考核答案
      * 
-     * @param questionId 用户培训考核答案主键
+     * @param id 用户培训考核答案主键
      * @return 用户培训考核答案
      */
-    public AppletAnswerTrain selectAppletAnswerTrainByQuestionId(Long questionId);
+    public AppletAnswerTrain selectAppletAnswerTrainById(Long id);
 
     /**
      * 查询用户培训考核答案列表
@@ -46,16 +46,16 @@ public interface IAppletAnswerTrainService
     /**
      * 批量删除用户培训考核答案
      * 
-     * @param questionIds 需要删除的用户培训考核答案主键集合
+     * @param ids 需要删除的用户培训考核答案主键集合
      * @return 结果
      */
-    public int deleteAppletAnswerTrainByQuestionIds(Long[] questionIds);
+    public int deleteAppletAnswerTrainByIds(Long[] ids);
 
     /**
      * 删除用户培训考核答案信息
      * 
-     * @param questionId 用户培训考核答案主键
+     * @param id 用户培训考核答案主键
      * @return 结果
      */
-    public int deleteAppletAnswerTrainByQuestionId(Long questionId);
+    public int deleteAppletAnswerTrainById(Long id);
 }

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

@@ -14,10 +14,10 @@ public interface IAppletCommentService
     /**
      * 查询用户评价
      * 
-     * @param comment 用户评价主键
+     * @param id 用户评价主键
      * @return 用户评价
      */
-    public AppletComment selectAppletCommentByComment(String comment);
+    public AppletComment selectAppletCommentById(Long id);
 
     /**
      * 查询用户评价列表
@@ -46,16 +46,16 @@ public interface IAppletCommentService
     /**
      * 批量删除用户评价
      * 
-     * @param comments 需要删除的用户评价主键集合
+     * @param ids 需要删除的用户评价主键集合
      * @return 结果
      */
-    public int deleteAppletCommentByComments(String[] comments);
+    public int deleteAppletCommentByIds(Long[] ids);
 
     /**
      * 删除用户评价信息
      * 
-     * @param comment 用户评价主键
+     * @param id 用户评价主键
      * @return 结果
      */
-    public int deleteAppletCommentByComment(String comment);
+    public int deleteAppletCommentById(Long id);
 }

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

@@ -14,10 +14,10 @@ public interface IAppletIncreaseService
     /**
      * 查询增值服务
      * 
-     * @param title 增值服务主键
+     * @param id 增值服务主键
      * @return 增值服务
      */
-    public AppletIncrease selectAppletIncreaseByTitle(String title);
+    public AppletIncrease selectAppletIncreaseById(Long id);
 
     /**
      * 查询增值服务列表
@@ -46,16 +46,16 @@ public interface IAppletIncreaseService
     /**
      * 批量删除增值服务
      * 
-     * @param titles 需要删除的增值服务主键集合
+     * @param ids 需要删除的增值服务主键集合
      * @return 结果
      */
-    public int deleteAppletIncreaseByTitles(String[] titles);
+    public int deleteAppletIncreaseByIds(Long[] ids);
 
     /**
      * 删除增值服务信息
      * 
-     * @param title 增值服务主键
+     * @param id 增值服务主键
      * @return 结果
      */
-    public int deleteAppletIncreaseByTitle(String title);
+    public int deleteAppletIncreaseById(Long id);
 }

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

@@ -14,10 +14,10 @@ public interface IAppletLicenseService
     /**
      * 查询专业执照信息
      * 
-     * @param title 专业执照信息主键
+     * @param id 专业执照信息主键
      * @return 专业执照信息
      */
-    public AppletLicense selectAppletLicenseByTitle(String title);
+    public AppletLicense selectAppletLicenseById(Long id);
 
     /**
      * 查询专业执照信息列表
@@ -46,16 +46,16 @@ public interface IAppletLicenseService
     /**
      * 批量删除专业执照信息
      * 
-     * @param titles 需要删除的专业执照信息主键集合
+     * @param ids 需要删除的专业执照信息主键集合
      * @return 结果
      */
-    public int deleteAppletLicenseByTitles(String[] titles);
+    public int deleteAppletLicenseByIds(Long[] ids);
 
     /**
      * 删除专业执照信息信息
      * 
-     * @param title 专业执照信息主键
+     * @param id 专业执照信息主键
      * @return 结果
      */
-    public int deleteAppletLicenseByTitle(String title);
+    public int deleteAppletLicenseById(Long id);
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerBaseServiceImpl.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.AppletAnswerBaseMapper;
@@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletAnswerBaseService;
  * 用户基本考核答案Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @Service
 public class AppletAnswerBaseServiceImpl implements IAppletAnswerBaseService 
@@ -22,13 +23,13 @@ public class AppletAnswerBaseServiceImpl implements IAppletAnswerBaseService
     /**
      * 查询用户基本考核答案
      * 
-     * @param questionId 用户基本考核答案主键
+     * @param id 用户基本考核答案主键
      * @return 用户基本考核答案
      */
     @Override
-    public AppletAnswerBase selectAppletAnswerBaseByQuestionId(Long questionId)
+    public AppletAnswerBase selectAppletAnswerBaseById(Long id)
     {
-        return appletAnswerBaseMapper.selectAppletAnswerBaseByQuestionId(questionId);
+        return appletAnswerBaseMapper.selectAppletAnswerBaseById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletAnswerBaseServiceImpl implements IAppletAnswerBaseService
     @Override
     public int insertAppletAnswerBase(AppletAnswerBase appletAnswerBase)
     {
+        appletAnswerBase.setCreateTime(DateUtils.getNowDate());
         return appletAnswerBaseMapper.insertAppletAnswerBase(appletAnswerBase);
     }
 
@@ -64,30 +66,31 @@ public class AppletAnswerBaseServiceImpl implements IAppletAnswerBaseService
     @Override
     public int updateAppletAnswerBase(AppletAnswerBase appletAnswerBase)
     {
+        appletAnswerBase.setUpdateTime(DateUtils.getNowDate());
         return appletAnswerBaseMapper.updateAppletAnswerBase(appletAnswerBase);
     }
 
     /**
      * 批量删除用户基本考核答案
      * 
-     * @param questionIds 需要删除的用户基本考核答案主键
+     * @param ids 需要删除的用户基本考核答案主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAnswerBaseByQuestionIds(Long[] questionIds)
+    public int deleteAppletAnswerBaseByIds(Long[] ids)
     {
-        return appletAnswerBaseMapper.deleteAppletAnswerBaseByQuestionIds(questionIds);
+        return appletAnswerBaseMapper.deleteAppletAnswerBaseByIds(ids);
     }
 
     /**
      * 删除用户基本考核答案信息
      * 
-     * @param questionId 用户基本考核答案主键
+     * @param id 用户基本考核答案主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAnswerBaseByQuestionId(Long questionId)
+    public int deleteAppletAnswerBaseById(Long id)
     {
-        return appletAnswerBaseMapper.deleteAppletAnswerBaseByQuestionId(questionId);
+        return appletAnswerBaseMapper.deleteAppletAnswerBaseById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerTrainServiceImpl.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.AppletAnswerTrainMapper;
@@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletAnswerTrainService;
  * 用户培训考核答案Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-03-27
+ * @date 2025-03-28
  */
 @Service
 public class AppletAnswerTrainServiceImpl implements IAppletAnswerTrainService 
@@ -22,13 +23,13 @@ public class AppletAnswerTrainServiceImpl implements IAppletAnswerTrainService
     /**
      * 查询用户培训考核答案
      * 
-     * @param questionId 用户培训考核答案主键
+     * @param id 用户培训考核答案主键
      * @return 用户培训考核答案
      */
     @Override
-    public AppletAnswerTrain selectAppletAnswerTrainByQuestionId(Long questionId)
+    public AppletAnswerTrain selectAppletAnswerTrainById(Long id)
     {
-        return appletAnswerTrainMapper.selectAppletAnswerTrainByQuestionId(questionId);
+        return appletAnswerTrainMapper.selectAppletAnswerTrainById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletAnswerTrainServiceImpl implements IAppletAnswerTrainService
     @Override
     public int insertAppletAnswerTrain(AppletAnswerTrain appletAnswerTrain)
     {
+        appletAnswerTrain.setCreateTime(DateUtils.getNowDate());
         return appletAnswerTrainMapper.insertAppletAnswerTrain(appletAnswerTrain);
     }
 
@@ -64,30 +66,31 @@ public class AppletAnswerTrainServiceImpl implements IAppletAnswerTrainService
     @Override
     public int updateAppletAnswerTrain(AppletAnswerTrain appletAnswerTrain)
     {
+        appletAnswerTrain.setUpdateTime(DateUtils.getNowDate());
         return appletAnswerTrainMapper.updateAppletAnswerTrain(appletAnswerTrain);
     }
 
     /**
      * 批量删除用户培训考核答案
      * 
-     * @param questionIds 需要删除的用户培训考核答案主键
+     * @param ids 需要删除的用户培训考核答案主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAnswerTrainByQuestionIds(Long[] questionIds)
+    public int deleteAppletAnswerTrainByIds(Long[] ids)
     {
-        return appletAnswerTrainMapper.deleteAppletAnswerTrainByQuestionIds(questionIds);
+        return appletAnswerTrainMapper.deleteAppletAnswerTrainByIds(ids);
     }
 
     /**
      * 删除用户培训考核答案信息
      * 
-     * @param questionId 用户培训考核答案主键
+     * @param id 用户培训考核答案主键
      * @return 结果
      */
     @Override
-    public int deleteAppletAnswerTrainByQuestionId(Long questionId)
+    public int deleteAppletAnswerTrainById(Long id)
     {
-        return appletAnswerTrainMapper.deleteAppletAnswerTrainByQuestionId(questionId);
+        return appletAnswerTrainMapper.deleteAppletAnswerTrainById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletCommentServiceImpl.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.AppletCommentMapper;
@@ -22,13 +23,13 @@ public class AppletCommentServiceImpl implements IAppletCommentService
     /**
      * 查询用户评价
      * 
-     * @param comment 用户评价主键
+     * @param id 用户评价主键
      * @return 用户评价
      */
     @Override
-    public AppletComment selectAppletCommentByComment(String comment)
+    public AppletComment selectAppletCommentById(Long id)
     {
-        return appletCommentMapper.selectAppletCommentByComment(comment);
+        return appletCommentMapper.selectAppletCommentById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletCommentServiceImpl implements IAppletCommentService
     @Override
     public int insertAppletComment(AppletComment appletComment)
     {
+        appletComment.setCreateTime(DateUtils.getNowDate());
         return appletCommentMapper.insertAppletComment(appletComment);
     }
 
@@ -64,30 +66,31 @@ public class AppletCommentServiceImpl implements IAppletCommentService
     @Override
     public int updateAppletComment(AppletComment appletComment)
     {
+        appletComment.setUpdateTime(DateUtils.getNowDate());
         return appletCommentMapper.updateAppletComment(appletComment);
     }
 
     /**
      * 批量删除用户评价
      * 
-     * @param comments 需要删除的用户评价主键
+     * @param ids 需要删除的用户评价主键
      * @return 结果
      */
     @Override
-    public int deleteAppletCommentByComments(String[] comments)
+    public int deleteAppletCommentByIds(Long[] ids)
     {
-        return appletCommentMapper.deleteAppletCommentByComments(comments);
+        return appletCommentMapper.deleteAppletCommentByIds(ids);
     }
 
     /**
      * 删除用户评价信息
      * 
-     * @param comment 用户评价主键
+     * @param id 用户评价主键
      * @return 结果
      */
     @Override
-    public int deleteAppletCommentByComment(String comment)
+    public int deleteAppletCommentById(Long id)
     {
-        return appletCommentMapper.deleteAppletCommentByComment(comment);
+        return appletCommentMapper.deleteAppletCommentById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletIncreaseServiceImpl.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.AppletIncreaseMapper;
@@ -22,13 +23,13 @@ public class AppletIncreaseServiceImpl implements IAppletIncreaseService
     /**
      * 查询增值服务
      * 
-     * @param title 增值服务主键
+     * @param id 增值服务主键
      * @return 增值服务
      */
     @Override
-    public AppletIncrease selectAppletIncreaseByTitle(String title)
+    public AppletIncrease selectAppletIncreaseById(Long id)
     {
-        return appletIncreaseMapper.selectAppletIncreaseByTitle(title);
+        return appletIncreaseMapper.selectAppletIncreaseById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletIncreaseServiceImpl implements IAppletIncreaseService
     @Override
     public int insertAppletIncrease(AppletIncrease appletIncrease)
     {
+        appletIncrease.setCreateTime(DateUtils.getNowDate());
         return appletIncreaseMapper.insertAppletIncrease(appletIncrease);
     }
 
@@ -64,30 +66,31 @@ public class AppletIncreaseServiceImpl implements IAppletIncreaseService
     @Override
     public int updateAppletIncrease(AppletIncrease appletIncrease)
     {
+        appletIncrease.setUpdateTime(DateUtils.getNowDate());
         return appletIncreaseMapper.updateAppletIncrease(appletIncrease);
     }
 
     /**
      * 批量删除增值服务
      * 
-     * @param titles 需要删除的增值服务主键
+     * @param ids 需要删除的增值服务主键
      * @return 结果
      */
     @Override
-    public int deleteAppletIncreaseByTitles(String[] titles)
+    public int deleteAppletIncreaseByIds(Long[] ids)
     {
-        return appletIncreaseMapper.deleteAppletIncreaseByTitles(titles);
+        return appletIncreaseMapper.deleteAppletIncreaseByIds(ids);
     }
 
     /**
      * 删除增值服务信息
      * 
-     * @param title 增值服务主键
+     * @param id 增值服务主键
      * @return 结果
      */
     @Override
-    public int deleteAppletIncreaseByTitle(String title)
+    public int deleteAppletIncreaseById(Long id)
     {
-        return appletIncreaseMapper.deleteAppletIncreaseByTitle(title);
+        return appletIncreaseMapper.deleteAppletIncreaseById(id);
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletLicenseServiceImpl.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.AppletLicenseMapper;
@@ -22,13 +23,13 @@ public class AppletLicenseServiceImpl implements IAppletLicenseService
     /**
      * 查询专业执照信息
      * 
-     * @param title 专业执照信息主键
+     * @param id 专业执照信息主键
      * @return 专业执照信息
      */
     @Override
-    public AppletLicense selectAppletLicenseByTitle(String title)
+    public AppletLicense selectAppletLicenseById(Long id)
     {
-        return appletLicenseMapper.selectAppletLicenseByTitle(title);
+        return appletLicenseMapper.selectAppletLicenseById(id);
     }
 
     /**
@@ -52,6 +53,7 @@ public class AppletLicenseServiceImpl implements IAppletLicenseService
     @Override
     public int insertAppletLicense(AppletLicense appletLicense)
     {
+        appletLicense.setCreateTime(DateUtils.getNowDate());
         return appletLicenseMapper.insertAppletLicense(appletLicense);
     }
 
@@ -64,30 +66,31 @@ public class AppletLicenseServiceImpl implements IAppletLicenseService
     @Override
     public int updateAppletLicense(AppletLicense appletLicense)
     {
+        appletLicense.setUpdateTime(DateUtils.getNowDate());
         return appletLicenseMapper.updateAppletLicense(appletLicense);
     }
 
     /**
      * 批量删除专业执照信息
      * 
-     * @param titles 需要删除的专业执照信息主键
+     * @param ids 需要删除的专业执照信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletLicenseByTitles(String[] titles)
+    public int deleteAppletLicenseByIds(Long[] ids)
     {
-        return appletLicenseMapper.deleteAppletLicenseByTitles(titles);
+        return appletLicenseMapper.deleteAppletLicenseByIds(ids);
     }
 
     /**
      * 删除专业执照信息信息
      * 
-     * @param title 专业执照信息主键
+     * @param id 专业执照信息主键
      * @return 结果
      */
     @Override
-    public int deleteAppletLicenseByTitle(String title)
+    public int deleteAppletLicenseById(Long id)
     {
-        return appletLicenseMapper.deleteAppletLicenseByTitle(title);
+        return appletLicenseMapper.deleteAppletLicenseById(id);
     }
 }

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

@@ -5,13 +5,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletAnswerBaseMapper">
     
     <resultMap type="AppletAnswerBase" id="AppletAnswerBaseResult">
+        <result property="id"    column="id"    />
         <result property="questionId"    column="question_id"    />
         <result property="answerId"    column="answer_id"    />
         <result property="userId"    column="user_id"    />
+        <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="selectAppletAnswerBaseVo">
-        select question_id, answer_id, user_id from applet_answer_base
+        select id, question_id, answer_id, user_id, del_flag, create_by, create_time, update_by, update_time from applet_answer_base
     </sql>
 
     <select id="selectAppletAnswerBaseList" parameterType="AppletAnswerBase" resultMap="AppletAnswerBaseResult">
@@ -23,42 +29,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletAnswerBaseByQuestionId" parameterType="Long" resultMap="AppletAnswerBaseResult">
+    <select id="selectAppletAnswerBaseById" parameterType="Long" resultMap="AppletAnswerBaseResult">
         <include refid="selectAppletAnswerBaseVo"/>
-        where question_id = #{questionId}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletAnswerBase" parameterType="AppletAnswerBase">
+    <insert id="insertAppletAnswerBase" parameterType="AppletAnswerBase" useGeneratedKeys="true" keyProperty="id">
         insert into applet_answer_base
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="questionId != null">question_id,</if>
             <if test="answerId != null">answer_id,</if>
             <if test="userId != null">user_id,</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="questionId != null">#{questionId},</if>
             <if test="answerId != null">#{answerId},</if>
             <if test="userId != null">#{userId},</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="updateAppletAnswerBase" parameterType="AppletAnswerBase">
         update applet_answer_base
         <trim prefix="SET" suffixOverrides=",">
+            <if test="questionId != null">question_id = #{questionId},</if>
             <if test="answerId != null">answer_id = #{answerId},</if>
             <if test="userId != null">user_id = #{userId},</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 question_id = #{questionId}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletAnswerBaseByQuestionId" parameterType="Long">
-        delete from applet_answer_base where question_id = #{questionId}
+    <delete id="deleteAppletAnswerBaseById" parameterType="Long">
+        delete from applet_answer_base where id = #{id}
     </delete>
 
-    <delete id="deleteAppletAnswerBaseByQuestionIds" parameterType="String">
-        delete from applet_answer_base where question_id in 
-        <foreach item="questionId" collection="array" open="(" separator="," close=")">
-            #{questionId}
+    <delete id="deleteAppletAnswerBaseByIds" parameterType="String">
+        delete from applet_answer_base where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,14 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletAnswerTrainMapper">
     
     <resultMap type="AppletAnswerTrain" id="AppletAnswerTrainResult">
+        <result property="id"    column="id"    />
         <result property="questionId"    column="question_id"    />
         <result property="userId"    column="user_id"    />
         <result property="answer"    column="answer"    />
         <result property="remark"    column="remark"    />
+        <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="selectAppletAnswerTrainVo">
-        select question_id, user_id, answer, remark from applet_answer_train
+        select id, question_id, user_id, answer, remark, del_flag, create_by, create_time, update_by, update_time from applet_answer_train
     </sql>
 
     <select id="selectAppletAnswerTrainList" parameterType="AppletAnswerTrain" resultMap="AppletAnswerTrainResult">
@@ -24,45 +30,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletAnswerTrainByQuestionId" parameterType="Long" resultMap="AppletAnswerTrainResult">
+    <select id="selectAppletAnswerTrainById" parameterType="Long" resultMap="AppletAnswerTrainResult">
         <include refid="selectAppletAnswerTrainVo"/>
-        where question_id = #{questionId}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletAnswerTrain" parameterType="AppletAnswerTrain">
+    <insert id="insertAppletAnswerTrain" parameterType="AppletAnswerTrain" useGeneratedKeys="true" keyProperty="id">
         insert into applet_answer_train
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="questionId != null">question_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="answer != null and answer != ''">answer,</if>
             <if test="remark != null">remark,</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="questionId != null">#{questionId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="answer != null and answer != ''">#{answer},</if>
             <if test="remark != null">#{remark},</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="updateAppletAnswerTrain" parameterType="AppletAnswerTrain">
         update applet_answer_train
         <trim prefix="SET" suffixOverrides=",">
+            <if test="questionId != null">question_id = #{questionId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="answer != null and answer != ''">answer = #{answer},</if>
             <if test="remark != null">remark = #{remark},</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 question_id = #{questionId}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletAnswerTrainByQuestionId" parameterType="Long">
-        delete from applet_answer_train where question_id = #{questionId}
+    <delete id="deleteAppletAnswerTrainById" parameterType="Long">
+        delete from applet_answer_train where id = #{id}
     </delete>
 
-    <delete id="deleteAppletAnswerTrainByQuestionIds" parameterType="String">
-        delete from applet_answer_train where question_id in 
-        <foreach item="questionId" collection="array" open="(" separator="," close=")">
-            #{questionId}
+    <delete id="deleteAppletAnswerTrainByIds" parameterType="String">
+        delete from applet_answer_train where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,14 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletCommentMapper">
     
     <resultMap type="AppletComment" id="AppletCommentResult">
+        <result property="id"    column="id"    />
         <result property="comment"    column="comment"    />
         <result property="satisfaction"    column="satisfaction"    />
         <result property="user1Id"    column="user1_id"    />
         <result property="user2Id"    column="user2_id"    />
+        <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="selectAppletCommentVo">
-        select comment, satisfaction, user1_id, user2_id from applet_comment
+        select id, comment, satisfaction, user1_id, user2_id, del_flag, create_by, create_time, update_by, update_time from applet_comment
     </sql>
 
     <select id="selectAppletCommentList" parameterType="AppletComment" resultMap="AppletCommentResult">
@@ -25,45 +31,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletCommentByComment" parameterType="String" resultMap="AppletCommentResult">
+    <select id="selectAppletCommentById" parameterType="Long" resultMap="AppletCommentResult">
         <include refid="selectAppletCommentVo"/>
-        where comment = #{comment}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletComment" parameterType="AppletComment">
+    <insert id="insertAppletComment" parameterType="AppletComment" useGeneratedKeys="true" keyProperty="id">
         insert into applet_comment
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="comment != null and comment != ''">comment,</if>
             <if test="satisfaction != null">satisfaction,</if>
             <if test="user1Id != null">user1_id,</if>
             <if test="user2Id != null">user2_id,</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="comment != null and comment != ''">#{comment},</if>
             <if test="satisfaction != null">#{satisfaction},</if>
             <if test="user1Id != null">#{user1Id},</if>
             <if test="user2Id != null">#{user2Id},</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="updateAppletComment" parameterType="AppletComment">
         update applet_comment
         <trim prefix="SET" suffixOverrides=",">
+            <if test="comment != null and comment != ''">comment = #{comment},</if>
             <if test="satisfaction != null">satisfaction = #{satisfaction},</if>
             <if test="user1Id != null">user1_id = #{user1Id},</if>
             <if test="user2Id != null">user2_id = #{user2Id},</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 comment = #{comment}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletCommentByComment" parameterType="String">
-        delete from applet_comment where comment = #{comment}
+    <delete id="deleteAppletCommentById" parameterType="Long">
+        delete from applet_comment where id = #{id}
     </delete>
 
-    <delete id="deleteAppletCommentByComments" parameterType="String">
-        delete from applet_comment where comment in 
-        <foreach item="comment" collection="array" open="(" separator="," close=")">
-            #{comment}
+    <delete id="deleteAppletCommentByIds" parameterType="String">
+        delete from applet_comment where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,12 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletIncreaseMapper">
     
     <resultMap type="AppletIncrease" id="AppletIncreaseResult">
+        <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="detail"    column="detail"    />
+        <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="selectAppletIncreaseVo">
-        select title, detail from applet_increase
+        select id, title, detail, del_flag, create_by, create_time, update_by, update_time from applet_increase
     </sql>
 
     <select id="selectAppletIncreaseList" parameterType="AppletIncrease" resultMap="AppletIncreaseResult">
@@ -21,39 +27,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletIncreaseByTitle" parameterType="String" resultMap="AppletIncreaseResult">
+    <select id="selectAppletIncreaseById" parameterType="Long" resultMap="AppletIncreaseResult">
         <include refid="selectAppletIncreaseVo"/>
-        where title = #{title}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletIncrease" parameterType="AppletIncrease">
+    <insert id="insertAppletIncrease" parameterType="AppletIncrease" useGeneratedKeys="true" keyProperty="id">
         insert into applet_increase
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="detail != null">detail,</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="title != null and title != ''">#{title},</if>
             <if test="detail != null">#{detail},</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="updateAppletIncrease" parameterType="AppletIncrease">
         update applet_increase
         <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
             <if test="detail != null">detail = #{detail},</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 title = #{title}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletIncreaseByTitle" parameterType="String">
-        delete from applet_increase where title = #{title}
+    <delete id="deleteAppletIncreaseById" parameterType="Long">
+        delete from applet_increase where id = #{id}
     </delete>
 
-    <delete id="deleteAppletIncreaseByTitles" parameterType="String">
-        delete from applet_increase where title in 
-        <foreach item="title" collection="array" open="(" separator="," close=")">
-            #{title}
+    <delete id="deleteAppletIncreaseByIds" parameterType="String">
+        delete from applet_increase where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,12 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletLicenseMapper">
     
     <resultMap type="AppletLicense" id="AppletLicenseResult">
+        <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="image"    column="image"    />
+        <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="selectAppletLicenseVo">
-        select title, image from applet_license
+        select id, title, image, del_flag, create_by, create_time, update_by, update_time from applet_license
     </sql>
 
     <select id="selectAppletLicenseList" parameterType="AppletLicense" resultMap="AppletLicenseResult">
@@ -21,39 +27,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletLicenseByTitle" parameterType="String" resultMap="AppletLicenseResult">
+    <select id="selectAppletLicenseById" parameterType="Long" resultMap="AppletLicenseResult">
         <include refid="selectAppletLicenseVo"/>
-        where title = #{title}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletLicense" parameterType="AppletLicense">
+    <insert id="insertAppletLicense" parameterType="AppletLicense" useGeneratedKeys="true" keyProperty="id">
         insert into applet_license
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="image != null">image,</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="title != null and title != ''">#{title},</if>
             <if test="image != null">#{image},</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="updateAppletLicense" parameterType="AppletLicense">
         update applet_license
         <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
             <if test="image != null">image = #{image},</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 title = #{title}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletLicenseByTitle" parameterType="String">
-        delete from applet_license where title = #{title}
+    <delete id="deleteAppletLicenseById" parameterType="Long">
+        delete from applet_license where id = #{id}
     </delete>
 
-    <delete id="deleteAppletLicenseByTitles" parameterType="String">
-        delete from applet_license where title in 
-        <foreach item="title" collection="array" open="(" separator="," close=")">
-            #{title}
+    <delete id="deleteAppletLicenseByIds" parameterType="String">
+        delete from applet_license where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>