修复代码提交

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

@@ -49,33 +49,40 @@
           v-hasPermi="['model:AppletPetType: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:AppletPetType: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:AppletPetType:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <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"/>-->
 
 
-      <el-table-column label="图片" align="center" prop="image">
+      <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" prop="imageNo">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.imageNo" :src="row.imageNo" :preview-src-list="[row.imageNo]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+
 
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -112,13 +119,17 @@
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="图片">
+        <el-form-item label="选中图片">
 <!--          <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 label="未选中图片">
+          <!--          <imageUpload v-model="form.image"/>-->
+          <oss-image-upload v-model="form.imageNo" :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>
@@ -162,7 +173,7 @@ export default {
         title: null,
 
         image: null,
-
+        imageNo: null,
       },
       // 表单参数
       form: {},
@@ -172,14 +183,15 @@ export default {
           { required: true, message: "标题不能为空", trigger: "blur" }
         ],
 
-        delFlag: [
-          { required: true, message: "删除标识不能为空", trigger: "blur" }
-        ],
+        // delFlag: [
+        //   { required: true, message: "删除标识不能为空", trigger: "blur" }
+        // ],
 
       },
       columns: [
     { key: 1, label: "标题", visible:  true  },
-    { key: 2, label: "图片", visible:  false  },
+    { key: 2, label: "选中图片", visible:  false  },
+        { key: 3, label: "未选中图片", visible:  false  },
      ],
     };
   },
@@ -210,6 +222,8 @@ export default {
 
         image: null,
 
+        imageNo: null,
+
         delFlag: null,
 
         createBy: null,

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

@@ -1,5 +1,6 @@
 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;
@@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-03-28
  */
+@Data
 public class AppletPetType extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -26,57 +28,75 @@ public class AppletPetType extends BaseEntity
     @Excel(name = "图片")
     private String image;
 
-    /** 删除标识 */
-    private Integer delFlag;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTitle(String title) 
-    {
-        this.title = title;
-    }
-
-    public String getTitle() 
-    {
-        return title;
-    }
-    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;
-    }
+    /** 图片 */
+    @Excel(name = "图片")
+    private String imageNo;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("title", getTitle())
-            .append("image", getImage())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+    /** 删除标识 */
+    private Integer delFlag;
+//
+//    public void setId(Long id)
+//    {
+//        this.id = id;
+//    }
+//
+//    public Long getId()
+//    {
+//        return id;
+//    }
+//    public void setTitle(String title)
+//    {
+//        this.title = title;
+//    }
+//
+//    public String getTitle()
+//    {
+//        return title;
+//    }
+//    public void setImage(String image)
+//    {
+//        this.image = image;
+//    }
+//
+//    public String getImage()
+//    {
+//        return image;
+//    }
+//
+//    public void setImageNo(String imageNo)
+//    {
+//        this.imageNo = imageNo;
+//    }
+//
+//    public String getImageNo()
+//    {
+//        return imageNo;
+//    }
+//
+//
+//    public void setDelFlag(Integer delFlag)
+//    {
+//        this.delFlag = delFlag;
+//    }
+//
+//    public Integer getDelFlag()
+//    {
+//        return delFlag;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+//            .append("id", getId())
+//            .append("title", getTitle())
+//            .append("image", getImage())
+//            .append("imageNo", getImageNo())
+//            .append("delFlag", getDelFlag())
+//            .append("createBy", getCreateBy())
+//            .append("createTime", getCreateTime())
+//            .append("updateBy", getUpdateBy())
+//            .append("updateTime", getUpdateTime())
+//            .toString();
+//    }
 }

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="title"    column="title"    />
         <result property="image"    column="image"    />
+        <result property="imageNo"    column="image_no"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppletPetTypeVo">
-        select id, title, image, del_flag, create_by, create_time, update_by, update_time from applet_pet_type
+        select id, title, image,image_no, del_flag, create_by, create_time, update_by, update_time from applet_pet_type
     </sql>
 
     <select id="selectAppletPetTypeList" parameterType="AppletPetType" resultMap="AppletPetTypeResult">
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
             <if test="image != null">image,</if>
+            <if test="imageNo != null">image_no,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -46,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">#{title},</if>
             <if test="image != null">#{image},</if>
+            <if test="imageNo != null">#{imageNo},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -59,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="image != null">image = #{image},</if>
+            <if test="imageNo != null">image_no = #{imageNo},</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>