From 17c7e460e0664ef30b34b6a6af8ad72a075d401c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 24 三月 2025 15:05:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
system-run/src/main/java/com/yuanchu/mom/backup/MysqlDataBackup.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/system-run/src/main/java/com/yuanchu/mom/backup/MysqlDataBackup.java b/system-run/src/main/java/com/yuanchu/mom/backup/MysqlDataBackup.java
index 2d3b8bd..4eafbf4 100644
--- a/system-run/src/main/java/com/yuanchu/mom/backup/MysqlDataBackup.java
+++ b/system-run/src/main/java/com/yuanchu/mom/backup/MysqlDataBackup.java
@@ -1,10 +1,14 @@
package com.yuanchu.mom.backup;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
+import com.yuanchu.mom.mapper.DepartmentLimsMapper;
import com.yuanchu.mom.mapper.EnumMapper;
+import com.yuanchu.mom.pojo.DepartmentLims;
import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.pojo.PerformanceShift;
import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.service.DepartmentLimsService;
import com.yuanchu.mom.service.EnumService;
import com.yuanchu.mom.service.PerformanceShiftService;
import com.yuanchu.mom.service.UserService;
@@ -81,6 +85,9 @@
@Resource
private UserService userService;
+
+ @Resource
+ private DepartmentLimsMapper departmentLimsMapper;
/**
* 姣忓ぉ鏅氫笂23鐐�05绉掓墽琛� 銆� 0 0 4 1/1 * ? 銆�
@@ -200,10 +207,10 @@
/**
- * 瀹氭椂浠诲姟,姣忎釜鏈�1鍙风殑00:00:00
+ * 瀹氭椂浠诲姟,姣忎釜鏈�1鍙风殑00:00:00缁欎笅涓�涓湀鎺掔彮
* 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
*/
- //@Scheduled(cron = "0 0 0 1 *?")
+ @Scheduled(cron = "0 0 0 1 * ?")
//@Scheduled(cron = "0/20 * * * * ?")
private void timerCreateSchedule(){
System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
@@ -213,12 +220,12 @@
List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
List<String> collect = shiftType.stream().filter(enums -> enums.getLabel().equals("鏃�")).map(enums -> enums.getValue()).collect(Collectors.toList());
performanceShiftAddDto.setShift(collect.get(0));
- //浜哄憳--鎵�鏈変汉
- String userIds = userService.getDeviceManager().stream().map(user -> user.getId().toString()).distinct().collect(Collectors.joining(","));
+ //浜哄憳--(departlims琛ㄧ殑涓や釜瀹為獙瀹ょ殑浜�)
+ String userIds = userService.getUser().stream().map(user -> user.getId().toString()).distinct().collect(Collectors.joining(","));
performanceShiftAddDto.setUserId(userIds);
//鍛ㄦ--褰撴湀鎵�鏈�
// 鑾峰彇褰撳墠鏃ユ湡
- LocalDate today = LocalDate.now();
+ LocalDate today = LocalDate.now().plusMonths(1);
// 鑾峰彇鏈湀鐨勭涓�澶╁拰鏈�鍚庝竴澶�
LocalDate firstDayOfMonth = today.with(TemporalAdjusters.firstDayOfMonth());
LocalDate lastDayOfMonth = today.with(TemporalAdjusters.lastDayOfMonth());
--
Gitblit v1.9.3