From 15cdb405c03affe797449794f1ee94e017908f90 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Mon, 24 Mar 2025 15:11:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A3=E4=BC=A0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/home/HomeController.java   | 21 +++++++++++++++++++
 .../main/resources/templates/home/base.html   | 10 ++++-----
 .../templates/system/column/column.html       |  5 +++--
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java
index 421ec63..620ac70 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java
@@ -67,6 +67,9 @@ public class HomeController {
 	//专题活动类型
 	public static final String WINDOW_COLUMN_TYPE = "3";
 
+	//宣传活动类型
+	public static final String XCHD_COLUMN_TYPE = "4";
+
 	public static final String STATUS = "0";
 
 
@@ -89,6 +92,15 @@ public class HomeController {
 		List<SysContent>  contentList = contentService.selectSysContentHomeList(new SysContent());
 		mmap.put("contentList", contentList);
 
+		//宣传活动对应的栏目
+		LambdaQueryWrapper<SysColumn> qxWrapper= new LambdaQueryWrapper<>();
+		qxWrapper.eq(SysColumn::getColumnType, XCHD_COLUMN_TYPE);
+		qxWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE);
+		qxWrapper.eq(SysColumn::getStatus,STATUS);
+		qxWrapper.last("limit 6");
+		qxWrapper.orderByAsc(SysColumn::getOrderNum);
+		List<SysColumn>  xchdColumns = columnService.list(qxWrapper);
+		mmap.put("xchdColumns", xchdColumns);
 		//部门动态对应的栏目
 		LambdaQueryWrapper<SysColumn> query= new LambdaQueryWrapper<>();
 		query.eq(SysColumn::getColumnType, DEPT_COLUMN_TYPE);
@@ -145,6 +157,15 @@ public class HomeController {
 		List<SysContent>  contentList = contentService.selectSysContentHomeList(new SysContent());
 		mmap.put("contentList", contentList);
 
+		//宣传活动对应的栏目
+		LambdaQueryWrapper<SysColumn> qxWrapper= new LambdaQueryWrapper<>();
+		qxWrapper.eq(SysColumn::getColumnType, XCHD_COLUMN_TYPE);
+		qxWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE);
+		qxWrapper.eq(SysColumn::getStatus,STATUS);
+		qxWrapper.last("limit 6");
+		qxWrapper.orderByAsc(SysColumn::getOrderNum);
+		List<SysColumn>  xchdColumns = columnService.list(qxWrapper);
+		mmap.put("xchdColumns", xchdColumns);
 		//部门动态对应的栏目
 		LambdaQueryWrapper<SysColumn> query= new LambdaQueryWrapper<>();
 		query.eq(SysColumn::getColumnType, DEPT_COLUMN_TYPE);
diff --git a/ruoyi-admin/src/main/resources/templates/home/base.html b/ruoyi-admin/src/main/resources/templates/home/base.html
index d905158..a029bce 100644
--- a/ruoyi-admin/src/main/resources/templates/home/base.html
+++ b/ruoyi-admin/src/main/resources/templates/home/base.html
@@ -53,10 +53,10 @@
             -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
         }
         .layui-col-md6{
-            min-height: 461px;
+            max-height: 461px;
         }
         .layui-card{
-            min-height: 461px;
+            max-height: 461px;
         }
     </style>
 </head>
@@ -106,7 +106,7 @@
                             <a href="announce_view.html" target="_blank">更多+</a>
                         </span>
                     </div>
-                    <div class="layui-card-body" style="min-height: 400px;overflow: hidden;">
+                    <div class="layui-card-body" style="max-height: 400px;overflow: hidden;">
                         <div th:if="${!noticeList.isEmpty()}" style="width:100%;height: 125px;border-bottom: 1px solid #e6e6e6;box-sizing: border-box;line-height: 47px">
                             <h1 style="font-size: 22px;">
                                 <a th:href="@{/public_view.html(type=1,id=${noticeList[0].noticeId})}" th:title="${noticeList[0].noticeTitle}" target="_blank" >[[${#strings.abbreviate(noticeList[0].noticeTitle,33)}]]</a>
@@ -131,10 +131,10 @@
         <div class="layui-container"   style="padding-top: 30px;min-width: 1330px">
             <div class="xuanchuanImage">
                 <a th:href="@{/special_view.html(columnId=${specialColumns[0].columnId})}" th:title="${specialColumns[0].columnName}" target="_blank">
-                    <img th:src="@{/home/base/dangji.jpg}" style="width: 100%;filter: brightness(1.1);" class="slide active">
+                    <img th:src="${xchdColumns[0].columnUrl}" style="width: 100%;filter: brightness(1.1);" class="slide active">
                 </a>
                 <a th:href="@{/special_view.html(columnId=${specialColumns[1].columnId})}" th:title="${specialColumns[1].columnName}" target="_blank">
-                    <img th:src="@{/home/data/announceimg/21da.png}" style="width: 100%;filter: brightness(1.1);" class="slide">
+                    <img th:src="${xchdColumns[1].columnUrl}" style="width: 100%;filter: brightness(1.1);" class="slide">
                 </a>
             </div>
         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/column/column.html b/ruoyi-admin/src/main/resources/templates/system/column/column.html
index 86f668c..1c4b377 100644
--- a/ruoyi-admin/src/main/resources/templates/system/column/column.html
+++ b/ruoyi-admin/src/main/resources/templates/system/column/column.html
@@ -94,10 +94,11 @@
 						}
 						else if (item.columnType == '2') {
 							return '<span class="label label-primary">专题活动</span>';
-						}else{
+						}else if(item.columnType == '3'){
 							return '<span class="label label-primary">兰铁视窗</span>';
+						}else{
+                            return '<span class="label label-primary">宣传图</span>';
 						}
-
 					}
 				},
 		        {