feat(信息模版页面中信息类型连表查询):

ruoyi-system/src/main/java/com/ruoyi/board/domain/PresetContent.java

@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 预置信息及模版表
  */
@@ -28,8 +29,8 @@ public class PresetContent {
     /**
      * 情报板尺寸
      */
-    @TableField(value = "board_size")
+    @TableField(value = "board_size_type")
-    private String boardSize;
+    private Integer boardSizeType;
 
     /**
      * 信息类型

ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/PresetContentDTO.java

@@ -24,8 +24,11 @@ public class PresetContentDTO {
     /**
      * 情报板尺寸
      */
-    @TableField(value = "board_size")
+    @TableField(value = "board_size_type")
-    private String boardSize;
+    private Integer boardSizeType;
+
+    @TableField(value = "board_size_type_name")
+    private String boardSizeTypeName;
 
     /**
      * 信息类型

ruoyi-system/src/main/java/com/ruoyi/board/service/impl/PresetContentServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.board.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.ruoyi.board.domain.BoardType;
 import com.ruoyi.board.domain.PlanType;
 import com.ruoyi.board.domain.PresetContent;
 import com.ruoyi.board.domain.dto.PresetContentDTO;
@@ -19,7 +20,7 @@ public class PresetContentServiceImpl extends MPJBaseServiceImpl<PresetContentMa
         LambdaQueryWrapper<PresetContent> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                 .eq(PresetContent::getContent, content)
-                .eq(PresetContent::getBoardSize, boardSize)
+                .eq(PresetContent::getBoardSizeType, boardSize)
                 .eq(PresetContent::getInfoType, type);
         return getOne(queryWrapper);
     }
@@ -29,7 +30,9 @@ public class PresetContentServiceImpl extends MPJBaseServiceImpl<PresetContentMa
         MPJLambdaWrapper<PresetContent> eq = new MPJLambdaWrapper<PresetContent>()
                 .selectAll(PresetContent.class)
                 .selectAs(PlanType::getTypeName, "type_name")
+                .selectAs(BoardType::getName,"board_size_type_name")
                 .leftJoin(PlanType.class, PlanType::getId, PresetContent::getInfoType)
+                .leftJoin(BoardType.class, BoardType::getId, PresetContent::getBoardSizeType)
                 .eq(presetContent.getInfoType() != null && presetContent.getInfoType() > 0, PresetContent::getInfoType, presetContent.getInfoType());
         return selectJoinList(PresetContentDTO.class, eq);
     }

ruoyi-system/src/main/resources/mapper/board/PresetContentMapper.xml

@@ -1,33 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.board.mapper.PresetContentMapper">
-  <resultMap id="BaseResultMap" type="com.ruoyi.board.domain.PresetContent">
-    <!--@mbg.generated-->
-    <!--@Table pub_preset_content-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="board_size" jdbcType="VARCHAR" property="boardSize" />
-    <result column="info_type" jdbcType="INTEGER" property="infoType" />
-    <result column="content" jdbcType="VARCHAR" property="content" />
-    <result column="preview_path" jdbcType="VARCHAR" property="previewPath" />
-    <result column="font_style" jdbcType="VARCHAR" property="fontStyle" />
-    <result column="font_size" jdbcType="INTEGER" property="fontSize" />
-    <result column="letter_spacing" jdbcType="INTEGER" property="letterSpacing" />
-    <result column="font_color" jdbcType="VARCHAR" property="fontColor" />
-    <result column="font_position_x" jdbcType="INTEGER" property="fontPositionX" />
-    <result column="font_position_y" jdbcType="INTEGER" property="fontPositionY" />
-    <result column="play_time" jdbcType="INTEGER" property="playTime" />
-    <result column="preset_type" jdbcType="INTEGER" property="presetType" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="create_by" jdbcType="INTEGER" property="createBy" />
-    <result column="update_by" jdbcType="INTEGER" property="updateBy" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, `name`, board_size, info_type, content, preview_path, font_style, font_size, 
-    letter_spacing, font_color, font_position_x, font_position_y, play_time, preset_type, 
-    remark, create_time, update_time, create_by, update_by
-  </sql>
 </mapper>