瀏覽代碼

修改分页问题

Administrator 1 年之前
父節點
當前提交
d9181e61b6

+ 14 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/InvestigateDisposition.java

@@ -37,6 +37,12 @@ public class InvestigateDisposition extends BaseEntity
     /** 标题 */
     @Excel(name = "标题")
     private String title;
+    /**
+     * 标题大小
+     */
+    private String titleSize;
+
+
 
     /** 链接地址 */
     @Excel(name = "链接地址")
@@ -57,6 +63,14 @@ public class InvestigateDisposition extends BaseEntity
     /** 子部门 */
     private List<InvestigateDisposition> children = new ArrayList<InvestigateDisposition>();
 
+    public String getTitleSize() {
+        return titleSize;
+    }
+
+    public void setTitleSize(String titleSize) {
+        this.titleSize = titleSize;
+    }
+
     public String getContent() {
         return content;
     }

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InvestigateDispositionServiceImpl.java

@@ -84,7 +84,7 @@ public class InvestigateDispositionServiceImpl implements IInvestigateDispositio
         content = " <meta charset=\"utf-8\">\n" +
                 "<style>\n" +
                 " body{margin: 0 !important;}\n" +
-                "img{max-width: 100% !important;height: auto !important;}\n" +
+                "img{max-width: 100% !important;}\n" +
                 "</style>" + content;
         String fileName = "";
         try {

+ 6 - 2
ruoyi-system/src/main/resources/mapper/system/InvestigateDispositionMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ancestors"    column="ancestors"    />
         <result property="orderNum"    column="order_num"    />
         <result property="title"    column="title"    />
+        <result property="titleSize"    column="title_size"    />
         <result property="url"    column="url"    />
         <result property="status"    column="status"    />
         <result property="content"    column="content"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInvestigateDispositionVo">
-        select investigate_disposition_id, parent_id, ancestors, order_num, title, url,content, status, create_by, create_time, update_by, update_time, remark from investigate_disposition
+        select investigate_disposition_id, parent_id, ancestors, order_num, title,title_size, url,content, status, create_by, create_time, update_by, update_time, remark from investigate_disposition
     </sql>
 
     <select id="selectInvestigateDispositionList" parameterType="InvestigateDisposition" resultMap="InvestigateDispositionResult">
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ancestors != null">ancestors,</if>
             <if test="orderNum != null">order_num,</if>
             <if test="title != null">title,</if>
+            <if test="titleSize != null">title_size,</if>
             <if test="url != null">url,</if>
             <if test="status != null">status,</if>
             <if test="content != null">content,</if>
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ancestors != null">#{ancestors},</if>
             <if test="orderNum != null">#{orderNum},</if>
             <if test="title != null">#{title},</if>
+            <if test="titleSize != null">#{titleSize},</if>
             <if test="url != null">#{url},</if>
             <if test="status != null">#{status},</if>
             <if test="content != null">#{content},</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ancestors != null">ancestors = #{ancestors},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="title != null">title = #{title},</if>
+            <if test="titleSize != null">title_size = #{titleSize},</if>
             <if test="url != null">url = #{url},</if>
             <if test="status != null">status = #{status},</if>
             <if test="content != null">content = #{content},</if>
@@ -106,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectInvestigateDispositionById" parameterType="Long" resultMap="InvestigateDispositionResult">
-        select d.investigate_disposition_id, d.parent_id, d.ancestors, d.order_num, d.title, d.url, d.status,d.content,
+        select d.investigate_disposition_id, d.parent_id, d.ancestors, d.order_num, d.title,d.title_size, d.url, d.status,d.content,
             (select title from investigate_disposition where investigate_disposition_id = d.investigate_disposition_id) parent_name
         from investigate_disposition d
         where d.investigate_disposition_id = #{investigateDispositionId}