From 65b25fde603de187efc3db827c9d384e35f00014 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 10 六月 2025 15:17:17 +0800
Subject: [PATCH] refactor(system): 优化节假日管理功能
---
zhitan-system/src/main/java/com/zhitan/system/controller/SysHolidayController.java | 6 +++++-
zhitan-admin/src/main/resources/application-prod.yml | 2 +-
zhitan-vue/src/views/system/holiday/index.vue | 6 +++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/zhitan-admin/src/main/resources/application-prod.yml b/zhitan-admin/src/main/resources/application-prod.yml
index 2080787..d01d56b 100644
--- a/zhitan-admin/src/main/resources/application-prod.yml
+++ b/zhitan-admin/src/main/resources/application-prod.yml
@@ -61,7 +61,7 @@
multi-statement-allow: true
keycloak:
# keycloak 鏈嶅姟鍣ㄥ湴鍧�
- server-url: https://lanbaosystem.shlanbao.cn:8443
+ server-url: https://lanbaosystem.shlanbao.cn:8444
realm: lanbao
client-id: DataCapture
client-secret: kplisa4lJHEIM6knqefVbxln85QbA5NX
diff --git a/zhitan-system/src/main/java/com/zhitan/system/controller/SysHolidayController.java b/zhitan-system/src/main/java/com/zhitan/system/controller/SysHolidayController.java
index 2921b62..1d40883 100644
--- a/zhitan-system/src/main/java/com/zhitan/system/controller/SysHolidayController.java
+++ b/zhitan-system/src/main/java/com/zhitan/system/controller/SysHolidayController.java
@@ -34,10 +34,14 @@
/**
* 鏌ヨ鑺傚亣鏃ヤ俊鎭垪琛�
+ *
+ * @param sysHoliday 鏌ヨ鏉′欢
+ * @param pageNum 褰撳墠椤电爜
+ * @param pageSize 姣忛〉鏄剧ず鏉℃暟
*/
@PreAuthorize("@ss.hasPermi('system:holiday:list')")
@GetMapping("/list")
- public TableDataInfo list(SysHoliday sysHoliday)
+ public TableDataInfo list(SysHoliday sysHoliday, Integer pageNum, Integer pageSize)
{
startPage();
List<SysHoliday> list = sysHolidayService.selectSysHolidayList(sysHoliday);
diff --git a/zhitan-vue/src/views/system/holiday/index.vue b/zhitan-vue/src/views/system/holiday/index.vue
index 8383b0c..d817b1a 100644
--- a/zhitan-vue/src/views/system/holiday/index.vue
+++ b/zhitan-vue/src/views/system/holiday/index.vue
@@ -2,7 +2,7 @@
<div class="app-container page">
<div class="form-card">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
- <el-form-item label="鑺傚亣鏃ュ悕绉�" prop="holidayName">
+ <el-form-item label="鍚嶇О" prop="holidayName">
<el-input
v-model="queryParams.holidayName"
placeholder="璇疯緭鍏ヨ妭鍋囨棩鍚嶇О"
@@ -11,7 +11,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
- <el-form-item label="鑺傚亣鏃ユ棩鏈�" prop="holidayDate">
+ <el-form-item label="鏃ユ湡" prop="holidayDate">
<el-date-picker
v-model="queryParams.holidayDate"
type="date"
@@ -20,7 +20,7 @@
style="width: 240px"
/>
</el-form-item>
- <el-form-item label="鑺傚亣鏃ョ被鍨�" prop="holidayType">
+ <el-form-item label="绫诲瀷" prop="holidayType">
<el-select v-model="queryParams.holidayType" placeholder="鑺傚亣鏃ョ被鍨�" clearable style="width: 240px">
<el-option
v-for="dict in sys_holiday_type"
--
Gitblit v1.9.3