zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化逻辑

Browse Source
This commit is contained in:
tangwei 2026-04-27 11:11:02 +08:00
parent b20b4387a6
commit ef1027fc5c
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/com/yfd/platform/data/mapper/ImportTaskMapper.java
View File

@ -64,6 +64,6 @@ public interface ImportTaskMapper extends BaseMapper<ImportTask> {
" WHERE UPLOAD_USER_ID = #{uploadUserId} \n" + " WHERE UPLOAD_USER_ID = #{uploadUserId} \n" +
" AND BIZ_TYPE = 'FISH' \n" + " AND BIZ_TYPE = 'FISH' \n" +
" ORDER BY CREATED_AT DESC\n" + " ORDER BY CREATED_AT DESC\n" +
") WHERE ROWNUM = 1;") ") WHERE ROWNUM = 1")
ImportTask selectLastByUserId(@Param("uploadUserId") String uploadUserId); ImportTask selectLastByUserId(@Param("uploadUserId") String uploadUserId);
} }

43
backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalChangeLogServiceImpl.java
View File

@ -1,14 +1,16 @@
package com.yfd.platform.data.service.impl; package com.yfd.platform.data.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.data.domain.ApprovalChangeLog; import com.yfd.platform.data.domain.ApprovalChangeLog;
import com.yfd.platform.data.mapper.ApprovalChangeLogMapper; import com.yfd.platform.data.mapper.ApprovalChangeLogMapper;
import com.yfd.platform.data.service.IApprovalChangeLogService; 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 jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date; import java.util.*;
import java.util.List;
/** /**
* <p> * <p>
@ -21,11 +23,48 @@ public class ApprovalChangeLogServiceImpl extends ServiceImpl<ApprovalChangeLogM
@Resource @Resource
private ApprovalChangeLogMapper approvalChangeLogMapper; private ApprovalChangeLogMapper approvalChangeLogMapper;
@Resource
private SysUserMapper sysUserMapper;
@Override @Override
public List<ApprovalChangeLog> getByApprovalId(String approvalId) { public List<ApprovalChangeLog> getByApprovalId(String approvalId) {
return approvalChangeLogMapper.selectByApprovalId(approvalId); return approvalChangeLogMapper.selectByApprovalId(approvalId);
} }
@Override
public void fillUserNames(List<ApprovalChangeLog> list) {
if (list == null || list.isEmpty()) {
return;
}
Set<String> 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<String, String> userNameMap = new HashMap<>();
List<SysUser> 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 @Override
public List<ApprovalChangeLog> getByDataId(String dataId) { public List<ApprovalChangeLog> getByDataId(String dataId) {
return approvalChangeLogMapper.selectByDataId(dataId); return approvalChangeLogMapper.selectByDataId(dataId);