diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java b/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java index e36f654..8325796 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java +++ b/backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java @@ -64,6 +64,6 @@ public interface ImportTaskMapper extends BaseMapper { " WHERE UPLOAD_USER_ID = #{uploadUserId} \n" + " AND BIZ_TYPE = 'FISH' \n" + " ORDER BY CREATED_AT DESC\n" + - ") WHERE ROWNUM = 1;") + ") WHERE ROWNUM = 1") ImportTask selectLastByUserId(@Param("uploadUserId") String uploadUserId); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java index f1f730a..c6dbc3c 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java @@ -1,14 +1,16 @@ package com.yfd.platform.data.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.data.domain.ApprovalChangeLog; import com.yfd.platform.data.mapper.ApprovalChangeLogMapper; import com.yfd.platform.data.service.IApprovalChangeLogService; +import com.yfd.platform.system.domain.SysUser; +import com.yfd.platform.system.mapper.SysUserMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; /** *

@@ -21,11 +23,48 @@ public class ApprovalChangeLogServiceImpl extends ServiceImpl getByApprovalId(String approvalId) { return approvalChangeLogMapper.selectByApprovalId(approvalId); } + @Override + public void fillUserNames(List list) { + if (list == null || list.isEmpty()) { + return; + } + Set userIds = new HashSet<>(); + for (ApprovalChangeLog vo : list) { + if (StrUtil.isNotBlank(vo.getApprovalId())) { + userIds.add(vo.getApprovalId()); + } + if (StrUtil.isNotBlank(vo.getOperatorId())) { + userIds.add(vo.getOperatorId()); + } + } + + if (userIds.isEmpty()) { + return; + } + + Map userNameMap = new HashMap<>(); + List users = sysUserMapper.selectBatchIds(userIds); + for (SysUser user : users) { + userNameMap.put(user.getId(), user.getNickname()); + } + + for (ApprovalChangeLog vo : list) { + if (StrUtil.isNotBlank(vo.getApprovalId())) { + vo.setApprovalName(userNameMap.get(vo.getApprovalId())); + } + if (StrUtil.isNotBlank(vo.getOperatorId())) { + vo.setOperatorName(userNameMap.get(vo.getOperatorId())); + } + + } + } @Override public List getByDataId(String dataId) { return approvalChangeLogMapper.selectByDataId(dataId);