修改处理

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

@@ -106,6 +106,7 @@
 
     <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"/>
@@ -167,6 +168,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>
@@ -224,14 +228,18 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "接单地址", visible:  true  },
-    { key: 1, label: "详细地址", visible:  true  },
-    { key: 2, label: "接单状态", visible:  true  },
-    { key: 3, label: "接单范围", visible:  true  },
-    { key: 4, label: "$column.columnComment", visible:  true  },
-    { key: 5, label: "关联用户id", 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: "$column.columnComment", visible:  true  },
+    { key: 6, label: "关联用户id", visible:  true  },
      ],
     };
   },
@@ -256,6 +264,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         area: null,
 
         address: null,
@@ -268,6 +278,16 @@ export default {
 
         userId: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -283,7 +303,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.area)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -296,8 +316,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const area = row.area || this.ids
-      getAppletAddress(area).then(response => {
+      const id = row.id || this.ids
+      getAppletAddress(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改地址信息";
@@ -307,7 +327,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.area != null) {
+          if (this.form.id != null) {
             updateAppletAddress(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -325,9 +345,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const areas = row.area || this.ids;
-      this.$modal.confirm('是否确认删除地址信息编号为"' + areas + '"的数据项？').then(function() {
-        return delAppletAddress(areas);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除地址信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletAddress(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -78,6 +78,7 @@
 
     <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"/>
@@ -118,6 +119,9 @@
         <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>
@@ -181,11 +185,15 @@ export default {
           { required: true, message: "类型不能为空", trigger: "change" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "标题", visible:  true  },
-    { key: 1, label: "金额", visible:  true  },
-    { key: 2, label: "类型", visible:  true  },
+    { key: 1, label: "标题", visible:  true  },
+    { key: 2, label: "金额", visible:  true  },
+    { key: 3, label: "类型", visible:  true  },
      ],
     };
   },
@@ -210,12 +218,24 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         title: null,
 
         amount: null,
 
         type: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -231,7 +251,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
     },
@@ -244,8 +264,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const title = row.title || this.ids
-      getAppletAmountLog(title).then(response => {
+      const id = row.id || this.ids
+      getAppletAmountLog(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改金额明细";
@@ -255,7 +275,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.title != null) {
+          if (this.form.id != null) {
             updateAppletAmountLog(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -273,9 +293,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const titles = row.title || this.ids;
-      this.$modal.confirm('是否确认删除金额明细编号为"' + titles + '"的数据项？').then(function() {
-        return delAppletAmountLog(titles);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除金额明细编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletAmountLog(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -67,22 +67,24 @@
           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>
+<!--      <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="createTime" />
       <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"/>
@@ -106,7 +108,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -130,6 +132,9 @@
         <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>
@@ -199,12 +204,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: "排序编号", visible:  true  },
-    { key: 3, label: "关联题目ID", visible:  true  },
+    { key: 1, label: "答案内容", visible:  true  },
+    { key: 2, label: "是否正确答案", visible:  true  },
+    { key: 3, label: "排序编号", visible:  true  },
+    { key: 4, label: "关联题目ID", visible:  true  },
      ],
     };
   },
@@ -229,6 +238,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         title: null,
 
         isTrue: null,
@@ -237,6 +248,16 @@ export default {
 
         questionId: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -252,7 +273,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
     },
@@ -265,8 +286,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const title = row.title || this.ids
-      getAppletAnswer(title).then(response => {
+      const id = row.id || this.ids
+      getAppletAnswer(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改基本考核答案";
@@ -276,7 +297,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.title != null) {
+          if (this.form.id != null) {
             updateAppletAnswer(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -294,9 +315,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const titles = row.title || this.ids;
-      this.$modal.confirm('是否确认删除基本考核答案编号为"' + titles + '"的数据项？').then(function() {
-        return delAppletAnswer(titles);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除基本考核答案编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletAnswer(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="参数编码" prop="paramCode">
+      <el-form-item label="编码" prop="paramCode">
         <el-input
           v-model="queryParams.paramCode"
           placeholder="请输入参数编码"
@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="参数值-普通文本" prop="paramValueText">
+      <el-form-item label="文本" prop="paramValueText">
         <el-input
           v-model="queryParams.paramValueText"
           placeholder="请输入参数值-普通文本"
@@ -28,15 +28,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="参数值-富文本" prop="paramValueArea">
-        <el-input
-          v-model="queryParams.paramValueArea"
-          placeholder="请输入参数值-富文本"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="参数值-富文本" prop="paramValueArea">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.paramValueArea"-->
+<!--          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>
@@ -76,28 +76,36 @@
           v-hasPermi="['model:AppletConfig: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:AppletConfig:export']"
-        >导出</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:AppletConfig:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="AppletConfigList" @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="paramValue" v-if="columns[0].visible"/>
-      <el-table-column label="参数编码" align="center" prop="paramCode" v-if="columns[1].visible"/>
-      <el-table-column label="参数值-普通文本" align="center" prop="paramValueText" v-if="columns[2].visible"/>
-      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[3].visible"/>
-      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[4].visible"/>
+<!--      <el-table-column label="唯一标识" align="center" prop="id" />-->
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="说明" align="center" prop="paramValue" />
+      <el-table-column label="编码" align="center" prop="paramCode" />
+      <el-table-column label="文本" align="center" prop="paramValueText" />
+<!--      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[3].visible"/>-->
+
+      <el-table-column label="图片" align="center" prop="paramValueImage">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.paramValueImage" :src="row.paramValueImage" :preview-src-list="[row.paramValueImage]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+
+      <!--      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[4].visible"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -117,7 +125,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -128,25 +136,27 @@
 
     <!-- 添加或修改配置信息对话框 -->
     <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 ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
         <el-form-item label="说明" prop="paramValue">
           <el-input v-model="form.paramValue" placeholder="请输入说明" />
         </el-form-item>
-        <el-form-item label="参数编码" prop="paramCode">
+        <el-form-item label="编码" prop="paramCode">
           <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
         </el-form-item>
-        <el-form-item label="参数值-普通文本" prop="paramValueText">
+        <el-form-item label="文本" prop="paramValueText">
           <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
         </el-form-item>
-        <el-form-item label="参数值-图片">
-          <imageUpload v-model="form.paramValueImage"/>
-        </el-form-item>
-        <el-form-item label="参数值-富文本" prop="paramValueArea">
-          <el-input v-model="form.paramValueArea" placeholder="请输入参数值-富文本" />
+        <el-form-item label="图片">
+<!--          <imageUpload v-model="form.paramValueImage"/>-->
+          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>
         </el-form-item>
-        <el-form-item label="删除标识" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />
+        <el-form-item label="富文本" prop="paramValueArea">
+<!--          <el-input v-model="form.paramValueArea" placeholder="请输入参数值-富文本" />-->
+          <Editor v-model="form.paramValueArea" placeholder="请输入内容" type="url"></Editor>
         </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>

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

@@ -87,7 +87,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -105,9 +105,9 @@
         <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-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>
@@ -161,9 +161,9 @@ export default {
           { required: true, message: "标题不能为空", trigger: "blur" }
         ],
 
-        delFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" }
-        ],
+        // delFlag: [
+        //   { required: true, message: "删除标识不能为空", trigger: "blur" }
+        // ],
 
       },
       columns: [

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

@@ -49,25 +49,32 @@
           v-hasPermi="['model:AppletLicense: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:AppletLicense:export']"
-        >导出</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:AppletLicense:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <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" prop="id" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <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 +94,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -103,11 +110,12 @@
           <el-input v-model="form.title" 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="请输入删除标识" />
+<!--          <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="请输入删除标识" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -161,9 +169,9 @@ export default {
           { required: true, message: "标题不能为空", trigger: "blur" }
         ],
 
-        delFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" }
-        ],
+        // delFlag: [
+        //   { required: true, message: "删除标识不能为空", trigger: "blur" }
+        // ],
 
       },
       columns: [

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

@@ -65,7 +65,7 @@
 
     <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="id" />
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="标题" align="center" prop="title"/>
 <!--      <el-table-column label="图片" align="center" prop="image" v-if="columns[1].visible"/>-->

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

@@ -62,25 +62,27 @@
           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 :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="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" prop="id" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="题目标题" align="center" prop="title" />
+      <el-table-column label="题目类型" align="center" prop="type"/>
+      <el-table-column label="排序编号" align="center" prop="orderNo"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -100,7 +102,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -118,6 +120,12 @@
         <el-form-item label="排序编号" prop="orderNo">
           <el-input v-model="form.orderNo" placeholder="请输入排序编号" />
         </el-form-item>
+        <el-form-item label="考核类型" prop="type">
+          <el-input v-model="form.type" 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>
@@ -181,11 +189,15 @@ export default {
           { required: true, message: "排序编号不能为空", trigger: "blur" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "题目标题", visible:  true  },
-    { key: 1, label: "题目类型", visible:  true  },
-    { key: 2, label: "排序编号", visible:  true  },
+    { key: 1, label: "题目标题", visible:  true  },
+    { key: 2, label: "题目类型", visible:  true  },
+    { key: 3, label: "排序编号", visible:  true  },
      ],
     };
   },
@@ -210,12 +222,24 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         title: null,
 
         type: null,
 
         orderNo: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -231,7 +255,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
     },
@@ -244,8 +268,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const title = row.title || this.ids
-      getAppletQuestion(title).then(response => {
+      const id = row.id || this.ids
+      getAppletQuestion(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改考核题库";
@@ -255,7 +279,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.title != null) {
+          if (this.form.id != null) {
             updateAppletQuestion(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -273,9 +297,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const titles = row.title || this.ids;
-      this.$modal.confirm('是否确认删除考核题库编号为"' + titles + '"的数据项？').then(function() {
-        return delAppletQuestion(titles);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除考核题库编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletQuestion(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -10,15 +10,15 @@
           @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 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>
@@ -58,24 +58,26 @@
           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>
+<!--      <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="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" prop="id" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="视频" align="center" prop="video" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -95,7 +97,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -112,7 +114,11 @@
         </el-form-item>
         <el-form-item label="视频" prop="video">
           <el-input v-model="form.video" placeholder="请输入视频" />
+<!--          <oss-image-upload v-model="form.video"/>-->
         </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>
@@ -166,10 +172,14 @@ export default {
           { required: true, message: "标题不能为空", trigger: "blur" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       columns: [
-    { key: 0, label: "标题", visible:  true  },
-    { key: 1, label: "视频", visible:  true  },
+    { key: 1, label: "标题", visible:  true  },
+    { key: 2, label: "视频", visible:  true  },
      ],
     };
   },
@@ -194,10 +204,22 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         title: null,
 
         video: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -213,7 +235,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
     },
@@ -226,8 +248,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const title = row.title || this.ids
-      getAppletService(title).then(response => {
+      const id = row.id || this.ids
+      getAppletService(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改平台&服务介绍信息";
@@ -237,7 +259,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.title != null) {
+          if (this.form.id != null) {
             updateAppletService(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -255,9 +277,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const titles = row.title || this.ids;
-      this.$modal.confirm('是否确认删除平台&服务介绍信息编号为"' + titles + '"的数据项？').then(function() {
-        return delAppletService(titles);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除平台&服务介绍信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletService(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -75,6 +75,7 @@
 
     <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>
@@ -127,6 +128,9 @@
         <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>
@@ -190,11 +194,15 @@ 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: 1, label: "服务日期", visible:  true  },
+    { key: 2, label: "服务内容", visible:  true  },
+    { key: 3, label: "关联订单ID", visible:  true  },
      ],
     };
   },
@@ -219,12 +227,24 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         date: null,
 
         details: null,
 
         orderId: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -240,7 +260,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.date)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -253,8 +273,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const date = row.date || this.ids
-      getAppletServiceDate(date).then(response => {
+      const id = row.id || this.ids
+      getAppletServiceDate(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改服务日期";
@@ -264,7 +284,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.date != null) {
+          if (this.form.id != null) {
             updateAppletServiceDate(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -282,9 +302,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dates = row.date || this.ids;
-      this.$modal.confirm('是否确认删除服务日期编号为"' + dates + '"的数据项？').then(function() {
-        return delAppletServiceDate(dates);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除服务日期编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletServiceDate(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -79,6 +79,7 @@
 
     <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">
@@ -136,6 +137,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>
@@ -203,13 +207,17 @@ export default {
           { required: true, message: "服务地点不能为空", trigger: "blur" }
         ],
 
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
       },
       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:  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:  false  },
      ],
     };
   },
@@ -234,6 +242,8 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
+
         serviceType: null,
 
         serviceTime: null,
@@ -244,6 +254,16 @@ export default {
 
         image: null,
 
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
       };
       this.resetForm("form");
     },
@@ -259,7 +279,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.serviceType)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -272,8 +292,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const serviceType = row.serviceType || this.ids
-      getAppletServiceLog(serviceType).then(response => {
+      const id = row.id || this.ids
+      getAppletServiceLog(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改服务记录";
@@ -283,7 +303,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.serviceType != null) {
+          if (this.form.id != null) {
             updateAppletServiceLog(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -301,9 +321,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const serviceTypes = row.serviceType || this.ids;
-      this.$modal.confirm('是否确认删除服务记录编号为"' + serviceTypes + '"的数据项？').then(function() {
-        return delAppletServiceLog(serviceTypes);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除服务记录编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletServiceLog(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

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

@@ -1,274 +0,0 @@
-<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="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>
-      <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" }
-        ],
-
-      },
-      columns: [
-    { key: 0, label: "标题", visible:  true  },
-    { key: 1, 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 = {
-        title: null,
-
-        content: 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.title)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加服务培训";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const title = row.title || this.ids
-      getAppletTrain(title).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改服务培训";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.title != 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 titles = row.title || this.ids;
-      this.$modal.confirm('是否确认删除服务培训编号为"' + titles + '"的数据项？').then(function() {
-        return delAppletTrain(titles);
-      }).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/AppletUser2/index.vue

@@ -1,360 +0,0 @@
-<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>
-      <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="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>
-      <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" }
-        ],
-
-      },
-      columns: [
-    { key: 0, 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:  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 = {
-        headImage: null,
-
-        nickName: null,
-
-        phone: null,
-
-        sex: null,
-
-        brief: null,
-
-        experience: null,
-
-        petTypeId: null,
-
-        serviceBase: null,
-
-        serviceIncrease: 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.headImage)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户服务信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const headImage = row.headImage || this.ids
-      getAppletUser2(headImage).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改用户服务信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.headImage != 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 headImages = row.headImage || this.ids;
-      this.$modal.confirm('是否确认删除用户服务信息编号为"' + headImages + '"的数据项？').then(function() {
-        return delAppletUser2(headImages);
-      }).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>

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

@@ -123,22 +123,40 @@
     <el-table v-loading="loading" :data="AppletUsersTeacherList" @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="createTime" />
+      <el-table-column label="审核状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_state" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="关联用户" align="center" prop="userId" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="身份证" align="center" prop="idCard" />
-      <el-table-column label="性别" align="center" prop="sex" />
-      <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="手机号" align="center" prop="phone"/>
+<!--      <el-table-column label="性别" align="center" prop="sex" />-->
+      <el-table-column label="性别" align="center" prop="sex" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.applet_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="养宠经验" align="center" prop="experience" />
       <el-table-column label="是否有专业执照" align="center" prop="isHave"/>
       <el-table-column label="个人宠物类型" align="center" prop="petType" />
-      <el-table-column label="审核状态" align="center" prop="status" />
-<!--      <el-table-column label="审核图片" align="center" prop="images" />-->
+<!--      <el-table-column label="审核状态" align="center" prop="status" />-->
+
       <el-table-column label="审核图片" align="center" prop="审核图片">
         <template slot-scope="{ row }">
           <el-image v-if="row.images" :src="row.images" :preview-src-list="[row.images]" class="small-img circle-img"/>
         </template>
       </el-table-column>
+      <el-table-column label="所在地区" align="center" prop="area" />
+      <el-table-column label="详细地址" align="center" prop="address" />
+      <el-table-column label="经度" align="center" prop="longitude" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="纬度" align="center" prop="latitude" />
+      <el-table-column label="修改人" align="center" prop="updateBy" />
+
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -167,7 +185,7 @@
       @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="userId">
@@ -179,6 +197,15 @@
         <el-form-item label="身份证" prop="idCard">
           <el-input v-model="form.idCard" placeholder="请输入身份证" />
         </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-select v-model="form.sex" placeholder="请选择性别">
+            <el-option
+              v-for="dict in dict.type.applet_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号" />
         </el-form-item>
@@ -188,10 +215,42 @@
         <el-form-item label="是否有专业执照" prop="isHave">
           <el-input v-model="form.isHave" placeholder="请输入是否有专业执照" />
         </el-form-item>
+        <el-form-item label="个人宠物类型" prop="petType">
+          <el-select v-model="form.petType" placeholder="请选择个人宠物类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择审核状态">
+            <el-option
+              v-for="dict in dict.type.applet_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="审核图片">
 <!--          <imageUpload v-model="form.images"/>-->
-          <oss-image-upload v-model="form.images"></oss-image-upload>
+          <oss-image-upload v-model="form.images" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <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="longitude">-->
+<!--          <el-input v-model="form.longitude" placeholder="请输入经度" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="创建人" prop="create by">-->
+<!--          <el-input v-model="form.createBy" placeholder="请输入创建人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="纬度" prop="latitude">-->
+<!--          <el-input v-model="form.latitude" placeholder="请输入纬度" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="修改人" prop="update by">-->
+<!--          <el-input v-model="form.updateBy" placeholder="请输入修改人" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -206,6 +265,7 @@ import { listAppletUsersTeacher, getAppletUsersTeacher, delAppletUsersTeacher, a
 
 export default {
   name: "AppletUsersTeacher",
+  dicts: ['applet_sex', 'applet_state'],
   data() {
     return {
       // 遮罩层

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

@@ -1,33 +1,39 @@
 package com.ruoyi.model.domain;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseAudit;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 服务记录对象 applet_service_log
- * 
- * @author ruoyi
- * @date 2025-03-28
+ * 服务记录表对象 applet_service_log
+ *
+ * @author daixiande
  */
-public class AppletServiceLog extends BaseEntity
-{
+@Data
+public class AppletServiceLog extends BaseAudit {
     private static final long serialVersionUID = 1L;
 
     /** 唯一标识 */
     private Long id;
 
+    /** 用户标识 */
+    @Excel(name = "用户标识")
+    private Long userId;
+
     /** 服务类型 */
     @Excel(name = "服务类型")
     private String serviceType;
 
     /** 服务时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "服务时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date serviceTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "服务时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime serviceTime;
 
     /** 服务地点 */
     @Excel(name = "服务地点")
@@ -44,84 +50,4 @@ public class AppletServiceLog extends BaseEntity
     /** 删除标识 */
     private Integer delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setServiceType(String serviceType) 
-    {
-        this.serviceType = serviceType;
-    }
-
-    public String getServiceType() 
-    {
-        return serviceType;
-    }
-    public void setServiceTime(Date serviceTime) 
-    {
-        this.serviceTime = serviceTime;
-    }
-
-    public Date getServiceTime() 
-    {
-        return serviceTime;
-    }
-    public void setServiceSpot(String serviceSpot) 
-    {
-        this.serviceSpot = serviceSpot;
-    }
-
-    public String getServiceSpot() 
-    {
-        return serviceSpot;
-    }
-    public void setText(String text) 
-    {
-        this.text = text;
-    }
-
-    public String getText() 
-    {
-        return text;
-    }
-    public void setImage(String image) 
-    {
-        this.image = image;
-    }
-
-    public String getImage() 
-    {
-        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/AppletUsersTeacher.java

@@ -1,18 +1,15 @@
 package com.ruoyi.model.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
-/**
- * 伴宠师认证对象 applet_users_teacher
- * 
- * @author ruoyi
- * @date 2025-03-27
- */
-public class AppletUsersTeacher extends BaseEntity
-{
+import java.time.LocalDateTime;
+
+@Data
+public class AppletUsersTeacher {
     private static final long serialVersionUID = 1L;
 
     /** 标识 */
@@ -58,122 +55,34 @@ public class AppletUsersTeacher extends BaseEntity
     @Excel(name = "审核图片")
     private String images;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId() 
-    {
-        return userId;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setIdCard(String idCard) 
-    {
-        this.idCard = idCard;
-    }
-
-    public String getIdCard() 
-    {
-        return idCard;
-    }
-    public void setSex(Long sex) 
-    {
-        this.sex = sex;
-    }
-
-    public Long getSex() 
-    {
-        return sex;
-    }
-    public void setPhone(String phone) 
-    {
-        this.phone = phone;
-    }
-
-    public String getPhone() 
-    {
-        return phone;
-    }
-    public void setExperience(String experience) 
-    {
-        this.experience = experience;
-    }
-
-    public String getExperience() 
-    {
-        return experience;
-    }
-    public void setIsHave(Long isHave) 
-    {
-        this.isHave = isHave;
-    }
-
-    public Long getIsHave() 
-    {
-        return isHave;
-    }
-    public void setPetType(Long petType) 
-    {
-        this.petType = petType;
-    }
-
-    public Long getPetType() 
-    {
-        return petType;
-    }
-    public void setStatus(Long status) 
-    {
-        this.status = status;
-    }
-
-    public Long getStatus() 
-    {
-        return status;
-    }
-    public void setImages(String images) 
-    {
-        this.images = images;
-    }
-
-    public String getImages() 
-    {
-        return images;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("name", getName())
-            .append("idCard", getIdCard())
-            .append("sex", getSex())
-            .append("phone", getPhone())
-            .append("experience", getExperience())
-            .append("isHave", getIsHave())
-            .append("petType", getPetType())
-            .append("status", getStatus())
-            .append("images", getImages())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 所在地区 */
+    @Excel(name = "所在地区")
+    private String area;
+
+    /** 审核时间 */
+    private LocalDateTime updateTime;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String address;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createBy;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updateBy;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
 }

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

@@ -5,16 +5,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletAddressMapper">
     
     <resultMap type="AppletAddress" id="AppletAddressResult">
+        <result property="id"    column="id"    />
         <result property="area"    column="area"    />
         <result property="address"    column="address"    />
         <result property="status"    column="status"    />
         <result property="range"    column="range"    />
         <result property="outDate"    column="out_date"    />
         <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="selectAppletAddressVo">
-        select area, address, status, range, out_date, user_id from applet_address
+        select id, area, address, status, range, out_date, user_id, del_flag, create_by, create_time, update_by, update_time from applet_address
     </sql>
 
     <select id="selectAppletAddressList" parameterType="AppletAddress" resultMap="AppletAddressResult">
@@ -29,12 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletAddressByArea" parameterType="String" resultMap="AppletAddressResult">
+    <select id="selectAppletAddressById" parameterType="Long" resultMap="AppletAddressResult">
         <include refid="selectAppletAddressVo"/>
-        where area = #{area}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletAddress" parameterType="AppletAddress">
+    <insert id="insertAppletAddress" parameterType="AppletAddress" useGeneratedKeys="true" keyProperty="id">
         insert into applet_address
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="area != null">area,</if>
@@ -43,6 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="range != null">range,</if>
             <if test="outDate != null">out_date,</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="area != null">#{area},</if>
@@ -51,29 +62,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="range != null">#{range},</if>
             <if test="outDate != null">#{outDate},</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="updateAppletAddress" parameterType="AppletAddress">
         update applet_address
         <trim prefix="SET" suffixOverrides=",">
+            <if test="area != null">area = #{area},</if>
             <if test="address != null">address = #{address},</if>
             <if test="status != null">status = #{status},</if>
             <if test="range != null">range = #{range},</if>
             <if test="outDate != null">out_date = #{outDate},</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 area = #{area}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletAddressByArea" parameterType="String">
-        delete from applet_address where area = #{area}
+    <delete id="deleteAppletAddressById" parameterType="Long">
+        delete from applet_address where id = #{id}
     </delete>
 
-    <delete id="deleteAppletAddressByAreas" parameterType="String">
-        delete from applet_address where area in 
-        <foreach item="area" collection="array" open="(" separator="," close=")">
-            #{area}
+    <delete id="deleteAppletAddressByIds" parameterType="String">
+        delete from applet_address where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,13 +5,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletAmountLogMapper">
     
     <resultMap type="AppletAmountLog" id="AppletAmountLogResult">
+        <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="amount"    column="amount"    />
         <result property="type"    column="type"    />
+        <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="selectAppletAmountLogVo">
-        select title, amount, type from applet_amount_log
+        select id, title, amount, type, del_flag, create_by, create_time, update_by, update_time from applet_amount_log
     </sql>
 
     <select id="selectAppletAmountLogList" parameterType="AppletAmountLog" resultMap="AppletAmountLogResult">
@@ -23,42 +29,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletAmountLogByTitle" parameterType="String" resultMap="AppletAmountLogResult">
+    <select id="selectAppletAmountLogById" parameterType="Long" resultMap="AppletAmountLogResult">
         <include refid="selectAppletAmountLogVo"/>
-        where title = #{title}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletAmountLog" parameterType="AppletAmountLog">
+    <insert id="insertAppletAmountLog" parameterType="AppletAmountLog" useGeneratedKeys="true" keyProperty="id">
         insert into applet_amount_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="amount != null">amount,</if>
             <if test="type != null and type != ''">type,</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="amount != null">#{amount},</if>
             <if test="type != null and type != ''">#{type},</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="updateAppletAmountLog" parameterType="AppletAmountLog">
         update applet_amount_log
         <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
             <if test="amount != null">amount = #{amount},</if>
             <if test="type != null and type != ''">type = #{type},</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="deleteAppletAmountLogByTitle" parameterType="String">
-        delete from applet_amount_log where title = #{title}
+    <delete id="deleteAppletAmountLogById" parameterType="Long">
+        delete from applet_amount_log where id = #{id}
     </delete>
 
-    <delete id="deleteAppletAmountLogByTitles" parameterType="String">
-        delete from applet_amount_log where title in 
-        <foreach item="title" collection="array" open="(" separator="," close=")">
-            #{title}
+    <delete id="deleteAppletAmountLogByIds" parameterType="String">
+        delete from applet_amount_log where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,14 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletAnswerMapper">
     
     <resultMap type="AppletAnswer" id="AppletAnswerResult">
+        <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="isTrue"    column="is_true"    />
         <result property="orderNo"    column="order_no"    />
         <result property="questionId"    column="question_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="selectAppletAnswerVo">
-        select title, is_true, order_no, question_id from applet_answer
+        select id, title, is_true, order_no, question_id, del_flag, create_by, create_time, update_by, update_time from applet_answer
     </sql>
 
     <select id="selectAppletAnswerList" parameterType="AppletAnswer" resultMap="AppletAnswerResult">
@@ -25,45 +31,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletAnswerByTitle" parameterType="String" resultMap="AppletAnswerResult">
+    <select id="selectAppletAnswerById" parameterType="Long" resultMap="AppletAnswerResult">
         <include refid="selectAppletAnswerVo"/>
-        where title = #{title}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletAnswer" parameterType="AppletAnswer">
+    <insert id="insertAppletAnswer" parameterType="AppletAnswer" useGeneratedKeys="true" keyProperty="id">
         insert into applet_answer
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="isTrue != null">is_true,</if>
             <if test="orderNo != null">order_no,</if>
             <if test="questionId != null">question_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="title != null and title != ''">#{title},</if>
             <if test="isTrue != null">#{isTrue},</if>
             <if test="orderNo != null">#{orderNo},</if>
             <if test="questionId != null">#{questionId},</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="updateAppletAnswer" parameterType="AppletAnswer">
         update applet_answer
         <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
             <if test="isTrue != null">is_true = #{isTrue},</if>
             <if test="orderNo != null">order_no = #{orderNo},</if>
             <if test="questionId != null">question_id = #{questionId},</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="deleteAppletAnswerByTitle" parameterType="String">
-        delete from applet_answer where title = #{title}
+    <delete id="deleteAppletAnswerById" parameterType="Long">
+        delete from applet_answer where id = #{id}
     </delete>
 
-    <delete id="deleteAppletAnswerByTitles" parameterType="String">
-        delete from applet_answer where title in 
-        <foreach item="title" collection="array" open="(" separator="," close=")">
-            #{title}
+    <delete id="deleteAppletAnswerByIds" parameterType="String">
+        delete from applet_answer where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,13 +5,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletQuestionMapper">
     
     <resultMap type="AppletQuestion" id="AppletQuestionResult">
+        <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="type"    column="type"    />
         <result property="orderNo"    column="order_no"    />
+        <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="selectAppletQuestionVo">
-        select title, type, order_no from applet_question
+        select id, title, type, order_no, del_flag, create_by, create_time, update_by, update_time from applet_question
     </sql>
 
     <select id="selectAppletQuestionList" parameterType="AppletQuestion" resultMap="AppletQuestionResult">
@@ -23,42 +29,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletQuestionByTitle" parameterType="String" resultMap="AppletQuestionResult">
+    <select id="selectAppletQuestionById" parameterType="Long" resultMap="AppletQuestionResult">
         <include refid="selectAppletQuestionVo"/>
-        where title = #{title}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletQuestion" parameterType="AppletQuestion">
+    <insert id="insertAppletQuestion" parameterType="AppletQuestion" useGeneratedKeys="true" keyProperty="id">
         insert into applet_question
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="type != null and type != ''">type,</if>
             <if test="orderNo != null">order_no,</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="type != null and type != ''">#{type},</if>
             <if test="orderNo != null">#{orderNo},</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="updateAppletQuestion" parameterType="AppletQuestion">
         update applet_question
         <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
             <if test="type != null and type != ''">type = #{type},</if>
             <if test="orderNo != null">order_no = #{orderNo},</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="deleteAppletQuestionByTitle" parameterType="String">
-        delete from applet_question where title = #{title}
+    <delete id="deleteAppletQuestionById" parameterType="Long">
+        delete from applet_question where id = #{id}
     </delete>
 
-    <delete id="deleteAppletQuestionByTitles" parameterType="String">
-        delete from applet_question where title in 
-        <foreach item="title" collection="array" open="(" separator="," close=")">
-            #{title}
+    <delete id="deleteAppletQuestionByIds" parameterType="String">
+        delete from applet_question where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,13 +5,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletServiceDateMapper">
     
     <resultMap type="AppletServiceDate" id="AppletServiceDateResult">
+        <result property="id"    column="id"    />
         <result property="date"    column="date"    />
         <result property="details"    column="details"    />
         <result property="orderId"    column="order_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="selectAppletServiceDateVo">
-        select date, details, order_id from applet_service_date
+        select id, date, details, order_id, del_flag, create_by, create_time, update_by, update_time from applet_service_date
     </sql>
 
     <select id="selectAppletServiceDateList" parameterType="AppletServiceDate" resultMap="AppletServiceDateResult">
@@ -23,42 +29,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletServiceDateByDate" parameterType="Date" resultMap="AppletServiceDateResult">
+    <select id="selectAppletServiceDateById" parameterType="Long" resultMap="AppletServiceDateResult">
         <include refid="selectAppletServiceDateVo"/>
-        where date = #{date}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletServiceDate" parameterType="AppletServiceDate">
+    <insert id="insertAppletServiceDate" parameterType="AppletServiceDate" useGeneratedKeys="true" keyProperty="id">
         insert into applet_service_date
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="date != null">date,</if>
             <if test="details != null and details != ''">details,</if>
             <if test="orderId != null">order_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="date != null">#{date},</if>
             <if test="details != null and details != ''">#{details},</if>
             <if test="orderId != null">#{orderId},</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="updateAppletServiceDate" parameterType="AppletServiceDate">
         update applet_service_date
         <trim prefix="SET" suffixOverrides=",">
+            <if test="date != null">date = #{date},</if>
             <if test="details != null and details != ''">details = #{details},</if>
             <if test="orderId != null">order_id = #{orderId},</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 date = #{date}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletServiceDateByDate" parameterType="Date">
-        delete from applet_service_date where date = #{date}
+    <delete id="deleteAppletServiceDateById" parameterType="Long">
+        delete from applet_service_date where id = #{id}
     </delete>
 
-    <delete id="deleteAppletServiceDateByDates" parameterType="String">
-        delete from applet_service_date where date in 
-        <foreach item="date" collection="array" open="(" separator="," close=")">
-            #{date}
+    <delete id="deleteAppletServiceDateByIds" parameterType="String">
+        delete from applet_service_date where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,20 +5,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletServiceLogMapper">
     
     <resultMap type="AppletServiceLog" id="AppletServiceLogResult">
-        <result property="serviceType"    column="service_type"    />
-        <result property="serviceTime"    column="service_time"    />
-        <result property="serviceSpot"    column="service_spot"    />
-        <result property="text"    column="text"    />
-        <result property="image"    column="image"    />
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="serviceType" column="service_type"/>
+        <result property="serviceTime" column="service_time"/>
+        <result property="serviceSpot" column="service_spot"/>
+        <result property="text" column="text"/>
+        <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="selectAppletServiceLogVo">
-        select service_type, service_time, service_spot, text, image from applet_service_log
+        select id, user_id, service_type, service_time, service_spot, text, image, del_flag, create_by, create_time, update_by, update_time  from applet_service_log
     </sql>
 
     <select id="selectAppletServiceLogList" parameterType="AppletServiceLog" resultMap="AppletServiceLogResult">
         <include refid="selectAppletServiceLogVo"/>
-        <where>  
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="serviceType != null  and serviceType != ''"> and service_type = #{serviceType}</if>
             <if test="serviceTime != null "> and service_time = #{serviceTime}</if>
             <if test="serviceSpot != null  and serviceSpot != ''"> and service_spot = #{serviceSpot}</if>
@@ -27,48 +36,70 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletServiceLogByServiceType" parameterType="String" resultMap="AppletServiceLogResult">
+    <select id="selectAppletServiceLogById" parameterType="Long" resultMap="AppletServiceLogResult">
         <include refid="selectAppletServiceLogVo"/>
-        where service_type = #{serviceType}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletServiceLog" parameterType="AppletServiceLog">
+    <insert id="insertAppletServiceLog" parameterType="AppletServiceLog" useGeneratedKeys="true" keyProperty="id">
         insert into applet_service_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="userId != null">user_id,</if>
             <if test="serviceType != null and serviceType != ''">service_type,</if>
             <if test="serviceTime != null">service_time,</if>
             <if test="serviceSpot != null and serviceSpot != ''">service_spot,</if>
             <if test="text != null">text,</if>
             <if test="image != null">image,</if>
-         </trim>
+            <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="id != null">#{id},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="serviceType != null and serviceType != ''">#{serviceType},</if>
             <if test="serviceTime != null">#{serviceTime},</if>
             <if test="serviceSpot != null and serviceSpot != ''">#{serviceSpot},</if>
             <if test="text != null">#{text},</if>
             <if test="image != null">#{image},</if>
-         </trim>
+            <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="updateAppletServiceLog" parameterType="AppletServiceLog">
         update applet_service_log
         <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="serviceType != null and serviceType != ''">service_type = #{serviceType},</if>
             <if test="serviceTime != null">service_time = #{serviceTime},</if>
             <if test="serviceSpot != null and serviceSpot != ''">service_spot = #{serviceSpot},</if>
             <if test="text != null">text = #{text},</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 service_type = #{serviceType}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletServiceLogByServiceType" parameterType="String">
-        delete from applet_service_log where service_type = #{serviceType}
+    <delete id="deleteAppletServiceLogById" parameterType="Long">
+        delete from applet_service_log where id = #{id}
     </delete>
 
-    <delete id="deleteAppletServiceLogByServiceTypes" parameterType="String">
-        delete from applet_service_log where service_type in 
-        <foreach item="serviceType" collection="array" open="(" separator="," close=")">
-            #{serviceType}
+    <delete id="deleteAppletServiceLogByIds" parameterType="String">
+        delete from applet_service_log where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,12 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletServiceMapper">
     
     <resultMap type="AppletService" id="AppletServiceResult">
+        <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="video"    column="video"    />
+        <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="selectAppletServiceVo">
-        select title, video from applet_service
+        select id, title, video, del_flag, create_by, create_time, update_by, update_time from applet_service
     </sql>
 
     <select id="selectAppletServiceList" parameterType="AppletService" resultMap="AppletServiceResult">
@@ -21,39 +27,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletServiceByTitle" parameterType="String" resultMap="AppletServiceResult">
+    <select id="selectAppletServiceById" parameterType="Long" resultMap="AppletServiceResult">
         <include refid="selectAppletServiceVo"/>
-        where title = #{title}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletService" parameterType="AppletService">
+    <insert id="insertAppletService" parameterType="AppletService" useGeneratedKeys="true" keyProperty="id">
         insert into applet_service
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="video != null">video,</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="video != null">#{video},</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="updateAppletService" parameterType="AppletService">
         update applet_service
         <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
             <if test="video != null">video = #{video},</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="deleteAppletServiceByTitle" parameterType="String">
-        delete from applet_service where title = #{title}
+    <delete id="deleteAppletServiceById" parameterType="Long">
+        delete from applet_service where id = #{id}
     </delete>
 
-    <delete id="deleteAppletServiceByTitles" parameterType="String">
-        delete from applet_service where title in 
-        <foreach item="title" collection="array" open="(" separator="," close=")">
-            #{title}
+    <delete id="deleteAppletServiceByIds" parameterType="String">
+        delete from applet_service where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,12 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletTrainMapper">
     
     <resultMap type="AppletTrain" id="AppletTrainResult">
+        <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="content"    column="content"    />
+        <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="selectAppletTrainVo">
-        select title, content from applet_train
+        select id, title, content, del_flag, create_by, create_time, update_by, update_time from applet_train
     </sql>
 
     <select id="selectAppletTrainList" parameterType="AppletTrain" resultMap="AppletTrainResult">
@@ -21,39 +27,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletTrainByTitle" parameterType="String" resultMap="AppletTrainResult">
+    <select id="selectAppletTrainById" parameterType="Long" resultMap="AppletTrainResult">
         <include refid="selectAppletTrainVo"/>
-        where title = #{title}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletTrain" parameterType="AppletTrain">
+    <insert id="insertAppletTrain" parameterType="AppletTrain" useGeneratedKeys="true" keyProperty="id">
         insert into applet_train
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="content != null and content != ''">content,</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="content != null and content != ''">#{content},</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="updateAppletTrain" parameterType="AppletTrain">
         update applet_train
         <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
             <if test="content != null and content != ''">content = #{content},</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="deleteAppletTrainByTitle" parameterType="String">
-        delete from applet_train where title = #{title}
+    <delete id="deleteAppletTrainById" parameterType="Long">
+        delete from applet_train where id = #{id}
     </delete>
 
-    <delete id="deleteAppletTrainByTitles" parameterType="String">
-        delete from applet_train where title in 
-        <foreach item="title" collection="array" open="(" separator="," close=")">
-            #{title}
+    <delete id="deleteAppletTrainByIds" parameterType="String">
+        delete from applet_train where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletUser1Mapper">
     
     <resultMap type="AppletUser1" id="AppletUser1Result">
+        <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="cerNo"    column="cer_no"    />
         <result property="sex"    column="sex"    />
@@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppletUser1Vo">
-        select name, cer_no, sex, age, phone, experience, have_license, image, pet_type_id, area, address, status_authentic, status_pay, status_add, created_at, updated_at from applet_user1
+        select id, name, cer_no, sex, age, phone, experience, have_license, image, pet_type_id, area, address, status_authentic, status_pay, status_add, created_at, updated_at from applet_user1
     </sql>
 
     <select id="selectAppletUser1List" parameterType="AppletUser1" resultMap="AppletUser1Result">
@@ -49,12 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletUser1ByName" parameterType="String" resultMap="AppletUser1Result">
+    <select id="selectAppletUser1ById" parameterType="Long" resultMap="AppletUser1Result">
         <include refid="selectAppletUser1Vo"/>
-        where name = #{name}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletUser1" parameterType="AppletUser1">
+    <insert id="insertAppletUser1" parameterType="AppletUser1" useGeneratedKeys="true" keyProperty="id">
         insert into applet_user1
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">name,</if>
@@ -97,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAppletUser1" parameterType="AppletUser1">
         update applet_user1
         <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null and name != ''">name = #{name},</if>
             <if test="cerNo != null and cerNo != ''">cer_no = #{cerNo},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>
             <if test="age != null">age = #{age},</if>
@@ -113,17 +115,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdAt != null">created_at = #{createdAt},</if>
             <if test="updatedAt != null">updated_at = #{updatedAt},</if>
         </trim>
-        where name = #{name}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletUser1ByName" parameterType="String">
-        delete from applet_user1 where name = #{name}
+    <delete id="deleteAppletUser1ById" parameterType="Long">
+        delete from applet_user1 where id = #{id}
     </delete>
 
-    <delete id="deleteAppletUser1ByNames" parameterType="String">
-        delete from applet_user1 where name in 
-        <foreach item="name" collection="array" open="(" separator="," close=")">
-            #{name}
+    <delete id="deleteAppletUser1ByIds" parameterType="String">
+        delete from applet_user1 where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletUser2Mapper">
     
     <resultMap type="AppletUser2" id="AppletUser2Result">
+        <result property="id"    column="id"    />
         <result property="headImage"    column="head_image"    />
         <result property="nickName"    column="nick_name"    />
         <result property="phone"    column="phone"    />
@@ -14,10 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="petTypeId"    column="pet_type_id"    />
         <result property="serviceBase"    column="service_base"    />
         <result property="serviceIncrease"    column="service_increase"    />
+        <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="selectAppletUser2Vo">
-        select head_image, nick_name, phone, sex, brief, experience, pet_type_id, service_base, service_increase from applet_user2
+        select id, head_image, nick_name, phone, sex, brief, experience, pet_type_id, service_base, service_increase, del_flag, create_by, create_time, update_by, update_time from applet_user2
     </sql>
 
     <select id="selectAppletUser2List" parameterType="AppletUser2" resultMap="AppletUser2Result">
@@ -35,12 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAppletUser2ByHeadImage" parameterType="String" resultMap="AppletUser2Result">
+    <select id="selectAppletUser2ById" parameterType="Long" resultMap="AppletUser2Result">
         <include refid="selectAppletUser2Vo"/>
-        where head_image = #{headImage}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletUser2" parameterType="AppletUser2">
+    <insert id="insertAppletUser2" parameterType="AppletUser2" useGeneratedKeys="true" keyProperty="id">
         insert into applet_user2
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="headImage != null">head_image,</if>
@@ -52,6 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petTypeId != null">pet_type_id,</if>
             <if test="serviceBase != null">service_base,</if>
             <if test="serviceIncrease != null">service_increase,</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="headImage != null">#{headImage},</if>
@@ -63,12 +74,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petTypeId != null">#{petTypeId},</if>
             <if test="serviceBase != null">#{serviceBase},</if>
             <if test="serviceIncrease != null">#{serviceIncrease},</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="updateAppletUser2" parameterType="AppletUser2">
         update applet_user2
         <trim prefix="SET" suffixOverrides=",">
+            <if test="headImage != null">head_image = #{headImage},</if>
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
             <if test="phone != null and phone != ''">phone = #{phone},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>
@@ -77,18 +94,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petTypeId != null">pet_type_id = #{petTypeId},</if>
             <if test="serviceBase != null">service_base = #{serviceBase},</if>
             <if test="serviceIncrease != null">service_increase = #{serviceIncrease},</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 head_image = #{headImage}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletUser2ByHeadImage" parameterType="String">
-        delete from applet_user2 where head_image = #{headImage}
+    <delete id="deleteAppletUser2ById" parameterType="Long">
+        delete from applet_user2 where id = #{id}
     </delete>
 
-    <delete id="deleteAppletUser2ByHeadImages" parameterType="String">
-        delete from applet_user2 where head_image in 
-        <foreach item="headImage" collection="array" open="(" separator="," close=")">
-            #{headImage}
+    <delete id="deleteAppletUser2ByIds" parameterType="String">
+        delete from applet_user2 where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,28 +5,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.model.mapper.AppletUsersTeacherMapper">
     
     <resultMap type="AppletUsersTeacher" id="AppletUsersTeacherResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="name"    column="name"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="sex"    column="sex"    />
-        <result property="phone"    column="phone"    />
-        <result property="experience"    column="experience"    />
-        <result property="isHave"    column="is_have"    />
-        <result property="petType"    column="pet_type"    />
-        <result property="status"    column="status"    />
-        <result property="images"    column="images"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="name" column="name"/>
+        <result property="idCard" column="id_card"/>
+        <result property="sex" column="sex"/>
+        <result property="phone" column="phone"/>
+        <result property="experience" column="experience"/>
+        <result property="isHave" column="is_have"/>
+        <result property="petType" column="pet_type"/>
+        <result property="status" column="status"/>
+        <result property="images" column="images"/>
+        <result property="createTime" column="create_time"/>
+        <result property="area" column="area"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="address" column="address"/>
+        <result property="createBy" column="create_by"/>
+        <result property="longitude" column="longitude"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="latitude" column="latitude"/>
     </resultMap>
 
     <sql id="selectAppletUsersTeacherVo">
-        select id, user_id, name, id_card, sex, phone, experience, is_have, pet_type, status, images, create_time, update_time from applet_users_teacher
+        select id, user_id, name, id_card, sex, phone, experience, is_have, pet_type, status, images, area, create_time, address, update_time, longitude, create_by, update_by, latitude  from applet_users_teacher
     </sql>
 
     <select id="selectAppletUsersTeacherList" parameterType="AppletUsersTeacher" resultMap="AppletUsersTeacherResult">
         <include refid="selectAppletUsersTeacherVo"/>
-        <where>  
+        <where>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
@@ -37,6 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petType != null "> and pet_type = #{petType}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="images != null  and images != ''"> and images = #{images}</if>
+            <if test="area != null  and area != ''"> and area = #{area}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
         </where>
     </select>
     
@@ -59,9 +71,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petType != null">pet_type,</if>
             <if test="status != null">status,</if>
             <if test="images != null">images,</if>
+            <if test="area != null">area,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="address != null">address,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+            <if test="longitude != null">longitude,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="latitude != null">latitude,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="userId != null">#{userId},</if>
@@ -74,9 +92,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petType != null">#{petType},</if>
             <if test="status != null">#{status},</if>
             <if test="images != null">#{images},</if>
+            <if test="area != null">#{area},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="address != null">#{address},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="latitude != null">#{latitude},</if>
+        </trim>
     </insert>
 
     <update id="updateAppletUsersTeacher" parameterType="AppletUsersTeacher">
@@ -92,8 +116,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petType != null">pet_type = #{petType},</if>
             <if test="status != null">status = #{status},</if>
             <if test="images != null">images = #{images},</if>
+            <if test="area != null">area = #{area},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="address != null">address = #{address},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
         </trim>
         where id = #{id}
     </update>