fix(sip): 修复项目工作进度插入逻辑
- 修改 ProjectInfoServiceImpl 中项目工作进度列表的过滤条件 - 优化 ProjectWorkProgressServiceImpl 中的批量插入逻辑 - 引入 CollUtil 工具类进行集合判断,提高代码可读性master
parent
32f2d11dbe
commit
5732a44372
|
@ -165,7 +165,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
|
||||||
//插入变更记录信息
|
//插入变更记录信息
|
||||||
List<ProjectWorkProgress> projectWorkProgressList = projectInfo1.getProjectWorkProgressList();
|
List<ProjectWorkProgress> projectWorkProgressList = projectInfo1.getProjectWorkProgressList();
|
||||||
if (CollUtil.isNotEmpty(projectWorkProgressList)) {
|
if (CollUtil.isNotEmpty(projectWorkProgressList)) {
|
||||||
projectWorkProgressList = projectWorkProgressList.stream().filter(item -> item.getId() != null).collect(Collectors.toList());
|
projectWorkProgressList = projectWorkProgressList.stream().filter(item -> item.getId() == null).collect(Collectors.toList());
|
||||||
for (ProjectWorkProgress workProgress : projectWorkProgressList) {
|
for (ProjectWorkProgress workProgress : projectWorkProgressList) {
|
||||||
workProgress.setProjectId(projectInfo1.getId());
|
workProgress.setProjectId(projectInfo1.getId());
|
||||||
workProgress.setWorkUser(ShiroUtils.getUserId().toString());
|
workProgress.setWorkUser(ShiroUtils.getUserId().toString());
|
||||||
|
|
|
@ -2,6 +2,8 @@ package com.ruoyi.sip.service.impl;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollUtil;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.ruoyi.sip.mapper.ProjectWorkProgressMapper;
|
import com.ruoyi.sip.mapper.ProjectWorkProgressMapper;
|
||||||
|
@ -100,6 +102,9 @@ public class ProjectWorkProgressServiceImpl implements IProjectWorkProgressServi
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void insertIgnoreBatch(List<ProjectWorkProgress> projectWorkProgressList) {
|
public void insertIgnoreBatch(List<ProjectWorkProgress> projectWorkProgressList) {
|
||||||
|
if (CollUtil.isEmpty(projectWorkProgressList)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
projectWorkProgressMapper.insertIgnoreBatch(projectWorkProgressList);
|
projectWorkProgressMapper.insertIgnoreBatch(projectWorkProgressList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue