Browse Source

trace/processList-v2 api修改

master
zxc 5 years ago
parent
commit
a66f848d95
  1. 8
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java
  2. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

8
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSubProcessServiceImpl.java

@ -31,7 +31,9 @@ import com.epmet.service.ProjectSubProcessService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -106,6 +108,9 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
*/ */
@Override @Override
public ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds) { public ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds) {
if (CollectionUtils.isEmpty(projectStaffIds)){
return null;
}
return baseDao.selectSubProcess(projectStaffIds); return baseDao.selectSubProcess(projectStaffIds);
} }
@ -117,6 +122,9 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
*/ */
@Override @Override
public List<SubProcessDTO> selectSubProcessAndAttachment(String processId) { public List<SubProcessDTO> selectSubProcessAndAttachment(String processId) {
if (StringUtils.isEmpty(processId)){
return new ArrayList<>();
}
return baseDao.selectSubProcessAndAttachment(processId); return baseDao.selectSubProcessAndAttachment(processId);
} }

1
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@ -147,6 +147,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
// 是否发送到外部系统 0否 1是 // 是否发送到外部系统 0否 1是
processList.forEach(p -> { processList.forEach(p -> {
if (p.getIsSend().equals(NumConstant.ONE)){ if (p.getIsSend().equals(NumConstant.ONE)){
// 赋值 子节点
p.setSubProcess(projectSubProcessService.selectSubProcessAndAttachment(p.getProcessId())); p.setSubProcess(projectSubProcessService.selectSubProcessAndAttachment(p.getProcessId()));
} }
}); });

Loading…
Cancel
Save