From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 十二月 2024 15:38:44 +0800
Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法
---
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