From 3caa0b05a620aa7714de0d63c804e43aa6486c9b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 11 Jul 2025 18:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java
index ba531dd..0fc9845 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageSystemServiceImpl.java
@@ -1,5 +1,7 @@
package com.oying.modules.message.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.oying.modules.message.domain.MessageOrderLeave;
import com.oying.modules.message.domain.MessageSystem;
import com.oying.utils.FileUtil;
import lombok.RequiredArgsConstructor;
@@ -11,19 +13,18 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
+
import com.oying.utils.PageResult;
/**
-* @description 服务实现
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @description 服务实现
+ * @author 李萌
+ * @date 2025-05-20
+ **/
@Service
@RequiredArgsConstructor
public class MessageSystemServiceImpl extends ServiceImpl<MessageSystemMapper, MessageSystem> implements MessageSystemService {
@@ -49,14 +50,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void update(MessageSystem resources) {
- MessageSystem messageSystem = getById(resources.getSystemMessageId());
+ MessageSystem messageSystem = getById(resources.getId());
messageSystem.copy(resources);
messageSystemMapper.updateById(messageSystem);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void deleteAll(List<Long> ids) {
+ public void deleteAll(List<Integer> ids) {
messageSystemMapper.deleteBatchIds(ids);
}
@@ -65,10 +66,14 @@
List<Map<String, Object>> list = new ArrayList<>();
for (MessageSystem messageSystem : all) {
Map<String, Object> map = new LinkedHashMap<>();
- map.put("外键，关联 `message_info` 表", messageSystem.getMessageId());
- map.put("系统维护时间", messageSystem.getMaintenanceTime());
+ map.put("系统维护开始时间", messageSystem.getStartTime());
+ map.put("系统维护截至时间", messageSystem.getEndTime());
list.add(map);
}
FileUtil.downloadExcel(list, response);
}
+
+
+
+
}
--
Gitblit v1.9.3