From 48d5a302e116d129315b6b1baff53af89a30128b Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 16 四月 2026 14:27:38 +0800
Subject: [PATCH] 会议管理表接口调整
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMeeting.java | 20 --------------------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java | 13 +------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ApiController.java | 2 +-
ruoyi-admin/src/main/resources/application-druid.yml | 4 ++--
4 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ApiController.java
index 9fb2679..bcf0fa1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ApiController.java
@@ -19,7 +19,7 @@
import java.util.Map;
@Slf4j
-@Api(description = "api鏈嶅姟",tags={"api鏈嶅姟"})
+@Api(description = "api鏈嶅姟")
@RestController
@RequestMapping("/api")
public class ApiController {
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 5b161c7..2ddb391 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -7,7 +7,7 @@
# 涓诲簱鏁版嵁婧�
master:
# 寮�鍙戠幆澧�
- url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.100.10:3306/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: smartor
password: Smartor.2023
@@ -60,7 +60,7 @@
multi-statement-allow: true
redis:
# 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
- host: 127.0.0.1
+ host: 192.168.100.10
password: Smartor
port: 6020
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMeeting.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMeeting.java
index 6f15219..5bf7ba0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMeeting.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMeeting.java
@@ -142,27 +142,7 @@
@Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date approvalTime;
- /** 鍒涘缓浜� */
- @ApiModelProperty("鍒涘缓浜�")
- @Excel(name = "鍒涘缓浜�")
- private String createdBy;
- /** 鍒涘缓鏃堕棿 */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date createdTime;
-
- /** 鏇存柊浜� */
- @ApiModelProperty("鏇存柊浜�")
- @Excel(name = "鏇存柊浜�")
- private String updatedBy;
-
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date updatedTime;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
index 6513d0b..66e4783 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
@@ -99,18 +99,7 @@
if (serviceMeeting.getApprovalTime() != null){
wrappers.eq(ServiceMeeting::getApprovalTime ,serviceMeeting.getApprovalTime());
}
- if (StringUtils.isNotBlank(serviceMeeting.getCreatedBy())){
- wrappers.eq(ServiceMeeting::getCreatedBy ,serviceMeeting.getCreatedBy());
- }
- if (serviceMeeting.getCreatedTime() != null){
- wrappers.eq(ServiceMeeting::getCreatedTime ,serviceMeeting.getCreatedTime());
- }
- if (StringUtils.isNotBlank(serviceMeeting.getUpdatedBy())){
- wrappers.eq(ServiceMeeting::getUpdatedBy ,serviceMeeting.getUpdatedBy());
- }
- if (serviceMeeting.getUpdatedTime() != null){
- wrappers.eq(ServiceMeeting::getUpdatedTime ,serviceMeeting.getUpdatedTime());
- }
+
return this.list(wrappers);
}
--
Gitblit v1.9.3