From 30a143f368dd2ff6e9c27b9d5dd17923ffed03ae Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 01 八月 2024 18:59:12 +0800 Subject: [PATCH] 检验单增加外部委托编号+报告批量下载批量上传 --- system-run/src/main/java/com/yuanchu/mom/backup/MysqlDataBackup.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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 8684946..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 * ? 銆� @@ -213,8 +220,8 @@ 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); //鍛ㄦ--褰撴湀鎵�鏈� // 鑾峰彇褰撳墠鏃ユ湡 -- Gitblit v1.9.3