refactor(processor): 替换UserInterior为VUserInterior以优化用户信息查询
- 将UserInterior实体替换为VUserInterior实体 - 将IUserInteriorService替换为IVUserInteriorService服务接口 - 更新所有相关用户查询逻辑以使用新版用户实体与服务 - 保持原有业务逻辑不变,提升代码一致性和可维护性 - 优化质检人、帮办人及其部门领导的查询操作
This commit is contained in:
parent
fdc95c5797
commit
4b46818041
|
|
@ -7,13 +7,13 @@ import com.nflg.wms.repository.entity.DictionaryItem;
|
||||||
import com.nflg.wms.repository.entity.QmsPdiDetectionRules;
|
import com.nflg.wms.repository.entity.QmsPdiDetectionRules;
|
||||||
import com.nflg.wms.repository.entity.QmsPdiTaskRecord;
|
import com.nflg.wms.repository.entity.QmsPdiTaskRecord;
|
||||||
import com.nflg.wms.repository.entity.QmsTodoItem;
|
import com.nflg.wms.repository.entity.QmsTodoItem;
|
||||||
import com.nflg.wms.repository.entity.UserInterior;
|
import com.nflg.wms.repository.entity.VUserInterior;
|
||||||
import com.nflg.wms.repository.service.IDepartmentService;
|
import com.nflg.wms.repository.service.IDepartmentService;
|
||||||
import com.nflg.wms.repository.service.IDictionaryItemService;
|
import com.nflg.wms.repository.service.IDictionaryItemService;
|
||||||
import com.nflg.wms.repository.service.IQmsPdiDetectionRulesService;
|
import com.nflg.wms.repository.service.IQmsPdiDetectionRulesService;
|
||||||
import com.nflg.wms.repository.service.IQmsPdiTaskRecordService;
|
import com.nflg.wms.repository.service.IQmsPdiTaskRecordService;
|
||||||
import com.nflg.wms.repository.service.IQmsTodoItemService;
|
import com.nflg.wms.repository.service.IQmsTodoItemService;
|
||||||
import com.nflg.wms.repository.service.IUserInteriorService;
|
import com.nflg.wms.repository.service.IVUserInteriorService;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import tech.powerjob.worker.core.processor.ProcessResult;
|
import tech.powerjob.worker.core.processor.ProcessResult;
|
||||||
|
|
@ -40,7 +40,7 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor {
|
||||||
private IQmsPdiDetectionRulesService detectionRulesService;
|
private IQmsPdiDetectionRulesService detectionRulesService;
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private IUserInteriorService userInteriorService;
|
private IVUserInteriorService vUserInteriorService;
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private IDepartmentService departmentService;
|
private IDepartmentService departmentService;
|
||||||
|
|
@ -108,16 +108,16 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor {
|
||||||
Long assistantId = task.getAssistantId();
|
Long assistantId = task.getAssistantId();
|
||||||
|
|
||||||
// 查询质检人信息
|
// 查询质检人信息
|
||||||
UserInterior inspector = userInteriorService.lambdaQuery()
|
VUserInterior inspector = vUserInteriorService.lambdaQuery()
|
||||||
.eq(UserInterior::getUserId, inspectorId)
|
.eq(VUserInterior::getUserId, inspectorId)
|
||||||
.one();
|
.one();
|
||||||
|
|
||||||
String inspectorName = inspector != null ? inspector.getUserName() : "未知";
|
String inspectorName = inspector != null ? inspector.getUserName() : "未知";
|
||||||
String assistantName = "";
|
String assistantName = "";
|
||||||
|
|
||||||
if (assistantId != null) {
|
if (assistantId != null) {
|
||||||
UserInterior assistant = userInteriorService.lambdaQuery()
|
VUserInterior assistant = vUserInteriorService.lambdaQuery()
|
||||||
.eq(UserInterior::getUserId, assistantId)
|
.eq(VUserInterior::getUserId, assistantId)
|
||||||
.one();
|
.one();
|
||||||
assistantName = assistant != null ? assistant.getUserName() : "未知";
|
assistantName = assistant != null ? assistant.getUserName() : "未知";
|
||||||
}
|
}
|
||||||
|
|
@ -137,8 +137,8 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor {
|
||||||
|
|
||||||
// 帮办人的部门领导
|
// 帮办人的部门领导
|
||||||
if (assistantId != null) {
|
if (assistantId != null) {
|
||||||
UserInterior assistant = userInteriorService.lambdaQuery()
|
VUserInterior assistant = vUserInteriorService.lambdaQuery()
|
||||||
.eq(UserInterior::getUserId, assistantId)
|
.eq(VUserInterior::getUserId, assistantId)
|
||||||
.one();
|
.one();
|
||||||
if (assistant != null && assistant.getDeptId() != null) {
|
if (assistant != null && assistant.getDeptId() != null) {
|
||||||
Department dept = departmentService.getById(assistant.getDeptId());
|
Department dept = departmentService.getById(assistant.getDeptId());
|
||||||
|
|
@ -153,8 +153,8 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor {
|
||||||
task.getTaskNo(), inspectorName, assistantText);
|
task.getTaskNo(), inspectorName, assistantText);
|
||||||
|
|
||||||
for (Long leaderId : leaderIds) {
|
for (Long leaderId : leaderIds) {
|
||||||
UserInterior leader = userInteriorService.lambdaQuery()
|
VUserInterior leader = vUserInteriorService.lambdaQuery()
|
||||||
.eq(UserInterior::getUserId, leaderId)
|
.eq(VUserInterior::getUserId, leaderId)
|
||||||
.one();
|
.one();
|
||||||
|
|
||||||
QmsTodoItem todo = new QmsTodoItem()
|
QmsTodoItem todo = new QmsTodoItem()
|
||||||
|
|
@ -196,8 +196,8 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor {
|
||||||
String messageContent = String.format("PDI检测任务[%s]将在%d小时内到期,请尽快完成",
|
String messageContent = String.format("PDI检测任务[%s]将在%d小时内到期,请尽快完成",
|
||||||
task.getTaskNo(), remainingHours);
|
task.getTaskNo(), remainingHours);
|
||||||
|
|
||||||
UserInterior inspector = userInteriorService.lambdaQuery()
|
VUserInterior inspector = vUserInteriorService.lambdaQuery()
|
||||||
.eq(UserInterior::getUserId, inspectorId)
|
.eq(VUserInterior::getUserId, inspectorId)
|
||||||
.one();
|
.one();
|
||||||
|
|
||||||
QmsTodoItem todoInspector = new QmsTodoItem()
|
QmsTodoItem todoInspector = new QmsTodoItem()
|
||||||
|
|
@ -214,8 +214,8 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor {
|
||||||
|
|
||||||
// 给帮办人推送消息
|
// 给帮办人推送消息
|
||||||
if (assistantId != null) {
|
if (assistantId != null) {
|
||||||
UserInterior assistant = userInteriorService.lambdaQuery()
|
VUserInterior assistant = vUserInteriorService.lambdaQuery()
|
||||||
.eq(UserInterior::getUserId, assistantId)
|
.eq(VUserInterior::getUserId, assistantId)
|
||||||
.one();
|
.one();
|
||||||
|
|
||||||
QmsTodoItem todoAssistant = new QmsTodoItem()
|
QmsTodoItem todoAssistant = new QmsTodoItem()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue