refactor(repository): 优化质量检查员服务中部门负责人名称赋值逻辑
- 增加 deptLeaderName 变量缓存部门负责人名称 - 避免重复调用 department.getHeadUserName() - 修正 detail.setDeptLeaderName 的赋值为缓存变量 - 扩展 QmsIssueTicketControllerService 的导入依赖声明
This commit is contained in:
parent
b542f99756
commit
fcad84ce52
|
|
@ -11,8 +11,26 @@ import com.nflg.wms.common.pojo.qo.QmsIssueTicketPdiAddQO;
|
||||||
import com.nflg.wms.common.pojo.vo.*;
|
import com.nflg.wms.common.pojo.vo.*;
|
||||||
import com.nflg.wms.common.util.UserUtil;
|
import com.nflg.wms.common.util.UserUtil;
|
||||||
import com.nflg.wms.common.util.VUtil;
|
import com.nflg.wms.common.util.VUtil;
|
||||||
import com.nflg.wms.repository.entity.*;
|
import com.nflg.wms.repository.entity.Department;
|
||||||
import com.nflg.wms.repository.service.*;
|
import com.nflg.wms.repository.entity.QmsIssueTicket;
|
||||||
|
import com.nflg.wms.repository.entity.QmsIssueTicketProcess;
|
||||||
|
import com.nflg.wms.repository.entity.QmsIssueTicketProcessMeasure;
|
||||||
|
import com.nflg.wms.repository.entity.QmsPdiDetectionRules;
|
||||||
|
import com.nflg.wms.repository.entity.QmsPdiInspectionResults;
|
||||||
|
import com.nflg.wms.repository.entity.QmsPdiTaskRecord;
|
||||||
|
import com.nflg.wms.repository.entity.User;
|
||||||
|
import com.nflg.wms.repository.entity.UserInterior;
|
||||||
|
import com.nflg.wms.repository.service.IDepartmentService;
|
||||||
|
import com.nflg.wms.repository.service.IFileUploadRecordService;
|
||||||
|
import com.nflg.wms.repository.service.IQmsIssueTicketProcessMeasureService;
|
||||||
|
import com.nflg.wms.repository.service.IQmsIssueTicketProcessService;
|
||||||
|
import com.nflg.wms.repository.service.IQmsIssueTicketService;
|
||||||
|
import com.nflg.wms.repository.service.IQmsPdiDetectionRulesService;
|
||||||
|
import com.nflg.wms.repository.service.IQmsPdiInspectionResultsService;
|
||||||
|
import com.nflg.wms.repository.service.IQmsPdiTaskRecordService;
|
||||||
|
import com.nflg.wms.repository.service.IQmsTodoItemService;
|
||||||
|
import com.nflg.wms.repository.service.IUserInteriorService;
|
||||||
|
import com.nflg.wms.repository.service.IUserService;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
|
|
|
||||||
|
|
@ -339,12 +339,14 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl<QmsQualityInspec
|
||||||
|
|
||||||
// 查部门名称
|
// 查部门名称
|
||||||
String deptName = null;
|
String deptName = null;
|
||||||
|
String deptLeaderName = null;
|
||||||
String positionName = null;
|
String positionName = null;
|
||||||
if (Objects.nonNull(userInterior)) {
|
if (Objects.nonNull(userInterior)) {
|
||||||
if (Objects.nonNull(userInterior.getDeptId())) {
|
if (Objects.nonNull(userInterior.getDeptId())) {
|
||||||
Department department = departmentService.getById(userInterior.getDeptId());
|
Department department = departmentService.getById(userInterior.getDeptId());
|
||||||
if (Objects.nonNull(department)) {
|
if (Objects.nonNull(department)) {
|
||||||
deptName = department.getName();
|
deptName = department.getName();
|
||||||
|
deptLeaderName = department.getHeadUserName();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(userInterior.getPositionId())) {
|
if (Objects.nonNull(userInterior.getPositionId())) {
|
||||||
|
|
@ -364,7 +366,7 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl<QmsQualityInspec
|
||||||
detail.setUserName(user.getUserName());
|
detail.setUserName(user.getUserName());
|
||||||
}
|
}
|
||||||
detail.setDeptName(deptName);
|
detail.setDeptName(deptName);
|
||||||
detail.setDeptLeaderName(department != null ? department.getHeadUserName() : null);
|
detail.setDeptLeaderName(deptLeaderName);
|
||||||
detail.setPositionName(positionName);
|
detail.setPositionName(positionName);
|
||||||
|
|
||||||
// 用主表 id 查明细表
|
// 用主表 id 查明细表
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue